From a0c8c39b06e672c633e09f3751d46fa8fed4f3a4 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 22 Mar 2024 10:36:19 +0400 Subject: Make binds accept wheel names --- src/ui/hotkey_overlay.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/ui') diff --git a/src/ui/hotkey_overlay.rs b/src/ui/hotkey_overlay.rs index 5fc3cedb..f054b3cf 100644 --- a/src/ui/hotkey_overlay.rs +++ b/src/ui/hotkey_overlay.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::iter::zip; use std::rc::Rc; -use niri_config::{Action, Config, Key, Modifiers}; +use niri_config::{Action, Config, Key, Modifiers, Trigger}; use pangocairo::cairo::{self, ImageSurface}; use pangocairo::pango::{AttrColor, AttrInt, AttrList, AttrString, FontDescription, Weight}; use smithay::backend::renderer::element::memory::{ @@ -414,7 +414,15 @@ fn key_name(comp_mod: CompositorMod, key: &Key) -> String { if key.modifiers.contains(Modifiers::CTRL) { name.push_str("Ctrl + "); } - name.push_str(&prettify_keysym_name(&keysym_get_name(key.keysym))); + + let pretty = match key.trigger { + Trigger::Keysym(keysym) => prettify_keysym_name(&keysym_get_name(keysym)), + Trigger::WheelDown => String::from("Wheel Down"), + Trigger::WheelUp => String::from("Wheel Up"), + Trigger::WheelLeft => String::from("Wheel Left"), + Trigger::WheelRight => String::from("Wheel Right"), + }; + name.push_str(&pretty); name } -- cgit