Move MouseWheelWidgetAdjustmentGuard

CMakeLists.txt

@@ -252,6 +252,8 @@ target_sources(
           src/utils/file-selection.hpp
           src/utils/macro-list.cpp
           src/utils/macro-list.hpp
+          src/utils/mouse-wheel-guard.cpp
+          src/utils/mouse-wheel-guard.hpp
           src/utils/name-dialog.cpp
           src/utils/name-dialog.hpp
           src/utils/process-config.cpp

src/macro-core/macro-segment.cpp

@@ -1,6 +1,7 @@
 #include "macro-segment.hpp"
 #include "section.hpp"
 #include "utility.hpp"
+#include "mouse-wheel-guard.hpp"
 
 #include <obs.hpp>
 #include <QEvent>
@@ -81,22 +82,6 @@ void MacroSegment::DecrementVariableRef()
 	_variableRefs--;
 }
 
-MouseWheelWidgetAdjustmentGuard::MouseWheelWidgetAdjustmentGuard(QObject *parent)
-	: QObject(parent)
-{
-}
-
-bool MouseWheelWidgetAdjustmentGuard::eventFilter(QObject *o, QEvent *e)
-{
-	const QWidget *widget = static_cast<QWidget *>(o);
-	if (e->type() == QEvent::Wheel && widget && !widget->hasFocus()) {
-		e->ignore();
-		return true;
-	}
-
-	return QObject::eventFilter(o, e);
-}
-
 MacroSegmentEdit::MacroSegmentEdit(bool highlight, QWidget *parent)
 	: QWidget(parent),
 	  _section(new Section(300)),
@@ -247,13 +232,7 @@ void MacroSegmentEdit::SetFocusPolicyOfWidgets()
 {
 	QList<QWidget *> widgets = this->findChildren<QWidget *>();
 	for (auto w : widgets) {
-		w->setFocusPolicy(Qt::StrongFocus);
-		// Ignore QScrollBar as there is no danger of accidentally modifying anything
-		// and long expanded QComboBox would be difficult to interact with otherwise.
-		if (qobject_cast<QScrollBar *>(w)) {
-			continue;
-		}
-		w->installEventFilter(new MouseWheelWidgetAdjustmentGuard(w));
+		PreventMouseWheelAdjustWithoutFocus(w);
 	}
 }
 

src/macro-core/macro-segment.hpp

@@ -113,11 +113,3 @@ private:
 
 	friend class MacroSegmentList;
 };
-
-class MouseWheelWidgetAdjustmentGuard : public QObject {
-public:
-	explicit MouseWheelWidgetAdjustmentGuard(QObject *parent);
-
-protected:
-	bool eventFilter(QObject *o, QEvent *e) override;
-};

src/utils/mouse-wheel-guard.cpp

@@ -0,0 +1,31 @@
+#include "mouse-wheel-guard.hpp"
+
+#include <QEvent>
+#include <QScrollBar>
+
+MouseWheelWidgetAdjustmentGuard::MouseWheelWidgetAdjustmentGuard(QObject *parent)
+	: QObject(parent)
+{
+}
+
+bool MouseWheelWidgetAdjustmentGuard::eventFilter(QObject *o, QEvent *e)
+{
+	const QWidget *widget = static_cast<QWidget *>(o);
+	if (e->type() == QEvent::Wheel && widget && !widget->hasFocus()) {
+		e->ignore();
+		return true;
+	}
+
+	return QObject::eventFilter(o, e);
+}
+
+void PreventMouseWheelAdjustWithoutFocus(QWidget *w)
+{
+	w->setFocusPolicy(Qt::StrongFocus);
+	// Ignore QScrollBar as there is no danger of accidentally modifying anything
+	// and long expanded QComboBox would be difficult to interact with otherwise.
+	if (qobject_cast<QScrollBar *>(w)) {
+		return;
+	}
+	w->installEventFilter(new MouseWheelWidgetAdjustmentGuard(w));
+}

src/utils/mouse-wheel-guard.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <QWidget>
+
+class MouseWheelWidgetAdjustmentGuard : public QObject {
+public:
+	explicit MouseWheelWidgetAdjustmentGuard(QObject *parent);
+
+protected:
+	bool eventFilter(QObject *o, QEvent *e) override;
+};
+
+void PreventMouseWheelAdjustWithoutFocus(QWidget *);