diff options
| author |  Héctor <hector@hecrj.dev> | 2025-02-12 07:36:48 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2025-02-12 07:36:48 +0100 |
| commit | 7c1123d6c9c51b54cc25cd88f7922658a42230fb (patch) | |
| tree | fc21ed7a0d0dc5bee28250f5cdd84233fbbf4557 | |
| parent | 89a412695af321356a6f05f9111510d35a839983 (diff) | |
| parent | 7199ed0d079de5584ec0e7c8c5e8ff88cc1453e8 (diff) | |
| download | iced-7c1123d6c9c51b54cc25cd88f7922658a42230fb.tar.gz iced-7c1123d6c9c51b54cc25cd88f7922658a42230fb.tar.bz2 iced-7c1123d6c9c51b54cc25cd88f7922658a42230fb.zip | |
Merge pull request #2790 from rhysd/adjust-preedit-size
Set correct text size for preedit window
| -rw-r--r-- | core/src/input_method.rs | 10 | ||||
| -rw-r--r-- | widget/src/text_editor.rs | 7 | ||||
| -rw-r--r-- | widget/src/text_input.rs | 1 | ||||
| -rw-r--r-- | winit/src/program/window_manager.rs | 4 |
4 files changed, 16 insertions, 6 deletions
diff --git a/core/src/input_method.rs b/core/src/input_method.rs index 4e8c383b..9c83b083 100644 --- a/core/src/input_method.rs +++ b/core/src/input_method.rs @@ -1,5 +1,5 @@ //! Listen to input method events. -use crate::Point; +use crate::{Pixels, Point}; use std::ops::Range; @@ -34,6 +34,8 @@ pub struct Preedit<T = String> { pub content: T, /// The selected range of the content. pub selection: Option<Range<usize>>, + /// The text size of the content. + pub text_size: Option<Pixels>, } impl<T> Preedit<T> { @@ -53,6 +55,7 @@ impl<T> Preedit<T> { Preedit { content: self.content.as_ref().to_owned(), selection: self.selection.clone(), + text_size: self.text_size, } } } @@ -63,6 +66,7 @@ impl Preedit { Preedit { content: &self.content, selection: self.selection.clone(), + text_size: self.text_size, } } } @@ -90,13 +94,13 @@ impl InputMethod { /// let open = InputMethod::Open { /// position: Point::ORIGIN, /// purpose: Purpose::Normal, - /// preedit: Some(Preedit { content: "1".to_owned(), selection: None }), + /// preedit: Some(Preedit { content: "1".to_owned(), selection: None, text_size: None }), /// }; /// /// let open_2 = InputMethod::Open { /// position: Point::ORIGIN, /// purpose: Purpose::Secure, - /// preedit: Some(Preedit { content: "2".to_owned(), selection: None }), + /// preedit: Some(Preedit { content: "2".to_owned(), selection: None, text_size: None }), /// }; /// /// let mut ime = InputMethod::Disabled; diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs index e685256b..ce5da9ef 100644 --- a/widget/src/text_editor.rs +++ b/widget/src/text_editor.rs @@ -759,8 +759,11 @@ where shell.request_redraw(); } Ime::Preedit { content, selection } => { - state.preedit = - Some(input_method::Preedit { content, selection }); + state.preedit = Some(input_method::Preedit { + content, + selection, + text_size: self.text_size, + }); shell.request_redraw(); } diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index 7be5bbd9..37691e73 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -1273,6 +1273,7 @@ where state.is_ime_open = Some(input_method::Preedit { content: content.to_owned(), selection: selection.clone(), + text_size: self.size, }); shell.request_redraw(); diff --git a/winit/src/program/window_manager.rs b/winit/src/program/window_manager.rs index ae214e7c..d5b334df 100644 --- a/winit/src/program/window_manager.rs +++ b/winit/src/program/window_manager.rs @@ -322,7 +322,9 @@ where self.content = Renderer::Paragraph::with_spans(Text { content: &spans, bounds: Size::INFINITY, - size: renderer.default_size(), + size: preedit + .text_size + .unwrap_or_else(|| renderer.default_size()), line_height: text::LineHeight::default(), font: renderer.default_font(), horizontal_alignment: alignment::Horizontal::Left, |