Show tap-hold, extras only on QMK

Author: ids1024

backend/src/layout/mod.rs

@@ -195,6 +195,10 @@ impl Layout {
         }
     }
 
+    pub fn has_scancode(&self, scancode_name: &str) -> bool {
+        self.keymap.get(scancode_name).is_some()
+    }
+
     pub fn f_keys(&self) -> impl Iterator<Item = &str> {
         self.default.map.iter().filter_map(|(k, v)| {
             if let Some(num) = v[0].strip_prefix('F') {

src/keyboard.rs

@@ -283,7 +283,7 @@ impl Keyboard {
         }
     }
 
-    fn layout(&self) -> &Layout {
+    pub fn layout(&self) -> &Layout {
         &self.inner().board.layout()
     }
 
@@ -303,11 +303,6 @@ impl Keyboard {
         &self.inner().layer_stack
     }
 
-    // XXX
-    pub fn has_scancode(&self, scancode_name: &Keycode) -> bool {
-        self.layout().scancode_from_name(scancode_name).is_some()
-    }
-
     pub async fn keymap_set(&self, key_index: usize, layer: usize, scancode_name: &Keycode) {
         if let Err(err) = self.board().keys()[key_index]
             .set_scancode(layer, scancode_name)

src/picker/mod.rs

@@ -40,7 +40,9 @@ pub static SCANCODE_LABELS: Lazy<HashMap<String, String>> = Lazy::new(|| {
 
 #[derive(Default)]
 pub struct PickerInner {
-    group_boxes: DerefCell<Vec<PickerGroupBox>>,
+    stack_switcher: DerefCell<gtk::StackSwitcher>,
+    basics_group_box: DerefCell<PickerGroupBox>,
+    extras_group_box: DerefCell<PickerGroupBox>,
     keyboard: RefCell<Option<Keyboard>>,
     selected: RefCell<Vec<Keycode>>,
     shift: Cell<bool>,
@@ -100,8 +102,9 @@ impl ObjectImpl for PickerInner {
             ..show_all();
         };
 
-        self.group_boxes
-            .set(vec![basics_group_box, extras_group_box]);
+        self.stack_switcher.set(stack_switcher);
+        self.basics_group_box.set(basics_group_box);
+        self.extras_group_box.set(extras_group_box);
         self.tap_hold.set(tap_hold);
     }
 }
@@ -156,26 +159,35 @@ impl Picker {
         PickerInner::from_instance(self)
     }
 
+    fn group_boxes(&self) -> [&PickerGroupBox; 2] {
+        [
+            &*self.inner().basics_group_box,
+            &*self.inner().extras_group_box,
+        ]
+    }
+
     pub(crate) fn set_keyboard(&self, keyboard: Option<Keyboard>) {
         if let Some(old_kb) = &*self.inner().keyboard.borrow() {
             old_kb.set_picker(None);
         }
 
         if let Some(kb) = &keyboard {
             // Check that scancode is available for the keyboard
-            for group_box in self.inner().group_boxes.iter() {
-                group_box.set_key_visibility(|name| {
-                    kb.has_scancode(&Keycode::Basic(Mods::empty(), name.to_string()))
-                });
+            for group_box in self.group_boxes() {
+                group_box.set_key_visibility(|name| kb.layout().has_scancode(name));
             }
+            let is_qmk = kb.layout().meta.is_qmk;
+            self.inner().extras_group_box.set_visible(is_qmk);
+            self.inner().tap_hold.set_visible(is_qmk);
+            self.inner().stack_switcher.set_visible(is_qmk);
             kb.set_picker(Some(&self));
         }
 
         *self.inner().keyboard.borrow_mut() = keyboard;
     }
 
     pub(crate) fn set_selected(&self, scancode_names: Vec<Keycode>) {
-        for group_box in self.inner().group_boxes.iter() {
+        for group_box in self.group_boxes() {
             group_box.set_selected(scancode_names.clone());
         }
         self.inner().tap_hold.set_selected(scancode_names.clone());
@@ -271,7 +283,7 @@ impl Picker {
             allow_non_basic = true;
         }
 
-        for group_box in self.inner().group_boxes.iter() {
+        for group_box in self.group_boxes() {
             group_box.set_key_sensitivity(|name| {
                 if ["LEFT_SHIFT", "LEFT_ALT", "LEFT_CTRL", "LEFT_SUPER"].contains(&name) {
                     allow_left_mods