leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update libcosmic for updated iced API

Browse source
This commit is contained in:
KENZ 2025-02-23 10:10:27 +09:00
parent 9f24ee85e1
commit 6c929f595c
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,7 +1,7 @@
[submodule "iced"] [submodule "iced"]
path = iced path = iced
url = https://github.com/pop-os/iced.git url = https://github.com/kenz-gelsoft/iced.git
branch = master branch = backport-input-method2
[submodule "icon-theme"] [submodule "icon-theme"]
path = cosmic-icons path = cosmic-icons
url = https://github.com/pop-os/cosmic-icons url = https://github.com/pop-os/cosmic-icons

2
iced

@ -1 +1 @@
Subproject commit 10db38f982001a714bd94e99a082368762b378ee Subproject commit 3f86956359b68949350f066941860121c41bb518

8
src/widget/text_input/input.rs
View file

@ -2168,10 +2168,6 @@ fn input_method<'b>(
return InputMethod::Disabled; return InputMethod::Disabled;
}; };
let Some(preedit) = &state.preedit else {
return InputMethod::Allowed;
};
let text_bounds = text_layout.bounds(); let text_bounds = text_layout.bounds();
let cursor_index = match state.cursor.state(value) { let cursor_index = match state.cursor.state(value) {
cursor::State::Index(position) => position, cursor::State::Index(position) => position,
@ -2183,14 +2179,14 @@ fn input_method<'b>(
x: text_bounds.x + cursor - offset, x: text_bounds.x + cursor - offset,
y: text_bounds.y + text_bounds.height, y: text_bounds.y + text_bounds.height,
}; };
InputMethod::Open { InputMethod::Enabled {
position: bottom_left, position: bottom_left,
purpose: if state.is_secure { purpose: if state.is_secure {
input_method::Purpose::Secure input_method::Purpose::Secure
} else { } else {
input_method::Purpose::Normal input_method::Purpose::Normal
}, },
preedit: Some(preedit.as_ref()), preedit: state.preedit.as_ref().map(input_method::Preedit::as_ref),
} }
} }