Fixed issue #654 - Wheel event on DockAreaTabBar

githubuser0xFFFF · Jul 25, 2024 · 5edbcc1 · 5edbcc1
1 parent 04f6d91
commit 5edbcc1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/DockAreaTabBar.cpp b/src/DockAreaTabBar.cpp
@@ -473,6 +473,15 @@ bool CDockAreaTabBar::eventFilter(QObject *watched, QEvent *event)
          updateGeometry();
          break;
 
+    // Manage wheel event
+    case QEvent::Wheel:
+    	// Ignore wheel events if tab is currently dragged
+    	if (Tab->dragState() == DraggingInactive)
+    	{
+    		wheelEvent((QWheelEvent* )event);
+    	}
+        break;
+
 	default:
 		break;
 	}

diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
@@ -34,7 +34,6 @@
 
 #include <QStackedLayout>
 #include <QScrollBar>
-#include <QWheelEvent>
 #include <QStyle>
 #include <QPushButton>
 #include <QDebug>

diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp
@@ -789,6 +789,13 @@ bool CDockWidgetTab::event(QEvent *e)
 }
 
 
+//============================================================================
+eDragState CDockWidgetTab::dragState() const
+{
+	return d->DragState;
+}
+
+
 //============================================================================
 void CDockWidgetTab::onDockWidgetFeaturesChanged()
 {

diff --git a/src/DockWidgetTab.h b/src/DockWidgetTab.h
@@ -178,6 +178,12 @@ private Q_SLOTS:
 	 */
 	void setIconSize(const QSize& Size);
 
+	/**
+	 * Returns the current drag state of this tab.
+	 * Use this function to determine if the tab is currently being dragged
+	 */
+	eDragState dragState() const;
+
 public Q_SLOTS:
 	virtual void setVisible(bool visible) override;