Fix key events in timeline window

friction2d · Nov 4, 2023 · 8642209 · 8642209
1 parent e476568
commit 8642209
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -1282,6 +1282,7 @@ void MainWindow::openTimelineWindow()
                                      tr("Timeline"),
                                      QString("TimelineWindow"),
                                      true,
+                                     true,
                                      true);
     }
     mTimelineWindow->focusWindow();
@@ -1994,7 +1995,7 @@ void MainWindow::closeEvent(QCloseEvent *e)
 
 bool MainWindow::processKeyEvent(QKeyEvent *event)
 {
-    if (isActiveWindow()) {
+    if (isActiveWindow() || (mTimelineWindow && mTimelineWindow->isActiveWindow())) {
         bool returnBool = false;
         if (event->type() == QEvent::KeyPress &&
             mTimeline->processKeyPress(event))

diff --git a/src/app/GUI/window.cpp b/src/app/GUI/window.cpp
@@ -28,14 +28,18 @@
 #include <QVBoxLayout>
 #include <QWindow>
 
+#include "mainwindow.h"
+
 Window::Window(QWidget *parent,
                QWidget *child,
                const QString title,
                const QString id,
                bool visible,
-               bool blockEscKey)
+               bool blockEscKey,
+               bool forwardKeys)
     : QDialog(parent)
     , mBlockEscKey(blockEscKey)
+    , mForwardKeys(forwardKeys)
 {
     setWindowFlags(Qt::Window |
                    Qt::WindowTitleHint |
@@ -67,6 +71,9 @@ void Window::focusWindow()
 
 void Window::keyPressEvent(QKeyEvent *event)
 {
+    if (mForwardKeys) {
+        MainWindow::sGetInstance()->processKeyEvent(event);
+    }
     if (mBlockEscKey && event->key() == Qt::Key_Escape) { return; }
     QDialog::keyPressEvent(event);
 }

diff --git a/src/app/GUI/window.h b/src/app/GUI/window.h
@@ -37,7 +37,8 @@ class Window : public QDialog
                     const QString title,
                     const QString id,
                     bool visible = true,
-                    bool blockEscKey = true);
+                    bool blockEscKey = true,
+                    bool forwardKeys = false);
     ~Window();
     void focusWindow();
 
@@ -48,6 +49,7 @@ class Window : public QDialog
     void loadState(bool visible = true);
     void saveState();
     bool mBlockEscKey;
+    bool mForwardKeys;
 };
 
 #endif // WINDOW_H