feat: add MouseReleaseFilter and QtViewToggle classes for enhanced mo…

…use event handling

src/lib_gui/CMakeLists.txt

@@ -248,8 +248,14 @@ add_files(
   qt/window/QtKnownProgressDialog.h
   qt/window/QtLicenseWindow.cpp
   qt/window/QtLicenseWindow.h
+  # {
+  qt/window/MainWindow/MouseReleaseFilter.cpp
+  qt/window/MainWindow/MouseReleaseFilter.hpp
   qt/window/MainWindow/QtMainWindow.cpp
   qt/window/MainWindow/QtMainWindow.h
+  qt/window/MainWindow/QtViewToggle.cpp
+  qt/window/MainWindow/QtViewToggle.hpp
+  # }
   qt/window/QtPathListDialog.cpp
   qt/window/QtPathListDialog.h
   qt/window/QtPreferencesWindow.cpp

src/lib_gui/qt/window/MainWindow/MouseReleaseFilter.cpp

@@ -0,0 +1,29 @@
+#include "MouseReleaseFilter.hpp"
+
+#include <QMouseEvent>
+
+#include "IApplicationSettings.hpp"
+#include "type/history/MessageHistoryRedo.h"
+#include "type/history/MessageHistoryUndo.h"
+
+
+MouseReleaseFilter::MouseReleaseFilter(QObject* parent)
+    : QObject(parent)
+    , m_backButton(static_cast<std::size_t>(IApplicationSettings::getInstanceRaw()->getControlsMouseBackButton()))
+    , m_forwardButton(static_cast<std::size_t>(IApplicationSettings::getInstanceRaw()->getControlsMouseForwardButton())) {}
+
+bool MouseReleaseFilter::eventFilter(QObject* obj, QEvent* event) {
+  if(event->type() == QEvent::MouseButtonRelease) {
+    if(const auto* mouseEvent = dynamic_cast<QMouseEvent*>(event); mouseEvent != nullptr) {
+      if(mouseEvent->button() == m_backButton) {
+        MessageHistoryUndo{}.dispatch();
+        return true;
+      } else if(mouseEvent->button() == m_forwardButton) {
+        MessageHistoryRedo{}.dispatch();
+        return true;
+      }
+    }
+  }
+
+  return QObject::eventFilter(obj, event);
+}

src/lib_gui/qt/window/MainWindow/MouseReleaseFilter.hpp

@@ -0,0 +1,16 @@
+#pragma once
+#include <QObject>
+
+class MouseReleaseFilter : public QObject {
+  Q_OBJECT
+
+public:
+  explicit MouseReleaseFilter(QObject* parent);
+
+protected:
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+private:
+  size_t m_backButton;
+  size_t m_forwardButton;
+};

src/lib_gui/qt/window/MainWindow/QtMainWindow.cpp

@@ -19,10 +19,12 @@
 #include "Application.h"
 #include "Bookmark.h"
 #include "CompositeView.h"
+#include "FilePath.h"
 #include "FileSystem.h"
 #include "globalStrings.h"
 #include "IApplicationSettings.hpp"
 #include "logging.h"
+#include "MouseReleaseFilter.hpp"
 #include "QtAbout.h"
 #include "QtContextMenu.h"
 #include "QtFileDialog.h"
@@ -31,6 +33,7 @@
 #include "QtPreferencesWindow.h"
 #include "QtProjectWizard.h"
 #include "QtStartScreen.hpp"
+#include "QtViewToggle.hpp"
 #include "QtViewWidgetWrapper.h"
 #include "ResourcePaths.h"
 #include "TabbedView.h"
@@ -64,50 +67,6 @@
 #include "utilityString.h"
 #include "View.h"
 
-QtViewToggle::QtViewToggle(View* view, QWidget* parent) : QWidget(parent), m_view(view) {}
-
-void QtViewToggle::clear() {
-  m_view = nullptr;
-}
-
-void QtViewToggle::toggledByAction() {
-  if(m_view != nullptr) {
-    if(auto* window = dynamic_cast<QtMainWindow*>(parent()); window != nullptr) {
-      window->toggleView(m_view, true);
-    }
-  }
-}
-
-void QtViewToggle::toggledByUI() {
-  if(m_view != nullptr) {
-    if(auto* window = dynamic_cast<QtMainWindow*>(parent()); window != nullptr) {
-      window->toggleView(m_view, false);
-    }
-  }
-}
-
-
-MouseReleaseFilter::MouseReleaseFilter(QObject* parent) : QObject(parent) {
-  m_backButton = static_cast<std::size_t>(IApplicationSettings::getInstanceRaw()->getControlsMouseBackButton());
-  m_forwardButton = static_cast<std::size_t>(IApplicationSettings::getInstanceRaw()->getControlsMouseForwardButton());
-}
-
-bool MouseReleaseFilter::eventFilter(QObject* obj, QEvent* event) {
-  if(event->type() == QEvent::MouseButtonRelease) {
-    if(const auto* mouseEvent = dynamic_cast<QMouseEvent*>(event); mouseEvent != nullptr) {
-      if(mouseEvent->button() == m_backButton) {
-        MessageHistoryUndo().dispatch();
-        return true;
-      } else if(mouseEvent->button() == m_forwardButton) {
-        MessageHistoryRedo().dispatch();
-        return true;
-      }
-    }
-  }
-
-  return QObject::eventFilter(obj, event);
-}
-
 
 QtMainWindow::QtMainWindow() : m_windowStack(this) {
   setObjectName(QStringLiteral("QtMainWindow"));
@@ -118,11 +77,11 @@ QtMainWindow::QtMainWindow() : m_windowStack(this) {
   setWindowFlags(Qt::Widget);
 
   if(auto* app = dynamic_cast<QApplication*>(QCoreApplication::instance()); app != nullptr) {
-    app->installEventFilter(new MouseReleaseFilter(this));
+    app->installEventFilter(new MouseReleaseFilter{this});
 
     refreshStyle();
 
-    if(utility::getOsType() != OsType::Mac) {
+    if constexpr(utility::getOsType() != OsType::Mac) {
       // can only be done once, because resetting the style on the QCoreApplication causes crash
       app->setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiDirectoryPath().concatenate(L"main/scrollbar.css")).c_str());
     }

src/lib_gui/qt/window/MainWindow/QtMainWindow.h

@@ -1,54 +1,29 @@
 #pragma once
 #include <memory>
-#include <utility>
 #include <vector>
 
 #include <QMainWindow>
 
-#include "FilePath.h"
+#include <qtclasshelpermacros.h>
+
 #include "QtWindowStack.h"
 
+
 class Bookmark;
 class MessageBase;
 class QDockWidget;
 class View;
+class QtViewToggle;
+class FilePath;
 
-class QtViewToggle : public QWidget {
-  Q_OBJECT
-
-public:
-  explicit QtViewToggle(View* view, QWidget* parent = nullptr);
-  void clear();
-
-public slots:
-  void toggledByAction();
-  void toggledByUI();
-
-private:
-  View* m_view;
-};
-
-
-class MouseReleaseFilter : public QObject {
+class QtMainWindow final : public QMainWindow {
   Q_OBJECT
 
 public:
-  explicit MouseReleaseFilter(QObject* parent);
-
-protected:
-  bool eventFilter(QObject* obj, QEvent* event) override;
-
-private:
-  size_t m_backButton;
-  size_t m_forwardButton;
-};
-
+  QtMainWindow();
 
-class QtMainWindow : public QMainWindow {
-  Q_OBJECT
+  Q_DISABLE_COPY_MOVE(QtMainWindow)
 
-public:
-  QtMainWindow();
   ~QtMainWindow() override;
 
   void addView(View* view);
@@ -156,11 +131,11 @@ private slots:
   void activateBookmarkAction();
 
 private:
-  struct DockWidget {
-    QDockWidget* widget;
-    View* view;
-    QAction* action;
-    QtViewToggle* toggle;
+  struct DockWidget final {
+    QDockWidget* widget = nullptr;
+    View* view = nullptr;
+    QAction* action = nullptr;
+    QtViewToggle* toggle = nullptr;
   };
 
   void setupEditMenu();
@@ -179,18 +154,18 @@ private slots:
 
   std::vector<DockWidget> m_dockWidgets;
 
-  QMenu* m_viewMenu;
-  QAction* m_viewSeparator;
+  QMenu* m_viewMenu = nullptr;
+  QAction* m_viewSeparator = nullptr;
 
   QMenu* m_historyMenu = nullptr;
   std::vector<std::shared_ptr<MessageBase>> m_history;
 
   QMenu* m_bookmarksMenu = nullptr;
   std::vector<std::shared_ptr<Bookmark>> m_bookmarks;
 
-  QMenu* m_recentProjectsMenu;
+  QMenu* m_recentProjectsMenu = nullptr;
 
-  QAction* m_showTitleBarsAction;
+  QAction* m_showTitleBarsAction = nullptr;
 
   bool m_showDockWidgetTitleBars = true;
 

src/lib_gui/qt/window/MainWindow/QtViewToggle.cpp

@@ -0,0 +1,26 @@
+#include "QtViewToggle.hpp"
+
+#include "QtMainWindow.h"
+#include "View.h"
+
+QtViewToggle::QtViewToggle(View* view, QWidget* parent) : QWidget(parent), m_view(view) {}
+
+void QtViewToggle::clear() {
+  m_view = nullptr;
+}
+
+void QtViewToggle::toggledByAction() {
+  if(m_view != nullptr) {
+    if(auto* window = dynamic_cast<QtMainWindow*>(parent()); window != nullptr) {
+      window->toggleView(m_view, true);
+    }
+  }
+}
+
+void QtViewToggle::toggledByUI() {
+  if(m_view != nullptr) {
+    if(auto* window = dynamic_cast<QtMainWindow*>(parent()); window != nullptr) {
+      window->toggleView(m_view, false);
+    }
+  }
+}

src/lib_gui/qt/window/MainWindow/QtViewToggle.hpp

@@ -0,0 +1,19 @@
+#pragma once
+#include <QWidget>
+
+class View;
+
+class QtViewToggle : public QWidget {
+  Q_OBJECT
+
+public:
+  explicit QtViewToggle(View* view, QWidget* parent = nullptr);
+  void clear();
+
+public slots:
+  void toggledByAction();
+  void toggledByUI();
+
+private:
+  View* m_view;
+};