Adjust sensitivity in tap-hold

Author: ids1024

src/picker/mod.rs

@@ -129,6 +129,7 @@ impl WidgetImpl for PickerInner {
                 };
                 widget.inner().shift.set(shift);
                 widget.invalidate_sensitivity();
+                widget.inner().tap_hold.set_shift(shift);
                 Inhibit(false)
             }));
         }

src/picker/tap_hold.rs

@@ -11,7 +11,7 @@ use std::cell::{Cell, RefCell};
 use super::{picker_group_box::PickerGroupBox, PickerKey, SCANCODE_LABELS};
 use backend::{is_qmk_basic, DerefCell, Keycode, Mods};
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, PartialEq)]
 enum Hold {
     Mods(Mods),
     Layer(u8),
@@ -37,6 +37,7 @@ pub static LAYERS: &[&str] = &["LAYER_ACCESS_1", "FN", "LAYER_ACCESS_3", "LAYER_
 
 #[derive(Default)]
 pub struct TapHoldInner {
+    shift: Cell<bool>,
     hold: Cell<Hold>,
     keycode: RefCell<Option<String>>,
     mod_buttons: DerefCell<Vec<PickerKey>>,
@@ -69,6 +70,7 @@ impl ObjectImpl for TapHoldInner {
 
         let picker_group_box = cascade! {
             PickerGroupBox::new("basics");
+            ..set_sensitive(false);
             ..connect_key_pressed(clone!(@weak widget => move |name, _shift| {
                 *widget.inner().keycode.borrow_mut() = Some(name);
                 widget.update();
@@ -225,5 +227,47 @@ impl TapHold {
         } else {
             self.inner().picker_group_box.set_selected(Vec::new());
         }
+
+        self.invalidate_sensitivity();
+    }
+
+    pub fn set_shift(&self, shift: bool) {
+        self.inner().shift.set(shift);
+        self.invalidate_sensitivity();
+    }
+
+    fn invalidate_sensitivity(&self) {
+        let shift = self.inner().shift.get();
+        let hold = self.inner().hold.get();
+        let hold_empty = hold == Hold::Mods(Mods::empty());
+        let keycode = self.inner().keycode.borrow();
+
+        for button in self.inner().layer_buttons.iter() {
+            button.set_sensitive(if shift {
+                hold == Hold::Mods(Mods::empty())
+            } else {
+                true
+            });
+        }
+
+        for button in self.inner().mod_buttons.iter() {
+            button.set_sensitive(if shift {
+                match hold {
+                    Hold::Mods(mods) => {
+                        let right = button.name().starts_with("RIGHT");
+                        mods.is_empty() || (right == mods.contains(Mods::RIGHT))
+                    }
+                    Hold::Layer(_) => false,
+                }
+            } else {
+                true
+            });
+        }
+
+        self.inner().picker_group_box.set_sensitive(if shift {
+            !hold_empty && keycode.is_none()
+        } else {
+            !hold_empty
+        });
     }
 }