macOS: fix key events #324

friction2d · Dec 10, 2024 · 646ea6b · 646ea6b
1 parent d23914e
commit 646ea6b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/app/GUI/canvaswindow.cpp b/src/app/GUI/canvaswindow.cpp
@@ -633,6 +633,9 @@ bool CanvasWindow::KFT_keyReleaseEvent(QKeyEvent *event)
 
 bool CanvasWindow::KFT_keyPressEvent(QKeyEvent *event)
 {
+#ifdef Q_OS_MAC
+    if (event->type() == QEvent::ShortcutOverride) { return false; }
+#endif
     if (!mCurrentCanvas) { return false; }
     if (mCurrentCanvas->isPreviewingOrRendering()) { return false; }
     const QPoint globalPos = QCursor::pos();

diff --git a/src/app/GUI/keysview.cpp b/src/app/GUI/keysview.cpp
@@ -385,7 +385,11 @@ stdsptr<KeysClipboard> KeysView::getSelectedKeysClipboardContainer() {
     return container;
 }
 
-bool KeysView::KFT_keyPressEvent(QKeyEvent *event) {
+bool KeysView::KFT_keyPressEvent(QKeyEvent *event)
+{
+#ifdef Q_OS_MAC
+    if (event->type() == QEvent::ShortcutOverride) { return false; }
+#endif
     bool inputHandled = false;
     if(mMovingKeys) {
         if(mValueInput.handleTransormationInputKeyEvent(event->key())) {

diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -574,7 +574,9 @@ void MainWindow::setupMenuBar()
         const auto qAct = new NoShortcutAction(tr("Duplicate", "MenuBar_Edit"));
         mEditMenu->addAction(qAct);
         qAct->setIcon(QIcon::fromTheme("duplicate"));
+#ifndef Q_OS_MAC
         qAct->setShortcut(Qt::CTRL + Qt::Key_D);
+#endif
         mActions.duplicateAction->connect(qAct);
         cmdAddAction(qAct);
     }
@@ -583,7 +585,9 @@ void MainWindow::setupMenuBar()
         const auto qAct = new NoShortcutAction(tr("Delete", "MenuBar_Edit"));
         qAct->setIcon(QIcon::fromTheme("trash"));
         mEditMenu->addAction(qAct);
+#ifndef Q_OS_MAC
         qAct->setShortcut(Qt::Key_Delete);
+#endif
         mActions.deleteAction->connect(qAct);
         cmdAddAction(qAct);
     }