andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-21 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

hotkey overlay: Put Ctrl and Shift before Alt

Browse Source 
They are commonly written this way.
This commit is contained in:
Ivan Molodetskikh
2025-02-13 08:45:23 +03:00
parent d47b59879a
commit 43ea4a172a
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/hotkey_overlay.rs
+17 -8
View File
@@ -398,12 +398,27 @@ fn key_name(comp_mod: CompositorMod, key: &Key) -> String {
let has_comp_mod = key.modifiers.contains(Modifiers::COMPOSITOR);
// Compositor mod goes first.
if has_comp_mod {
if comp_mod == CompositorMod::Super {
name.push_str("Super + ");
} else if comp_mod == CompositorMod::Alt {
name.push_str("Alt + ");
}
}
if key.modifiers.contains(Modifiers::SUPER)
|| (has_comp_mod && comp_mod == CompositorMod::Super)
&& !(has_comp_mod && comp_mod == CompositorMod::Super)
{
name.push_str("Super + ");
}
if key.modifiers.contains(Modifiers::ALT) || (has_comp_mod && comp_mod == CompositorMod::Alt) {
if key.modifiers.contains(Modifiers::CTRL) {
name.push_str("Ctrl + ");
}
if key.modifiers.contains(Modifiers::SHIFT) {
name.push_str("Shift + ");
}
if key.modifiers.contains(Modifiers::ALT) && !(has_comp_mod && comp_mod == CompositorMod::Alt) {
name.push_str("Alt + ");
}
if key.modifiers.contains(Modifiers::ISO_LEVEL3_SHIFT) {
@@ -412,12 +427,6 @@ fn key_name(comp_mod: CompositorMod, key: &Key) -> String {
if key.modifiers.contains(Modifiers::ISO_LEVEL5_SHIFT) {
name.push_str("ISO_Level5_Shift + ");
}
if key.modifiers.contains(Modifiers::SHIFT) {
name.push_str("Shift + ");
}
if key.modifiers.contains(Modifiers::CTRL) {
name.push_str("Ctrl + ");
}
let pretty = match key.trigger {
Trigger::Keysym(keysym) => prettify_keysym_name(&keysym_get_name(keysym)),