From 7210045b2a058c4be7bef6fd2059f337bf53b1ec Mon Sep 17 00:00:00 2001
From: nnyyxxxx <nnyyxxxx@protonmail.com>
Date: Thu, 6 Mar 2025 17:24:44 -0500
Subject: feat: support color picker functionality

chore: format code

refactor: improve quality

feat: implement gnomes PickColor method

refactor: minor code extraction

misc: fix reviews

fixes
---
 src/input/mod.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/input/mod.rs')

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
-- 
cgit