Tidy up logic in shortcut parsing

fyne-io · Feb 28, 2019 · 81c660a · 81c660a
1 parent 728a60a
commit 81c660a
Showing 1 changed file with 11 additions and 43 deletions.
diff --git a/driver/gl/window.go b/driver/gl/window.go
@@ -627,58 +627,26 @@ func (w *window) keyPressed(viewport *glfw.Window, key glfw.Key, scancode int, a
 	}
 
 	var shortcut fyne.Shortcut
-	switch runtime.GOOS {
-	case "darwin":
-		switch keyName {
-		case fyne.KeyV:
-			// detect paste shortcut
-			if keyDesktopModifier == desktop.SuperModifier {
-				shortcut = &fyne.ShortcutPaste{
-					Clipboard: w.Clipboard(),
-				}
-			}
-		case fyne.KeyC:
-			// detect copy shortcut
-			if keyDesktopModifier == desktop.SuperModifier {
-				shortcut = &fyne.ShortcutCopy{
-					Clipboard: w.Clipboard(),
-				}
-			}
-		case fyne.KeyX:
-			// detect cut shortcut
-			if keyDesktopModifier == desktop.SuperModifier {
-				shortcut = &fyne.ShortcutCut{
-					Clipboard: w.Clipboard(),
-				}
-			}
-		default:
-			shortcut = &desktop.CustomShortcut{
-				KeyName:  keyName,
-				Modifier: keyDesktopModifier,
-			}
-		}
-	default:
+	ctrlMod := desktop.ControlModifier
+	if runtime.GOOS == "darwin" {
+		ctrlMod = desktop.SuperModifier
+	}
+	if keyDesktopModifier == ctrlMod {
 		switch keyName {
 		case fyne.KeyV:
 			// detect paste shortcut
-			if keyDesktopModifier == desktop.ControlModifier {
-				shortcut = &fyne.ShortcutPaste{
-					Clipboard: w.Clipboard(),
-				}
+			shortcut = &fyne.ShortcutPaste{
+				Clipboard: w.Clipboard(),
 			}
 		case fyne.KeyC:
 			// detect copy shortcut
-			if keyDesktopModifier == desktop.ControlModifier {
-				shortcut = &fyne.ShortcutCopy{
-					Clipboard: w.Clipboard(),
-				}
+			shortcut = &fyne.ShortcutCopy{
+				Clipboard: w.Clipboard(),
 			}
 		case fyne.KeyX:
 			// detect cut shortcut
-			if keyDesktopModifier == desktop.ControlModifier {
-				shortcut = &fyne.ShortcutCut{
-					Clipboard: w.Clipboard(),
-				}
+			shortcut = &fyne.ShortcutCut{
+				Clipboard: w.Clipboard(),
 			}
 		default:
 			shortcut = &desktop.CustomShortcut{