better fix for AltGr triggers shortcut

Reverts e6235f9 https://forum.shotcut.org/t/shortcut-collision/44901
mltframework · Jul 2, 2024 · 7027d20 · 7027d20
1 parent 8ad6a93
commit 7027d20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -341,6 +341,8 @@ int main(int argc, char **argv)
         qputenv("QT_MEDIA_BACKEND", "darwin");
 #elif defined(Q_OS_WIN)
         qputenv("QT_MEDIA_BACKEND", "windows");
+    if (!qEnvironmentVariableIsSet("QT_QPA_PLATFORM"))
+        qputenv("QT_QPA_PLATFORM", "windows:altgr");
 #else
         ;
 #endif

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -2288,23 +2288,6 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 
     bool handled = true;
 
-#if defined(Q_OS_WIN)
-    static auto fixedBrokenCtrlAlt = false;
-    if (!fixedBrokenCtrlAlt && event->nativeScanCode() == 57400 /* AltGr */
-            && event->modifiers() == (Qt::ControlModifier | Qt::AltModifier)) {
-        LOG_INFO() << "Received AltGr keypress, removing Ctrl+Alt shortcuts";
-        fixedBrokenCtrlAlt = true;
-        for (auto &k : Actions.keys()) {
-            auto shortcuts = Actions[k]->shortcuts();
-            for (auto &s : shortcuts) {
-                if (s.toString().startsWith("Ctrl+Alt+"))
-                    shortcuts.removeAll(s);
-            }
-            Actions[k]->setShortcuts(shortcuts);
-        }
-    }
-#endif
-
     switch (event->key()) {
     case Qt::Key_J:
         if (m_isKKeyPressed)