gui: Allow shift+drag to move around the view

right & middle clight are really inconvenient when working with a touchpad
in tap-to-click mode

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

1 files changed, 14 insertions, 5 deletions

diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc
index 0ad90527..ac6cd969 100644
--- a/gui/fpgaviewwidget.cc
+++ b/gui/fpgaviewwidget.cc
@@ -644,12 +644,16 @@ void FPGAViewWidget::mousePressEvent(QMouseEvent *event)
     if (io.WantCaptureMouse)
         return;
 
-    if (event->buttons() & Qt::RightButton || event->buttons() & Qt::MidButton) {
+    bool shift = QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier);
+    bool ctrl  = QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
+    bool btn_right = event->buttons() & Qt::RightButton;
+    bool btn_mid   = event->buttons() & Qt::MidButton;
+    bool btn_left  = event->buttons() & Qt::LeftButton;
+
+    if (btn_right || btn_mid || (btn_left && shift)) {
         lastDragPos_ = event->pos();
     }
-    if (event->buttons() & Qt::LeftButton) {
-        bool ctrl = QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
-
+    if (btn_left && !shift) {
         auto world = mouseToWorldCoordinates(event->x(), event->y());
         auto closestOr = pickElement(world.x(), world.y());
         if (!closestOr) {
@@ -681,7 +685,12 @@ void FPGAViewWidget::mouseMoveEvent(QMouseEvent *event)
     if (io.WantCaptureMouse)
         return;
 
-    if (event->buttons() & Qt::RightButton || event->buttons() & Qt::MidButton) {
+    bool shift = QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier);
+    bool btn_right = event->buttons() & Qt::RightButton;
+    bool btn_mid   = event->buttons() & Qt::MidButton;
+    bool btn_left  = event->buttons() & Qt::LeftButton;
+
+    if (btn_right || btn_mid || (btn_left && shift)) {
         const int dx = event->x() - lastDragPos_.x();
         const int dy = event->y() - lastDragPos_.y();
         lastDragPos_ = event->pos();