File 2002-fix-shortcuts.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2002-fix-shortcuts.patch of Package spectacle (Revision e230db1a0b4008cf4140715222592500)

Currently displaying revision e230db1a0b4008cf4140715222592500 , Show latest

diff --git a/src/Gui/CaptureWindow.cpp b/src/Gui/CaptureWindow.cpp
index 8da9b7a0f719576b6fc053cff1f3ca5a18b369b8..6f40044242230baf9bdbea1e99a22574480c93a2 100644
--- a/src/Gui/CaptureWindow.cpp
+++ b/src/Gui/CaptureWindow.cpp
@@ -147,32 +147,26 @@ void CaptureWindow::mousePressEvent(QMouseEvent *event)
     SpectacleWindow::mousePressEvent(event);
 }
 
-void CaptureWindow::keyReleaseEvent(QKeyEvent *event)
+void CaptureWindow::keyPressEvent(QKeyEvent *event)
 {
-    SpectacleWindow::keyReleaseEvent(event);
-    if (event->isAccepted()) {
-        return;
-    }
+    SpectacleWindow::keyPressEvent(event);
+
     if (event->matches(QKeySequence::Save)) {
-        event->accept();
         save();
     } else if (event->matches(QKeySequence::SaveAs)) {
-        event->accept();
         saveAs();
     } else if (event->matches(QKeySequence::Copy)) {
-        event->accept();
         copyImage();
     } else if (event->matches(QKeySequence::Print)) {
-        event->accept();
         showPrintDialog();
-    }
-    auto document = SpectacleCore::instance()->annotationDocument();
-    if (!event->isAccepted() && document) {
-        if (document->undoStackDepth() > 0 && event->matches(QKeySequence::Undo)) {
-            event->accept();
+    } else if (event->matches(QKeySequence::Undo)) {
+        auto document = SpectacleCore::instance()->annotationDocument();
+        if (document && document->undoStackDepth() > 0) {
             document->undo();
-        } else if (document->redoStackDepth() > 0 && event->matches(QKeySequence::Redo)) {
-            event->accept();
+        }
+    } else if (event->matches(QKeySequence::Redo)) {
+        auto document = SpectacleCore::instance()->annotationDocument();
+        if (document && document->redoStackDepth() > 0) {
             document->redo();
         }
     }
diff --git a/src/Gui/CaptureWindow.h b/src/Gui/CaptureWindow.h
index e8222ba3e049e002324bf58c64130917ea165dac..dcc598357ef4711c5471e11b256f260a9472ad38 100644
--- a/src/Gui/CaptureWindow.h
+++ b/src/Gui/CaptureWindow.h
@@ -45,7 +45,7 @@ Q_SIGNALS:
 
 protected:
     void mousePressEvent(QMouseEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
     void showEvent(QShowEvent *event) override;
 
 private:
diff --git a/src/Gui/SpectacleWindow.cpp b/src/Gui/SpectacleWindow.cpp
index 2e71763f50a153a3c9359d43da726de9571932f7..eebfe4bbf5ca523ccc7d4bb37d6514a540c42c97 100644
--- a/src/Gui/SpectacleWindow.cpp
+++ b/src/Gui/SpectacleWindow.cpp
@@ -515,31 +515,9 @@ void SpectacleWindow::mousePressEvent(QMouseEvent *event)
 
 void SpectacleWindow::keyPressEvent(QKeyEvent *event)
 {
-    // Events need to be processed normally first for events to reach items
     QQuickView::keyPressEvent(event);
-    if (event->isAccepted()) {
-        return;
-    }
-    m_pressedKeys = event->key() | event->modifiers();
-}
 
-void SpectacleWindow::keyReleaseEvent(QKeyEvent *event)
-{
-    // Events need to be processed normally first for events to reach items
-    QQuickView::keyReleaseEvent(event);
-    if (event->isAccepted()) {
-        return;
-    }
-    // Cancel defaults to Escape in QPlatformTheme.
-    // Handling this here fixes https://bugs.kde.org/show_bug.cgi?id=428478
-    if ((event->matches(QKeySequence::Quit)
-        || event->matches(QKeySequence::Close)
-        || event->matches(QKeySequence::Cancel))
-        // We need to check if these were pressed previously or else pressing escape
-        // in a dialog will quit spectacle when you release the escape key.
-        && m_pressedKeys == event->key() | event->modifiers()
-    ) {
-        event->accept();
+    if ((event->matches(QKeySequence::Quit) || event->matches(QKeySequence::Close) || event->matches(QKeySequence::Cancel))) {
         auto spectacleCore = SpectacleCore::instance();
         if (spectacleCore->captureTimeRemaining() > 0) {
             spectacleCore->cancelScreenshot();
@@ -547,16 +525,12 @@ void SpectacleWindow::keyReleaseEvent(QKeyEvent *event)
             Q_EMIT engine()->quit();
         }
     } else if (event->matches(QKeySequence::Preferences)) {
-        event->accept();
         showPreferencesDialog();
     } else if (event->matches(QKeySequence::New)) {
-        event->accept();
         SpectacleCore::instance()->takeNewScreenshot();
     } else if (event->matches(QKeySequence::HelpContents)) {
-        event->accept();
         m_helpMenu->showAppHelp();
     }
-    m_pressedKeys = {};
 }
 
 #include "moc_SpectacleWindow.cpp"
diff --git a/src/Gui/SpectacleWindow.h b/src/Gui/SpectacleWindow.h
index 77be2cec7366465a46ceade570966033321d84bb..93809858d5406bf6e18ebbf382891838b0e775e6 100644
--- a/src/Gui/SpectacleWindow.h
+++ b/src/Gui/SpectacleWindow.h
@@ -120,7 +120,6 @@ protected:
 
     void mousePressEvent(QMouseEvent *event) override;
     void keyPressEvent(QKeyEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
 
     static QVector<SpectacleWindow *> s_spectacleWindowInstances;
     static bool s_synchronizingVisibility;
@@ -135,6 +134,4 @@ protected:
     const std::unique_ptr<HelpMenu> m_helpMenu;
     const std::unique_ptr<QQmlContext> m_context;
     std::unique_ptr<QQmlComponent> m_component;
-
-    QKeySequence m_pressedKeys;
 };
diff --git a/src/Gui/ViewerWindow.cpp b/src/Gui/ViewerWindow.cpp
index 185c683daf44a271ee4761c86c84d7774d8da2c9..5ccc58c1109367ac60b70d11e1621d690c9e3e4a 100644
--- a/src/Gui/ViewerWindow.cpp
+++ b/src/Gui/ViewerWindow.cpp
@@ -223,32 +223,30 @@ void ViewerWindow::resizeEvent(QResizeEvent *event)
     }
 }
 
-void ViewerWindow::keyReleaseEvent(QKeyEvent *event)
+void ViewerWindow::keyPressEvent(QKeyEvent *event)
 {
-    SpectacleWindow::keyReleaseEvent(event);
-    if (event->isAccepted() || m_mode == Dialog) {
+    SpectacleWindow::keyPressEvent(event);
+
+    if (m_mode != Image) {
         return;
     }
+
     if (event->matches(QKeySequence::Save)) {
-        event->accept();
         save();
     } else if (event->matches(QKeySequence::SaveAs)) {
-        event->accept();
         saveAs();
     } else if (event->matches(QKeySequence::Copy)) {
-        event->accept();
         copyImage();
     } else if (event->matches(QKeySequence::Print)) {
-        event->accept();
         showPrintDialog();
-    }
-    auto document = SpectacleCore::instance()->annotationDocument();
-    if (!event->isAccepted() && document) {
-        if (document->undoStackDepth() > 0 && event->matches(QKeySequence::Undo)) {
-            event->accept();
+    } else if (event->matches(QKeySequence::Undo)) {
+        auto document = SpectacleCore::instance()->annotationDocument();
+        if (document && document->undoStackDepth() > 0) {
             document->undo();
-        } else if (document->redoStackDepth() > 0 && event->matches(QKeySequence::Redo)) {
-            event->accept();
+        }
+    } else if (event->matches(QKeySequence::Redo)) {
+        auto document = SpectacleCore::instance()->annotationDocument();
+        if (document && document->redoStackDepth() > 0) {
             document->redo();
         }
     }
diff --git a/src/Gui/ViewerWindow.h b/src/Gui/ViewerWindow.h
index a347f395ba7d8e865f2e04ec867bfb941f84976a..8d220119fe892bb032ea5ffe1172bd1a74267ecc 100644
--- a/src/Gui/ViewerWindow.h
+++ b/src/Gui/ViewerWindow.h
@@ -53,7 +53,7 @@ Q_SIGNALS:
 protected:
     bool event(QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
 
 private:
     explicit ViewerWindow(Mode mode, QQmlEngine *engine, QWindow *parent = nullptr);

Places

File 2002-fix-shortcuts.patch of Package spectacle (Revision e230db1a0b4008cf4140715222592500)

Places