From 8c5cc950b836ddb44ca820bfda3394e4a9feb135 Mon Sep 17 00:00:00 2001
From: khavik <38088012+khavik@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:01:33 +0100
Subject: [PATCH] macOS: added/modified default keyboard shortcuts (#1630)

* macOS: added/modified default keyboard shortcuts for Settings and Redo to match recommended defaults for Mac apps

* fixed indentation on preprocessor directives
---
 src/gui/guiConst.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp
index 75decd374..9761af578 100644
--- a/src/gui/guiConst.cpp
+++ b/src/gui/guiConst.cpp
@@ -538,7 +538,11 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
   D("SAVE", "Save file", FURKMOD_CMD|SDLK_s),
   D("SAVE_AS", "Save as", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_s),
   D("UNDO", "Undo", FURKMOD_CMD|SDLK_z),
+#ifdef __APPLE__
+  D("REDO", "Redo", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_z),
+#else
   D("REDO", "Redo", FURKMOD_CMD|SDLK_y),
+#endif
   D("PLAY_TOGGLE", "Play/Stop (toggle)", SDLK_RETURN),
   D("PLAY", "Play", 0),
   D("STOP", "Stop", 0),
@@ -574,7 +578,11 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
   D("WINDOW_SAMPLE_LIST", "Sample List", 0),
   D("WINDOW_SAMPLE_EDIT", "Sample Editor", 0),
   D("WINDOW_ABOUT", "About", 0),
+#ifdef __APPLE__
+  D("WINDOW_SETTINGS", "Settings", FURKMOD_CMD|SDLK_COMMA),
+#else
   D("WINDOW_SETTINGS", "Settings", 0),
+#endif
   D("WINDOW_MIXER", "Mixer", 0),
   D("WINDOW_DEBUG", "Debug Menu", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_d),
   D("WINDOW_OSCILLOSCOPE", "Oscilloscope (master)", 0),