ft2-clone

commit 11d81a1efabd26441df0e55dfa7838f15851af5f
parent d501f401aefda30c7c20de806d4b3b48fe4d9218
Author: Olav Sørensen <olav.sorensen@live.no>
Date:   Wed,  4 Oct 2023 12:16:06 +0200

CTRL+A/ALT+A keybindings were swapped

Diffstat:
M
src/ft2_header.h
 | 
2
+-
M
src/ft2_keyboard.c
 | 
28
++++++++++++----------------

2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/ft2_header.h b/src/ft2_header.h
@@ -12,7 +12,7 @@
 #endif
 #include "ft2_replayer.h"
 
-#define PROG_VER_STR "1.70"
+#define PROG_VER_STR "1.71"
 
 // do NOT change these! It will only mess things up...
 
diff --git a/src/ft2_keyboard.c b/src/ft2_keyboard.c
@@ -774,30 +774,26 @@ static bool checkModifiedKeys(SDL_Keycode keycode)
 
 		case SDLK_a:
 		{
-#ifdef __APPLE__
-			if (keyb.leftAltPressed || keyb.leftCommandPressed)
-#else
-			if (keyb.leftAltPressed)
-#endif
+			if (ui.sampleEditorShown)
 			{
-				if (ui.sampleEditorShown)
-					rangeAll();
 #ifdef __APPLE__
-				else if (!keyb.leftCommandPressed) // yuck!
+				if (keyb.leftCtrlPressed || keyb.leftAltPressed || keyb.leftCommandPressed)
 #else
-				else
+				if (keyb.leftCtrlPressed || keyb.leftAltPressed)
 #endif
-					showAdvEdit();
-
+				{
+					rangeAll();
+					return true;
+				}
+			}
+			else if (keyb.leftCtrlPressed)
+			{
+				showAdvEdit();
 				return true;
 			}
 			else if (keyb.leftAltPressed)
 			{
-				if (ui.sampleEditorShown)
-					rangeAll();
-				else
-					jumpToChannel(8);
-
+				jumpToChannel(8);
 				return true;
 			}
 		}