Do not pass text size to Preedit::new
This commit is contained in:
parent
fcdf53afde
commit
cf851e133a
3 changed files with 12 additions and 8 deletions
|
|
@ -40,14 +40,11 @@ pub struct Preedit<T = String> {
|
||||||
|
|
||||||
impl<T> Preedit<T> {
|
impl<T> Preedit<T> {
|
||||||
/// Creates a new empty [`Preedit`].
|
/// Creates a new empty [`Preedit`].
|
||||||
pub fn new(text_size: Option<impl Into<Pixels>>) -> Self
|
pub fn new() -> Self
|
||||||
where
|
where
|
||||||
T: Default,
|
T: Default,
|
||||||
{
|
{
|
||||||
Self {
|
Self::default()
|
||||||
text_size: text_size.map(Into::into),
|
|
||||||
..Default::default()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Turns a [`Preedit`] into its owned version.
|
/// Turns a [`Preedit`] into its owned version.
|
||||||
|
|
|
||||||
|
|
@ -754,7 +754,9 @@ where
|
||||||
Update::InputMethod(update) => match update {
|
Update::InputMethod(update) => match update {
|
||||||
Ime::Toggle(is_open) => {
|
Ime::Toggle(is_open) => {
|
||||||
state.preedit = is_open.then(|| {
|
state.preedit = is_open.then(|| {
|
||||||
input_method::Preedit::new(self.text_size)
|
let mut preedit = input_method::Preedit::new();
|
||||||
|
preedit.text_size = self.text_size;
|
||||||
|
preedit
|
||||||
});
|
});
|
||||||
|
|
||||||
shell.request_redraw();
|
shell.request_redraw();
|
||||||
|
|
|
||||||
|
|
@ -1261,8 +1261,13 @@ where
|
||||||
let state = state::<Renderer>(tree);
|
let state = state::<Renderer>(tree);
|
||||||
|
|
||||||
state.is_ime_open =
|
state.is_ime_open =
|
||||||
matches!(event, input_method::Event::Opened)
|
matches!(event, input_method::Event::Opened).then(
|
||||||
.then(|| input_method::Preedit::new(self.size));
|
|| {
|
||||||
|
let mut preedit = input_method::Preedit::new();
|
||||||
|
preedit.text_size = self.size;
|
||||||
|
preedit
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
shell.request_redraw();
|
shell.request_redraw();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue