migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

x11: add workaround for disabling IME on gnome

Browse Source 
GNOME doesn't list that there's a _NONE_ style at all, but it still
works if you use it.
This commit is contained in:
Kirill Chibisov
2024-12-23 23:38:46 +03:00
committed by John Nunley
parent 6896de5b73
commit 5ea81efc74
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/changelog/unreleased.md
View File

@@ -71,6 +71,7 @@ changelog entry.
- Added `Window::safe_area`, which describes the area of the surface that is unobstructed. - Added `Window::safe_area`, which describes the area of the surface that is unobstructed.
- On X11, Wayland, Windows and macOS, improved scancode conversions for more obscure key codes. - On X11, Wayland, Windows and macOS, improved scancode conversions for more obscure key codes.
- Add ability to make non-activating window on macOS using `NSPanel` with `NSWindowStyleMask::NonactivatingPanel`. - Add ability to make non-activating window on macOS using `NSPanel` with `NSWindowStyleMask::NonactivatingPanel`.
- On X11, add a workaround for disabling IME on GNOME.
### Changed ### Changed

4
src/platform_impl/linux/x11/ime/input_method.rs
View File

@@ -82,7 +82,9 @@ impl InputMethod {
} }
let preedit_style = preedit_style.unwrap_or_else(|| none_style.unwrap()); let preedit_style = preedit_style.unwrap_or_else(|| none_style.unwrap());
let none_style = none_style.unwrap_or(preedit_style); // Always initialize none style even when it's not advertised, since it seems to work
// regardless...
let none_style = none_style.unwrap_or(Style::None(XIM_NONE_STYLE));
Some(InputMethod { im, _name: name, preedit_style, none_style }) Some(InputMethod { im, _name: name, preedit_style, none_style })
} }