From 9ad69d908529edfecdd830fd970af6ffb3451a88 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 29 May 2015 05:44:35 +1000
Subject: [PATCH] Allow wheel events in dialogue spin box types only when they
 have focus.  Should resolve Feature #2585.

---
 apps/opencs/CMakeLists.txt                 |  1 +
 apps/opencs/view/world/dialoguespinbox.cpp | 53 ++++++++++++++++++++++
 apps/opencs/view/world/dialoguespinbox.hpp | 40 ++++++++++++++++
 apps/opencs/view/world/util.cpp            |  8 ++--
 4 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 apps/opencs/view/world/dialoguespinbox.cpp
 create mode 100644 apps/opencs/view/world/dialoguespinbox.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 78b2deb7a8..7723b15f5e 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -63,6 +63,7 @@ opencs_units (view/world
     table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
     cellcreator referenceablecreator referencecreator scenesubview
     infocreator scriptedit dialoguesubview previewsubview regionmap dragrecordtable nestedtable
+    dialoguespinbox
     )
 
 opencs_units_noqt (view/world
diff --git a/apps/opencs/view/world/dialoguespinbox.cpp b/apps/opencs/view/world/dialoguespinbox.cpp
new file mode 100644
index 0000000000..1228ca0da9
--- /dev/null
+++ b/apps/opencs/view/world/dialoguespinbox.cpp
@@ -0,0 +1,53 @@
+#include "dialoguespinbox.hpp"
+
+#include <QWheelEvent>
+
+CSVWorld::DialogueSpinBox::DialogueSpinBox(QWidget *parent) : QSpinBox(parent)
+{
+    setFocusPolicy(Qt::StrongFocus);
+}
+
+void CSVWorld::DialogueSpinBox::focusInEvent(QFocusEvent *event)
+{
+    setFocusPolicy(Qt::WheelFocus);
+    QSpinBox::focusInEvent(event);
+}
+
+void CSVWorld::DialogueSpinBox::focusOutEvent(QFocusEvent *event)
+{
+    setFocusPolicy(Qt::StrongFocus);
+    QSpinBox::focusOutEvent(event);
+}
+
+void CSVWorld::DialogueSpinBox::wheelEvent(QWheelEvent *event)
+{
+    if (!hasFocus())
+        event->ignore();
+    else
+        QSpinBox::wheelEvent(event);
+}
+
+CSVWorld::DialogueDoubleSpinBox::DialogueDoubleSpinBox(QWidget *parent) : QDoubleSpinBox(parent)
+{
+    setFocusPolicy(Qt::StrongFocus);
+}
+
+void CSVWorld::DialogueDoubleSpinBox::focusInEvent(QFocusEvent *event)
+{
+    setFocusPolicy(Qt::WheelFocus);
+    QDoubleSpinBox::focusInEvent(event);
+}
+
+void CSVWorld::DialogueDoubleSpinBox::focusOutEvent(QFocusEvent *event)
+{
+    setFocusPolicy(Qt::StrongFocus);
+    QDoubleSpinBox::focusOutEvent(event);
+}
+
+void CSVWorld::DialogueDoubleSpinBox::wheelEvent(QWheelEvent *event)
+{
+    if (!hasFocus())
+        event->ignore();
+    else
+        QDoubleSpinBox::wheelEvent(event);
+}
diff --git a/apps/opencs/view/world/dialoguespinbox.hpp b/apps/opencs/view/world/dialoguespinbox.hpp
new file mode 100644
index 0000000000..a68e0c3148
--- /dev/null
+++ b/apps/opencs/view/world/dialoguespinbox.hpp
@@ -0,0 +1,40 @@
+#ifndef CSV_WORLD_DIALOGUESPINBOX_H
+#define CSV_WORLD_DIALOGUESPINBOX_H
+
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+
+namespace CSVWorld
+{
+    class DialogueSpinBox : public QSpinBox
+    {
+        Q_OBJECT
+
+        public:
+
+            DialogueSpinBox (QWidget *parent = 0);
+
+        protected:
+
+            virtual void focusInEvent(QFocusEvent *event);
+            virtual void focusOutEvent(QFocusEvent *event);
+            virtual void wheelEvent(QWheelEvent *event);
+    };
+
+    class DialogueDoubleSpinBox : public QDoubleSpinBox
+    {
+        Q_OBJECT
+
+        public:
+
+            DialogueDoubleSpinBox (QWidget *parent = 0);
+
+        protected:
+
+            virtual void focusInEvent(QFocusEvent *event);
+            virtual void focusOutEvent(QFocusEvent *event);
+            virtual void wheelEvent(QWheelEvent *event);
+    };
+}
+
+#endif // CSV_WORLD_DIALOGUESPINBOX_H
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index a11b5bdded..5452214ef4 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -9,8 +9,6 @@
 #include <QMetaProperty>
 #include <QStyledItemDelegate>
 #include <QLineEdit>
-#include <QSpinBox>
-#include <QDoubleSpinBox>
 #include <QComboBox>
 #include <QCheckBox>
 #include <QPlainTextEdit>
@@ -19,7 +17,7 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/commanddispatcher.hpp"
-
+#include "dialoguespinbox.hpp"
 #include "scriptedit.hpp"
 
 CSVWorld::NastyTableModelHack::NastyTableModelHack (QAbstractItemModel& model)
@@ -174,7 +172,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
         case CSMWorld::ColumnBase::Display_Integer:
         {
-            QSpinBox *sb = new QSpinBox(parent);
+            DialogueSpinBox *sb = new DialogueSpinBox(parent);
             sb->setRange(INT_MIN, INT_MAX);
             return sb;
         }
@@ -185,7 +183,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
         case CSMWorld::ColumnBase::Display_Float:
         {
-            QDoubleSpinBox *dsb = new QDoubleSpinBox(parent);
+            DialogueDoubleSpinBox *dsb = new DialogueDoubleSpinBox(parent);
             dsb->setRange(-FLT_MAX, FLT_MAX);
             dsb->setSingleStep(0.01f);
             dsb->setDecimals(3);