- Graph: Ctrl+left or middle-button click-dragging for panning, is

now a lot smoother, hopefully. (EXPERIMENTAL)
rncbc · Jul 19, 2023 · 7dfe3a9 · 7dfe3a9
1 parent fac5c00
commit 7dfe3a9
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 49 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,9 @@ ChangeLog
 
 GIT HEAD
 
+- Graph: Ctrl+left or middle-button click-dragging for panning, is
+  now a lot smoother, hopefully. (EXPERIMENTAL)
+
 - Graph: Click-dragging with the mouse middle-button is now used
   for panning only, not to start a selection anymore. (EXPERIMENTAL)
 

diff --git a/src/qjackctlGraph.cpp b/src/qjackctlGraph.cpp
@@ -1629,7 +1629,18 @@ void qjackctlGraphCanvas::mousePressEvent ( QMouseEvent *event )
 		  && (event->modifiers() & Qt::ControlModifier))
 		  || (event->button() == Qt::MiddleButton))
 		&& m_scene->selectedItems().isEmpty()) {
-		QGraphicsView::setCursor(Qt::ClosedHandCursor);
+	#if 1//NEW_DRAG_SCROLL_MODE
+		// HACK: When about to drag-scroll,
+		// always fake a left-button press...
+		QGraphicsView::setDragMode(ScrollHandDrag);
+		QMouseEvent event2(event->type(),
+			event->position(), event->globalPosition(),
+			Qt::LeftButton, Qt::LeftButton,
+			event->modifiers() | Qt::ControlModifier);
+		QGraphicsView::mousePressEvent(&event2);
+	#else
+		QGraphicsView::setCursor(Qt::ClosedHandCursor)
+	#endif
 		m_state = DragScroll;
 	}
 }
@@ -1778,12 +1789,16 @@ void qjackctlGraphCanvas::mouseMoveEvent ( QMouseEvent *event )
 		}
 		break;
 	case DragScroll: {
+	#if 1//NEW_DRAG_SCROLL_MODE
+		QGraphicsView::mouseMoveEvent(event);
+	#else
 		QScrollBar *hbar = QGraphicsView::horizontalScrollBar();
 		QScrollBar *vbar = QGraphicsView::verticalScrollBar();
 		const QPoint delta = (pos - m_pos).toPoint();
 		hbar->setValue(hbar->value() - delta.x());
 		vbar->setValue(vbar->value() - delta.y());
 		m_pos = pos;
+	#endif
 		break;
 	}
 	default:
@@ -1897,6 +1912,12 @@ void qjackctlGraphCanvas::mouseReleaseEvent ( QMouseEvent *event )
 		break;
 	}
 
+#if 1//NEW_DRAG_SCROLL_MODE
+	if (QGraphicsView::dragMode() == ScrollHandDrag) {
+		QGraphicsView::mouseReleaseEvent(event);
+		QGraphicsView::setDragMode(NoDrag);
+	}
+#endif
 	m_state = DragNone;
 	m_item = nullptr;
 

diff --git a/src/translations/qjackctl_cs.ts b/src/translations/qjackctl_cs.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation>JACK: %1</translation>
     </message>
@@ -479,13 +479,13 @@ Jste si jistý?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Spojit</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Rozpojit</translation>
     </message>

diff --git a/src/translations/qjackctl_de.ts b/src/translations/qjackctl_de.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -478,13 +478,13 @@ Sind Sie sicher?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/translations/qjackctl_es.ts b/src/translations/qjackctl_es.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation>JACK: %1</translation>
     </message>
@@ -478,13 +478,13 @@ Está seguro?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>

diff --git a/src/translations/qjackctl_fr.ts b/src/translations/qjackctl_fr.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation>JACK : %1</translation>
     </message>
@@ -479,13 +479,13 @@ de toutes les applications clientes.
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Connecter</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Déconnecter</translation>
     </message>

diff --git a/src/translations/qjackctl_it.ts b/src/translations/qjackctl_it.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,13 +488,13 @@ Sei sicuro?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Connetti</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>

diff --git a/src/translations/qjackctl_ja.ts b/src/translations/qjackctl_ja.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,13 +479,13 @@ Are you sure?</source>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>接続</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>切断</translation>
     </message>

diff --git a/src/translations/qjackctl_ko.ts b/src/translations/qjackctl_ko.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,13 +479,13 @@ Are you sure?</source>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>연결하기</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>연결해제</translation>
     </message>

diff --git a/src/translations/qjackctl_nl.ts b/src/translations/qjackctl_nl.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,13 +488,13 @@ Bent u zeker?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/translations/qjackctl_pt.ts b/src/translations/qjackctl_pt.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,13 +479,13 @@ Tem certeza?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Disconnectar</translation>
     </message>

diff --git a/src/translations/qjackctl_ru.ts b/src/translations/qjackctl_ru.ts
@@ -227,7 +227,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -480,13 +480,13 @@ Are you sure?</source>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Соединить</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Отсоединить</translation>
     </message>

diff --git a/src/translations/qjackctl_sk.ts b/src/translations/qjackctl_sk.ts
@@ -226,7 +226,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,13 +479,13 @@ Ste si istý?</translation>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>Spojiť</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Rozpojiť</translation>
     </message>

diff --git a/src/translations/qjackctl_uk.ts b/src/translations/qjackctl_uk.ts
@@ -225,7 +225,7 @@
 <context>
     <name>qjackctlApplication</name>
     <message>
-        <location filename="../qjackctl.cpp" line="124"/>
+        <location filename="../qjackctl.cpp" line="127"/>
         <source>JACK: %1</source>
         <translation>JACK: %1</translation>
     </message>
@@ -478,13 +478,13 @@ Are you sure?</source>
 <context>
     <name>qjackctlGraphCanvas</name>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="1856"/>
-        <location filename="../qjackctlGraph.cpp" line="1983"/>
+        <location filename="../qjackctlGraph.cpp" line="1868"/>
+        <location filename="../qjackctlGraph.cpp" line="2001"/>
         <source>Connect</source>
         <translation>З&apos;єднати</translation>
     </message>
     <message>
-        <location filename="../qjackctlGraph.cpp" line="2055"/>
+        <location filename="../qjackctlGraph.cpp" line="2073"/>
         <source>Disconnect</source>
         <translation>Від’єднати</translation>
     </message>