Merge pull request #39 from sparshg/shortcuts

fix shortcuts on MacOS
Spydr06 · Oct 4, 2023 · acf5269 · acf5269
2 parents 8559ea5 + 6e249db
commit acf5269
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/application/mod.rs b/src/application/mod.rs
@@ -140,13 +140,23 @@ impl Application {
 
     pub(self) fn setup_gactions(&self) {
         gactions::ACTIONS.iter().for_each(|gaction| {
+            let mut accels = gaction.accels().to_vec();
+            let temp: Vec<String>;
+            if cfg!(target_os = "macos") {
+                temp = gaction
+                    .accels()
+                    .iter()
+                    .map(|s| s.replace("<primary>", "<meta>"))
+                    .collect::<Vec<String>>();
+                accels = temp.iter().map(|x| &**x).collect::<Vec<&str>>();
+            }
             let callback = gaction.callback();
             let action = gio::SimpleAction::from(gaction);
             action.connect_activate(glib::clone!(
                 @weak self as app => move |action, parameter| callback(app, action, parameter)
             ));
             self.add_action(&action);
-            self.set_accels_for_action(&format!("app.{}", gaction.name()), gaction.accels());
+            self.set_accels_for_action(&format!("app.{}", gaction.name()), &accels);
         });
     }
 }