aboutsummaryrefslogtreecommitdiff
path: root/src/input/mod.rs
diff options
context:
space:
mode:
authornnyyxxxx <nnyyxxxx@protonmail.com>2025-03-06 17:24:44 -0500
committerIvan Molodetskikh <yalterz@gmail.com>2025-03-22 23:14:51 -0700
commit7210045b2a058c4be7bef6fd2059f337bf53b1ec (patch)
treeac80aff269a65c16b49e95fb164aef91c3547af8 /src/input/mod.rs
parented20822ce947198e4106698d7afffd0a832a7b3c (diff)
downloadniri-7210045b2a058c4be7bef6fd2059f337bf53b1ec.tar.gz
niri-7210045b2a058c4be7bef6fd2059f337bf53b1ec.tar.bz2
niri-7210045b2a058c4be7bef6fd2059f337bf53b1ec.zip
feat: support color picker functionality
chore: format code refactor: improve quality feat: implement gnomes PickColor method refactor: minor code extraction misc: fix reviews fixes
Diffstat (limited to 'src/input/mod.rs')
-rw-r--r--src/input/mod.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 8fb5acb6..2744561c 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -48,6 +48,7 @@ use crate::utils::{center, get_monotonic_time, ResizeEdge};
pub mod backend_ext;
pub mod move_grab;
+pub mod pick_color_grab;
pub mod pick_window_grab;
pub mod resize_grab;
pub mod scroll_tracker;
@@ -377,7 +378,10 @@ impl State {
}
}
- if pressed && raw == Some(Keysym::Escape) && this.niri.pick_window.is_some() {
+ if pressed
+ && raw == Some(Keysym::Escape)
+ && (this.niri.pick_window.is_some() || this.niri.pick_color.is_some())
+ {
// We window picking state so the pick window grab must be active.
// Unsetting it cancels window picking.
this.niri