From b9b21532307ba04e8f734624c41bbe77cc84c098 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 5 Feb 2026 13:17:18 -0700
Subject: [PATCH] Adjust to design and hard-code Copy and Paste special keys

---
 src/main.rs      | 58 ++++++++++++++++++++++++++++++------------------
 src/shortcuts.rs |  4 ----
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3ca2723..5d8a86b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -970,13 +970,18 @@ impl App {
 
     fn keyboard_shortcuts(&self) -> Element<'_, Message> {
         let cosmic_theme::Spacing {
-            space_xxs, space_m, ..
+            space_xxs,
+            space_s,
+            space_m,
+            space_l,
+            space_xl,
+            ..
         } = self.core().system_theme().cosmic().spacing;
 
-        let pad_m = [space_xxs, space_m];
-        let div_m = 16;
-        let pad_l = [space_xxs, space_m + 32];
-        let div_l = div_m + 32;
+        let pad_action = [space_xxs, space_m];
+        let div_action = space_s;
+        let pad_binding = [space_xxs, space_xl];
+        let div_binding = space_l;
 
         let mut groups = Vec::new();
         //TODO: fix text input focus going outside bounds
@@ -1021,17 +1026,22 @@ impl App {
                     widget::tooltip::Position::Top,
                 ));
 
-                list = list.list_item_padding(pad_m);
-                list = list.add(widget::settings::item::builder(action_label).control(buttons));
-                list = list.divider_padding(div_m);
+                list = list.list_item_padding(pad_action);
+                list = list.divider_padding(div_action);
+                list = list.add(widget::settings::item_row(vec![
+                    widget::text::heading(action_label)
+                        .width(Length::Fill)
+                        .into(),
+                    buttons.into(),
+                ]));
 
                 if bindings.is_empty() {
-                    list = list.list_item_padding(pad_l);
+                    list = list.list_item_padding(pad_binding);
                     list = list.add(widget::text::body(fl!("no-shortcuts")));
-                    list = list.divider_padding(div_l);
+                    list = list.divider_padding(div_binding);
                 } else {
                     for resolved in bindings {
-                        list = list.list_item_padding(pad_l);
+                        list = list.list_item_padding(pad_binding);
                         list = list.add(
                             widget::settings::item::builder(shortcuts::binding_display(
                                 &resolved.binding,
@@ -1045,12 +1055,12 @@ impl App {
                                     )),
                             ),
                         );
-                        list = list.divider_padding(div_l);
+                        list = list.divider_padding(div_binding);
                     }
                 }
 
                 if self.shortcut_capture == Some(action) {
-                    list = list.list_item_padding(pad_l);
+                    list = list.list_item_padding(pad_binding);
                     list = list.add(
                         widget::row::with_children(vec![
                             widget::text::body(fl!("shortcut-capture-hint")).into(),
@@ -1061,7 +1071,7 @@ impl App {
                         ])
                         .spacing(space_xxs),
                     );
-                    list = list.divider_padding(div_l);
+                    list = list.divider_padding(div_binding);
                 }
             }
 
@@ -2345,17 +2355,19 @@ impl Application for App {
                 config_set!(focus_follow_mouse, focus_follow_mouse);
             }
             Message::Key(modifiers, key) => {
-                if self.shortcut_conflict.is_some() {
-                    if key == Key::Named(Named::Escape) {
-                        self.clear_shortcut_conflict();
+                // Hard-coded keys
+                match key {
+                    Key::Named(Named::Copy) => {
+                        return self.update(Message::Copy(None));
                     }
-                    return Task::none();
+                    Key::Named(Named::Paste) => {
+                        return self.update(Message::Paste(None));
+                    }
+                    _ => {}
                 }
+
+                // Handle shortcut capture
                 if let Some(action) = self.shortcut_capture {
-                    if key == Key::Named(Named::Escape) {
-                        self.shortcut_capture = None;
-                        return Task::none();
-                    }
                     if let Some(binding) = shortcuts::binding_from_key(modifiers, key) {
                         self.shortcut_capture = None;
                         if let Some(existing_action) =
@@ -2375,6 +2387,8 @@ impl Application for App {
                     }
                     return Task::none();
                 }
+
+                // Handle configurable keys
                 for (key_bind, action) in &self.key_binds {
                     if key_bind.matches(modifiers, &key) {
                         return self.update(action.message(None));
diff --git a/src/shortcuts.rs b/src/shortcuts.rs
index b9b0d4a..7e922e9 100644
--- a/src/shortcuts.rs
+++ b/src/shortcuts.rs
@@ -446,14 +446,12 @@ fn fallback_shortcuts() -> Shortcuts {
     // Standard key bindings
     bind!([Ctrl, Shift], "A", SelectAll);
     bind!([Ctrl, Shift], "C", Copy);
-    bind!([], "Copy", Copy);
     bind!([Ctrl], "c", CopyOrSigint);
     bind!([Ctrl, Shift], "F", Find);
     bind!([Ctrl, Shift], "N", WindowNew);
     bind!([Ctrl, Shift], "Q", WindowClose);
     bind!([Ctrl, Shift], "T", TabNew);
     bind!([Ctrl, Shift], "V", Paste);
-    bind!([], "Paste", Paste);
     bind!([Shift], "Insert", PastePrimary);
     bind!([Ctrl, Shift], "W", TabClose);
     bind!([Ctrl], ",", Settings);
@@ -507,8 +505,6 @@ fn fallback_shortcuts() -> Shortcuts {
 
 fn key_from_string(value: &str) -> Option<Key> {
     match value {
-        "Copy" => Some(Key::Named(Named::Copy)),
-        "Paste" => Some(Key::Named(Named::Paste)),
         "Insert" => Some(Key::Named(Named::Insert)),
         "Tab" => Some(Key::Named(Named::Tab)),
         "F11" => Some(Key::Named(Named::F11)),