From 7db5256b720c3ecbe7c1cce7a1b47fd03151e03a Mon Sep 17 00:00:00 2001
From: KENZ <KENZ.gelsoft@gmail.com>
Date: Fri, 10 Jan 2025 07:12:31 +0900
Subject: Draft `input_method` support

---
 widget/src/combo_box.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'widget/src/combo_box.rs')

diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs
index 500d2bec..d7c7c922 100644
--- a/widget/src/combo_box.rs
+++ b/widget/src/combo_box.rs
@@ -564,6 +564,7 @@ where
                 }
             }
         }
+        shell.update_caret_info(local_shell.caret_info());
 
         // Then finally react to them here
         for message in local_messages {
@@ -742,6 +743,8 @@ where
                 published_message_to_shell = true;
 
                 // Unfocus the input
+                let mut local_messages = Vec::new();
+                let mut local_shell = Shell::new(&mut local_messages);
                 self.text_input.update(
                     &mut tree.children[0],
                     Event::Mouse(mouse::Event::ButtonPressed(
@@ -751,9 +754,10 @@ where
                     mouse::Cursor::Unavailable,
                     renderer,
                     clipboard,
-                    &mut Shell::new(&mut vec![]),
+                    &mut local_shell,
                     viewport,
                 );
+                shell.update_caret_info(local_shell.caret_info());
             }
         });
 
-- 
cgit 


From ae10adda74320e8098bfeb401f12a278e1e7b3e2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 2 Feb 2025 20:45:29 +0100
Subject: Refactor and simplify `input_method` API

---
 widget/src/combo_box.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'widget/src/combo_box.rs')

diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs
index d7c7c922..05793155 100644
--- a/widget/src/combo_box.rs
+++ b/widget/src/combo_box.rs
@@ -63,7 +63,6 @@ use crate::core::renderer;
 use crate::core::text;
 use crate::core::time::Instant;
 use crate::core::widget::{self, Widget};
-use crate::core::window;
 use crate::core::{
     Clipboard, Element, Event, Length, Padding, Rectangle, Shell, Size, Theme,
     Vector,
@@ -554,17 +553,8 @@ where
             shell.capture_event();
         }
 
-        if let Some(redraw_request) = local_shell.redraw_request() {
-            match redraw_request {
-                window::RedrawRequest::NextFrame => {
-                    shell.request_redraw();
-                }
-                window::RedrawRequest::At(at) => {
-                    shell.request_redraw_at(at);
-                }
-            }
-        }
-        shell.update_caret_info(local_shell.caret_info());
+        shell.request_redraw_at(local_shell.redraw_request());
+        shell.request_input_method(local_shell.input_method());
 
         // Then finally react to them here
         for message in local_messages {
@@ -757,7 +747,7 @@ where
                     &mut local_shell,
                     viewport,
                 );
-                shell.update_caret_info(local_shell.caret_info());
+                shell.request_input_method(local_shell.input_method());
             }
         });
 
-- 
cgit