WIP style details

Author: ids1024

src/picker/group_box/basics.rs

@@ -1,11 +1,16 @@
 use super::{PickerAnsiGroup, PickerBasicGroup, PickerGroupBox};
 
+// TODO show label after ansi group?
+// TODO custom numpad group
+// - generalize code for ANSI group layout?
+// - how will ISO enter work?
+
 impl PickerGroupBox {
     pub fn basics() -> Self {
         Self::new(vec![
             Box::new(PickerAnsiGroup::new()),
             Box::new(PickerBasicGroup::new(
-                "Other Actions".to_string(),
+                "Other actions".to_string(),
                 4,
                 1.5,
                 &[

src/picker/group_box/mod.rs

@@ -191,7 +191,7 @@ impl PickerGroupBox {
     pub fn set_key_visibility<F: Fn(&str) -> bool>(&self, f: F) {
         for group in self.inner().groups.iter() {
             let group_visible = group.keys().iter().fold(false, |group_visible, key| {
-                key.set_visible(f(&key.name()));
+                key.set_visible(f(key.name()));
                 group_visible || key.get_visible()
             });
 
@@ -202,7 +202,7 @@ impl PickerGroupBox {
 
     pub fn set_key_sensitivity<F: Fn(&str) -> bool>(&self, f: F) {
         for key in self.inner().keys.values() {
-            key.set_sensitive(f(&key.name()));
+            key.set_sensitive(f(key.name()));
         }
     }
 

src/picker/mod.rs

@@ -188,7 +188,7 @@ impl Picker {
             self.inner().tap_hold.set_visible(is_qmk);
             self.inner().stack_switcher.set_visible(is_qmk);
             self.inner().is_qmk.set(is_qmk);
-            kb.set_picker(Some(&self));
+            kb.set_picker(Some(self));
         }
 
         *self.inner().keyboard.borrow_mut() = keyboard;

src/picker/picker_key.rs

@@ -61,7 +61,7 @@ impl PickerKey {
 
         let widget: Self = glib::Object::new(&[]).unwrap();
         widget.inner().name.set(name.to_string());
-        widget.inner().label.set_label(&keysym_label);
+        widget.inner().label.set_label(keysym_label);
         widget.set_size_request((48.0 * width) as i32, 48);
         widget
     }

src/picker/tap_hold.rs

@@ -75,7 +75,7 @@ impl ObjectImpl for TapHoldInner {
                 *widget.inner().keycode.borrow_mut() = Some(name);
                 widget.update();
             }));
-            ..set_key_visibility(|name| is_qmk_basic(name));
+            ..set_key_visibility(is_qmk_basic);
         };
 
         let hold_group_box = cascade! {
@@ -103,14 +103,15 @@ impl ObjectImpl for TapHoldInner {
                     }
                     Hold::Mods(new_mods)
                 } else {
-                    let n = LAYERS.iter().position(|x| *x == &name).unwrap() as u8;
+                    let n = LAYERS.iter().position(|x| *x == name).unwrap() as u8;
                     Hold::Layer(n)
                 };
                 widget.inner().hold.set(new_hold);
                 widget.update();
             }));
         };
 
+        // TODO indent
         cascade! {
             widget;
             ..set_spacing(8);
@@ -123,10 +124,14 @@ impl ObjectImpl for TapHoldInner {
                 }));
                 ..set_halign(gtk::Align::Start);
             });
-            ..add(&hold_group_box);
+            ..add(cascade! {
+                &hold_group_box;
+                ..set_margin_start(8);
+            });
             ..add(&cascade! {
                 gtk::Label::new(Some(&fl!("tap-hold-multiple-mod")));
                 ..set_halign(gtk::Align::Start);
+                ..set_margin_start(8);
             });
             // XXX grey?
             ..add(&cascade! {
@@ -137,7 +142,10 @@ impl ObjectImpl for TapHoldInner {
                 }));
                 ..set_halign(gtk::Align::Start);
             });
-            ..add(&picker_group_box);
+            ..add(cascade! {
+                &picker_group_box;
+                ..set_margin_start(8);
+            });
         };
 
         self.hold_group_box.set(hold_group_box);