Don't repeat Left/Right in multiple mods

Author: ids1024

src/page.rs

@@ -2,6 +2,13 @@ use crate::fl;
 use crate::picker::{LAYERS, SCANCODE_LABELS};
 use backend::{Key, Keycode, Mods};
 
+static MOD_LABELS: &[(Mods, &str)] = &[
+    (Mods::CTRL, "Ctrl"),
+    (Mods::SHIFT, "Shift"),
+    (Mods::ALT, "Alt"),
+    (Mods::SUPER, "Super"),
+];
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum Page {
     Layer1,
@@ -115,13 +122,25 @@ fn keycode_label(keycode: &Keycode) -> Option<Vec<String>> {
 }
 
 fn mods_label(mods: Mods) -> String {
-    let mut label = String::new();
-    for name in mods.mod_names() {
-        let mod_label = SCANCODE_LABELS.get(name).map_or("", String::as_str);
-        if !label.is_empty() {
-            label.push_str(" + ");
+    if mods.is_empty() {
+        return String::new();
+    }
+
+    let mut label = if mods.contains(Mods::RIGHT) {
+        "Right "
+    } else {
+        "Left "
+    }
+    .to_string();
+    let mut first = true;
+    for (mod_, mod_label) in MOD_LABELS {
+        if mods.contains(*mod_) {
+            if !first {
+                label.push_str(" + ");
+            }
+            label.push_str(mod_label);
+            first = false;
         }
-        label.push_str(mod_label);
     }
     label
 }