simplify ctx set_state usage, remove i32 cast

diff --git a/application/note/src/file.rs b/application/note/src/file.rs
index c6c19ca3faabde5711bdec8dd8f48527c6fd56e2..f7b3ddb3f7faa9afb4ff1ddfac8a3d59b36b273b 100644 (file)
--- a/application/note/src/file.rs
+++ b/application/note/src/file.rs
@@ -216,7 +216,7 @@ impl FileNote {
         };
 
         obj.splitview_set_visible(0, event.intval == 0);
-        doc.ctx.set_state(AppStates::NoteMaximized as i32);
+        doc.ctx.set_state(AppStates::NoteMaximized);
     }
 }
 

diff --git a/application/note/src/main.rs b/application/note/src/main.rs
index d97e6ff3ad6a681fa15ce9f70f908f3f66b42c73..14bbb7b8e4a60c36dc48f3b33832de668aacfdef 100644 (file)
--- a/application/note/src/main.rs
+++ b/application/note/src/main.rs
@@ -196,6 +196,12 @@ pub enum AppStates {
     NoteTitleInput,
 }
 
+impl From<AppStates> for i32 {
+    fn from(state: AppStates) -> i32 {
+        state as i32
+    }
+}
+
 fn username() -> String {
     env::var("USER")
         .or_else(|_| env::var("USERNAME"))

diff --git a/application/note/src/note.rs b/application/note/src/note.rs
index 03bca8a6812c1b93db01307d2dde0a32e6f0d354..fa100a6370992a7014e9ab34e5179e3ec561287a 100644 (file)
--- a/application/note/src/note.rs
+++ b/application/note/src/note.rs
@@ -153,9 +153,9 @@ impl Note {
                     // the note is already opened in another window
                     self.text.set_readonly(true);
                     self.info.set("Note already opened in another window");
-                    doc.ctx.set_state(AppStates::NoteShowInfo as i32);
+                    doc.ctx.set_state(AppStates::NoteShowInfo);
                 } else {
-                    doc.ctx.unset_state(AppStates::NoteShowInfo as i32);
+                    doc.ctx.unset_state(AppStates::NoteShowInfo);
                 }
             }
 
@@ -163,7 +163,7 @@ impl Note {
         } else {
             self.lock = None;
             self.text.set_readonly(false);
-            doc.ctx.unset_state(AppStates::NoteTitleInput as i32);
+            doc.ctx.unset_state(AppStates::NoteTitleInput);
         }
 
         Some(())
@@ -310,7 +310,7 @@ impl Note {
         let Some(doc) = self.doc.get_doc() else {
             return;
         };
-        doc.ctx.set_state(AppStates::NoteShowExtModInfo as i32);
+        doc.ctx.set_state(AppStates::NoteShowExtModInfo);
     }
 
     #[action]
@@ -389,7 +389,7 @@ impl Note {
         let Some(doc) = self.doc.get_doc() else {
             return;
         };
-        doc.ctx.set_state(AppStates::NoteTitleInput as i32);
+        doc.ctx.set_state(AppStates::NoteTitleInput);
     }
 
     #[action]
@@ -397,7 +397,7 @@ impl Note {
         let Some(doc) = self.doc.get_doc() else {
             return;
         };
-        doc.ctx.unset_state(AppStates::NoteTitleInput as i32);
+        doc.ctx.unset_state(AppStates::NoteTitleInput);
     }
 
     #[action]
@@ -439,7 +439,7 @@ impl Note {
         };
 
         obj.splitview_set_visible(0, event.intval == 0);
-        doc.ctx.set_state(AppStates::NoteMaximized as i32);
+        doc.ctx.set_state(AppStates::NoteMaximized);
     }
 
     #[action]
@@ -453,7 +453,7 @@ impl Note {
         let Some(doc) = self.doc.get_doc() else {
             return;
         };
-        doc.ctx.unset_state(AppStates::NoteShowExtModInfo as i32);
+        doc.ctx.unset_state(AppStates::NoteShowExtModInfo);
     }
 
     #[action]

diff --git a/application/note/src/window.rs b/application/note/src/window.rs
index 7e330254624c501005db50373b90f61097de57b5..03b452b66e11b95fd6ef0a556aade726e8bf7892 100644 (file)
--- a/application/note/src/window.rs
+++ b/application/note/src/window.rs
@@ -231,7 +231,7 @@ pub fn create_window(app: &App, ctx: &AppContext<MainWindow>) -> UiObject<MainWi
         
         // this state is basically always set, however there are some situations, where
         // it is suppressed
-        obj.ctx.set_state(AppStates::NoteEnableNew as i32);
+        obj.ctx.set_state(AppStates::NoteEnableNew);
 
         obj.sidebar().create(|obj|{
             sourcelist!(obj,

diff --git a/ui-rs/src/ui/toolkit.rs b/ui-rs/src/ui/toolkit.rs
index 79a0d4df5be667245dae8c3aeab3c88640f3b27b..0e57608b6795cc561372f86715fb62c3038abcc3 100644 (file)
--- a/ui-rs/src/ui/toolkit.rs
+++ b/ui-rs/src/ui/toolkit.rs
@@ -217,27 +217,27 @@ impl UiContext {
         }
     }
 
-    pub fn set_state(&self, state: i32) {
+    pub fn set_state<T: Into<i32>>(&self, state: T) {
         unsafe {
-            ui_set_state(self.ptr, state);
+            ui_set_state(self.ptr, state.into());
         }
     }
 
-    pub fn unset_state(&self, state: i32) {
+    pub fn unset_state<T: Into<i32>>(&self, state: T) {
         unsafe {
-            ui_unset_state(self.ptr, state);
+            ui_unset_state(self.ptr, state.into());
         }
     }
 
-    pub fn suppress_state(&self, state: i32) {
+    pub fn suppress_state<T: Into<i32>>(&self, state: T) {
         unsafe {
-            ui_suppress_state(self.ptr, state);
+            ui_suppress_state(self.ptr, state.into());
         }
     }
 
-    pub fn unsuppress_state(&self, state: i32) {
+    pub fn unsuppress_state<T: Into<i32>>(&self, state: T) {
         unsafe {
-            ui_unsuppress_state(self.ptr, state);
+            ui_unsuppress_state(self.ptr, state.into());
         }
     }
 }