Qt: Ignore mouse wheel event in combo and spin boxes

charlesthobe · Jul 2, 2023 · 9141904 · 9141904
1 parent d9dbf2c
commit 9141904
Show file tree

Hide file tree

Showing 41 changed files with 451 additions and 249 deletions.
diff --git a/common/vsprops/QtCompile.props b/common/vsprops/QtCompile.props
@@ -89,7 +89,7 @@
     <Message Text="moc %(QtMoc.Filename) $(QtToolOutDir)%(QtMoc.RelativeDir)moc_%(QtMoc.Filename).cpp" Importance="High" />
     <Error Condition="!$(QtDirValid)" Text="Qt directory non-existent (download/extract the zip)" />
     <MakeDir Directories="$(QtToolOutDir)" />
-    <Exec Command="&quot;$(QtHostBinDir)moc.exe&quot; &quot;%(QtMoc.FullPath)&quot; -b &quot;PrecompiledHeader.h&quot; -o &quot;$(QtToolOutDir)%(QtMoc.RelativeDir)moc_%(QtMoc.Filename).cpp&quot; -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" />
+    <Exec Command="mkdir &quot;$(QtToolOutDir)%(QtMoc.RelativeDir)&quot; &amp; &quot;$(QtHostBinDir)moc.exe&quot; &quot;%(QtMoc.FullPath)&quot; -b &quot;PrecompiledHeader.h&quot; -o &quot;$(QtToolOutDir)%(QtMoc.RelativeDir)moc_%(QtMoc.Filename).cpp&quot; -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" />
   </Target>
 
   <ItemGroup>

diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
@@ -133,6 +133,9 @@ target_sources(pcsx2-qt PRIVATE
 	Settings/SettingsDialog.ui
 	Settings/USBBindingWidget_DrivingForce.ui
 	Settings/USBBindingWidget_GTForce.ui
+	CustomQtWidgets/NoScrollQComboBox.h
+	CustomQtWidgets/NoScrollQDoubleSpinBox.h
+	CustomQtWidgets/NoScrollQSpinBox.h
 	Debugger/CpuWidget.cpp
 	Debugger/CpuWidget.h
 	Debugger/CpuWidget.ui
@@ -186,6 +189,7 @@ target_include_directories(pcsx2-qt PRIVATE
 	"${CMAKE_BINARY_DIR}/common/include"
 	"${CMAKE_SOURCE_DIR}/pcsx2"
 	"${CMAKE_SOURCE_DIR}/pcsx2-qt"
+	"${CMAKE_SOURCE_DIR}/pcsx2-qt/CustomQtWidgets"
 )
 
 target_link_libraries(pcsx2-qt PRIVATE

diff --git a/pcsx2-qt/CustomQtWidgets/NoScrollQComboBox.h b/pcsx2-qt/CustomQtWidgets/NoScrollQComboBox.h
@@ -0,0 +1,16 @@
+#pragma once
+#include <QtWidgets/QComboBox>
+
+class NoScrollQComboBox : public QComboBox
+{
+    Q_OBJECT
+    void wheelEvent(QWheelEvent* event) override
+    {
+        ((QEvent*)event)->ignore();
+    };
+public:
+    explicit NoScrollQComboBox(QWidget *parent = nullptr) : QComboBox(parent)
+    {
+        this->setFocusPolicy(Qt::StrongFocus);
+    }
+};
diff --git a/pcsx2-qt/CustomQtWidgets/NoScrollQDoubleSpinBox.h b/pcsx2-qt/CustomQtWidgets/NoScrollQDoubleSpinBox.h
@@ -0,0 +1,16 @@
+#pragma once
+#include <QtWidgets/QDoubleSpinBox>
+
+class NoScrollQDoubleSpinBox : public QDoubleSpinBox
+{
+    Q_OBJECT
+    void wheelEvent(QWheelEvent* event) override
+    {
+        ((QEvent*)event)->ignore();
+    };
+public:
+    explicit NoScrollQDoubleSpinBox(QWidget *parent = nullptr) : QDoubleSpinBox(parent)
+    {
+        this->setFocusPolicy(Qt::StrongFocus);
+    }
+};
diff --git a/pcsx2-qt/CustomQtWidgets/NoScrollQSpinBox.h b/pcsx2-qt/CustomQtWidgets/NoScrollQSpinBox.h
@@ -0,0 +1,16 @@
+#pragma once
+#include <QtWidgets/QSpinBox>
+
+class NoScrollQSpinBox : public QSpinBox
+{
+    Q_OBJECT
+    void wheelEvent(QWheelEvent* event) override
+    {
+        ((QEvent*)event)->ignore();
+    };
+public:
+    explicit NoScrollQSpinBox(QWidget *parent = nullptr) : QSpinBox(parent)
+    {
+        this->setFocusPolicy(Qt::StrongFocus);
+    }
+};
diff --git a/pcsx2-qt/Debugger/CpuWidget.cpp b/pcsx2-qt/Debugger/CpuWidget.cpp
@@ -85,7 +85,7 @@ CpuWidget::CpuWidget(QWidget* parent, DebugInterface& cpu)
 
 	connect(m_ui.btnSearch, &QPushButton::clicked, this, &CpuWidget::onSearchButtonClicked);
 	connect(m_ui.listSearchResults, &QListWidget::itemDoubleClicked, [this](QListWidgetItem* item) { m_ui.memoryviewWidget->gotoAddress(item->data(256).toUInt()); });
-	connect(m_ui.cmbSearchType, &QComboBox::currentIndexChanged, [this](int i) {
+	connect(m_ui.cmbSearchType, &NoScrollQComboBox::currentIndexChanged, [this](int i) {
 		if (i < 4)
 			m_ui.chkSearchHex->setEnabled(true);
 		else

diff --git a/pcsx2-qt/Debugger/CpuWidget.ui b/pcsx2-qt/Debugger/CpuWidget.ui
@@ -195,7 +195,7 @@
               </widget>
              </item>
              <item row="1" column="1">
-              <widget class="QComboBox" name="cmbSearchType">
+              <widget class="NoScrollQComboBox" name="cmbSearchType">
                <item>
                 <property name="text">
                  <string>1 Byte (8 bits)</string>
@@ -524,6 +524,11 @@
    <header>pcsx2-qt/Debugger/MemoryViewWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>NoScrollQComboBox</class>
+   <extends>QComboBox</extends>
+   <header>NoScrollQComboBox.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

diff --git a/pcsx2-qt/GameList/GameListWidget.cpp b/pcsx2-qt/GameList/GameListWidget.cpp
@@ -139,10 +139,10 @@ void GameListWidget::initialize()
 	connect(m_ui.viewGameGrid, &QPushButton::clicked, this, &GameListWidget::showGameGrid);
 	connect(m_ui.gridScale, &QSlider::valueChanged, this, &GameListWidget::gridIntScale);
 	connect(m_ui.viewGridTitles, &QPushButton::toggled, this, &GameListWidget::setShowCoverTitles);
-	connect(m_ui.filterType, &QComboBox::currentIndexChanged, this, [this](int index) {
+	connect(m_ui.filterType, &NoScrollQComboBox::currentIndexChanged, this, [this](int index) {
 		m_sort_model->setFilterType((index == 0) ? GameList::EntryType::Count : static_cast<GameList::EntryType>(index - 1));
 	});
-	connect(m_ui.filterRegion, &QComboBox::currentIndexChanged, this, [this](int index) {
+	connect(m_ui.filterRegion, &NoScrollQComboBox::currentIndexChanged, this, [this](int index) {
 		m_sort_model->setFilterRegion((index == 0) ? GameList::Region::Count : static_cast<GameList::Region>(index - 1));
 	});
 	connect(m_ui.searchText, &QLineEdit::textChanged, this, [this](const QString& text) {

diff --git a/pcsx2-qt/GameList/GameListWidget.ui b/pcsx2-qt/GameList/GameListWidget.ui
@@ -163,7 +163,7 @@
         <number>6</number>
        </property>
        <item>
-        <widget class="QComboBox" name="filterType">
+        <widget class="NoScrollQComboBox" name="filterType">
          <item>
           <property name="text">
            <string>All Types</string>
@@ -176,7 +176,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="filterRegion">
+        <widget class="NoScrollQComboBox" name="filterRegion">
          <item>
           <property name="text">
            <string>All Regions</string>
@@ -213,6 +213,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>NoScrollQComboBox</class>
+   <extends>QComboBox</extends>
+   <header>NoScrollQComboBox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../resources/resources.qrc"/>
  </resources>

diff --git a/pcsx2-qt/QtUtils.cpp b/pcsx2-qt/QtUtils.cpp
@@ -24,7 +24,7 @@
 #include <QtGui/QDesktopServices>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QScreen>
-#include <QtWidgets/QComboBox>
+#include "CustomQtWidgets/NoScrollQComboBox.h"
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QInputDialog>

diff --git a/pcsx2-qt/QtUtils.h b/pcsx2-qt/QtUtils.h
@@ -28,7 +28,7 @@
 class ByteStream;
 
 class QAction;
-class QComboBox;
+class NoScrollQComboBox;
 class QFrame;
 class QKeyEvent;
 class QTableView;