chore: sync ime changes

Author: Decodetalkers

iced_layershell/src/ime_preedit.rs

@@ -8,7 +8,7 @@ pub struct Preedit<Renderer>
 where
     Renderer: text::Renderer,
 {
-    cursor: Rectangle,
+    position: Point,
     content: Renderer::Paragraph,
     spans: Vec<text::Span<'static, (), Renderer::Font>>,
 }
@@ -28,7 +28,7 @@ where
 {
     pub fn new() -> Self {
         Self {
-            cursor: Rectangle::default(),
+            position: Point::ORIGIN,
             spans: Vec::new(),
             content: Renderer::Paragraph::default(),
         }
@@ -41,8 +41,7 @@ where
         background: Color,
         renderer: &Renderer,
     ) {
-        self.cursor = cursor;
-
+        self.position = cursor.position() + Vector::new(0.0, cursor.height);
         let spans = match &preedit.selection {
             Some(selection) => {
                 vec![
@@ -94,7 +93,7 @@ where
         }
 
         let mut bounds = Rectangle::new(
-            self.cursor.position() - Vector::new(0.0, self.content.min_height()),
+            self.position - Vector::new(0.0, self.content.min_height()),
             self.content.min_bounds(),
         );
 

iced_layershell/src/multi_window/window_manager.rs

@@ -216,9 +216,9 @@ where
         }
     }
 
-    fn update_ime(&mut self, position: iced_core::Rectangle, purpose: input_method::Purpose) {
-        if self.ime_state != Some((position, purpose)) {
-            self.ime_state = Some((position, purpose));
+    fn update_ime(&mut self, cursor: iced_core::Rectangle, purpose: input_method::Purpose) {
+        if self.ime_state != Some((cursor, purpose)) {
+            self.ime_state = Some((cursor, purpose));
         }
     }
 

iced_sessionlock/src/conversion.rs

@@ -171,7 +171,7 @@ pub(crate) fn mouse_interaction(interaction: mouse::Interaction) -> String {
         Interaction::ZoomOut => Shape::ZoomOut.name().to_owned(),
         Interaction::ResizingDiagonallyUp => Shape::NwseResize.name().to_owned(),
         Interaction::ResizingDiagonallyDown => Shape::NwseResize.name().to_owned(),
-        _ => Shape::Default.name().to_owned()
+        _ => Shape::Default.name().to_owned(),
     }
 }