Make CaretInfo member order match to my proposal post

iced-rs · Feb 2, 2025 · 3322aee · 3322aee
1 parent f6c4b03
commit 3322aee
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/core/src/shell.rs b/core/src/shell.rs
@@ -5,10 +5,10 @@ use crate::{event, Point};
 /// TODO
 #[derive(Clone, Copy, Debug)]
 pub struct CaretInfo {
-    /// TODO
-    pub allowed: bool,
     /// TODO
     pub position: Point,
+    /// TODO
+    pub input_method_allowed: bool,
 }
 
 /// A connection to the state of a shell.

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
@@ -749,11 +749,11 @@ where
                 if children_may_have_caret {
                     if let Some(caret_info) = shell.caret_info() {
                         shell.update_caret_info(Some(CaretInfo {
-                            allowed: caret_info.allowed,
                             position: Point::new(
                                 caret_info.position.x - translation.x,
                                 caret_info.position.y - translation.y,
                             ),
+                            input_method_allowed: caret_info.input_method_allowed,
                         }));
                     }
                 }

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
@@ -877,8 +877,8 @@ where
                 .unwrap_or(Rectangle::default());
             let bottom_left = Point::new(rect.x, rect.y + rect.height);
             Some(CaretInfo {
-                allowed: true,
                 position: bottom_left,
+                input_method_allowed: true,
             })
         } else {
             None

diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
@@ -1340,8 +1340,8 @@ where
                 .unwrap_or(Rectangle::with_size(Size::<f32>::default()));
             let bottom_left = Point::new(rect.x, rect.y + rect.height);
             Some(CaretInfo {
-                allowed: true,
                 position: bottom_left,
+                input_method_allowed: true,
             })
         } else {
             None

diff --git a/winit/src/program.rs b/winit/src/program.rs
@@ -1168,7 +1168,7 @@ fn update_input_method<P, C>(
     P: Program,
     C: Compositor<Renderer = P::Renderer> + 'static,
 {
-    window.raw.set_ime_allowed(caret_info.allowed);
+    window.raw.set_ime_allowed(caret_info.input_method_allowed);
     window.raw.set_ime_cursor_area(
         LogicalPosition::new(caret_info.position.x, caret_info.position.y),
         LogicalSize::new(10, 10),