Render tap-hold with line seperator

Author: ids1024

src/keyboard_layer.rs

@@ -161,18 +161,36 @@ impl WidgetImpl for KeyboardLayerInner {
                 cr.stroke().unwrap();
             }
 
-            // Draw label
-            let text = widget.page().get_label(k);
-            let layout = cascade! {
-                widget.create_pango_layout(Some(&text));
-                ..set_width((w * pango::SCALE as f64) as i32);
-                ..set_alignment(pango::Alignment::Center);
-            };
-            let text_height = layout.pixel_size().1 as f64;
+            // Draw labels, with line seperators if multiple
+            let labels = widget.page().get_label(k);
+            let layouts: Vec<_> = labels
+                .iter()
+                .map(|text| {
+                    cascade! {
+                        widget.create_pango_layout(Some(text));
+                        ..set_width((w * pango::SCALE as f64) as i32);
+                        ..set_alignment(pango::Alignment::Center);
+                    }
+                })
+                .collect();
+            let total_height = layouts
+                .iter()
+                .map(|layout| layout.pixel_size().1 as f64)
+                .sum::<f64>();
             cr.new_path();
-            cr.move_to(x, y + (h - text_height) / 2.);
             cr.set_source_rgba(fg.0, fg.1, fg.2, text_alpha);
-            pangocairo::show_layout(cr, &layout);
+            cr.set_line_width(1.);
+            cr.move_to(x, y + (h - total_height) / 2.);
+            for (i, layout) in layouts.iter().enumerate() {
+                pangocairo::show_layout(cr, &layout);
+                if i < layouts.len() - 1 {
+                    let text_height = layout.pixel_size().1 as f64;
+                    cr.rel_move_to(0.0, text_height);
+                    cr.rel_line_to(w, 0.0);
+                    cr.rel_move_to(-w, 1.0);
+                }
+            }
+            cr.stroke().unwrap();
         }
 
         Inhibit(false)

src/page.rs

@@ -59,21 +59,21 @@ impl Page {
         .into_iter()
     }
 
-    pub fn get_label(&self, key: &Key) -> String {
+    pub fn get_label(&self, key: &Key) -> Vec<String> {
         match self {
             Page::Layer1 | Page::Layer2 | Page::Layer3 | Page::Layer4 => {
                 let (scancode, scancode_name) = key.get_scancode(self.layer().unwrap()).unwrap();
                 match scancode_name {
                     Some(keycode) => {
-                        keycode_label(&keycode).unwrap_or_else(|| format!("{:?}", keycode))
+                        keycode_label(&keycode).unwrap_or_else(|| vec![format!("{:?}", keycode)])
                     }
-                    None => format!("{}", scancode),
+                    None => vec![format!("{}", scancode)],
                 }
             }
-            Page::Keycaps => key.physical_name.clone(),
-            Page::Logical => key.logical_name.clone(),
-            Page::Electrical => key.electrical_name.clone(),
-            Page::Leds => key.led_name.clone(),
+            Page::Keycaps => vec![key.physical_name.clone()],
+            Page::Logical => vec![key.logical_name.clone()],
+            Page::Electrical => vec![key.electrical_name.clone()],
+            Page::Leds => vec![key.led_name.clone()],
         }
     }
 }
@@ -85,11 +85,11 @@ impl Default for Page {
 }
 
 // TODO: represent mod-tap/layer-tap by rendering button with a seperator?
-fn keycode_label(keycode: &Keycode) -> Option<String> {
+fn keycode_label(keycode: &Keycode) -> Option<Vec<String>> {
     match keycode {
         Keycode::Basic(mods, keycode) => {
             if mods.is_empty() {
-                SCANCODE_LABELS.get(keycode).cloned()
+                Some(vec![SCANCODE_LABELS.get(keycode)?.clone()])
             } else {
                 let mut label = String::new();
                 for name in mods.mod_names() {
@@ -104,28 +104,26 @@ fn keycode_label(keycode: &Keycode) -> Option<String> {
                     label.push_str(" + ");
                     label.push_str(keycode_label);
                 }
-                Some(label)
+                Some(vec![label])
             }
         }
         Keycode::MT(mods, keycode) => {
-            let mut label = String::new();
+            let mut mods_label = String::new();
             for name in mods.mod_names() {
                 let mod_label = SCANCODE_LABELS.get(name)?;
-                if !label.is_empty() {
-                    label.push_str(" + ");
+                if !mods_label.is_empty() {
+                    mods_label.push_str(" + ");
                 }
-                label.push_str(mod_label);
+                mods_label.push_str(mod_label);
             }
-            let keycode_label = SCANCODE_LABELS.get(keycode)?;
-            label.push('\n');
-            label.push_str(keycode_label);
-            Some(label)
+            let keycode_label = SCANCODE_LABELS.get(keycode)?.clone();
+            Some(vec![mods_label, keycode_label])
         }
         Keycode::LT(layer, keycode) => {
             let layer_id = *LAYERS.get(usize::from(*layer))?;
-            let layer_label = SCANCODE_LABELS.get(layer_id)?;
-            let keycode_label = SCANCODE_LABELS.get(keycode)?;
-            Some(format!("{}\n{}", layer_label, keycode_label))
+            let layer_label = SCANCODE_LABELS.get(layer_id)?.clone();
+            let keycode_label = SCANCODE_LABELS.get(keycode)?.clone();
+            Some(vec![layer_label, keycode_label])
         }
     }
 }