Nicer keyboard interaction when sliders are overlapping

Since it's impossible to tell which slider is focused in this case, automatically target whichever slider makes sense given the key pressed
qgis · Nov 26, 2020 · f30ced9 · f30ced9
1 parent 5b72825
commit f30ced9
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/src/gui/qgsrangeslider.cpp b/src/gui/qgsrangeslider.cpp
@@ -708,13 +708,20 @@ void QgsRangeSlider::mouseReleaseEvent( QMouseEvent *event )
 
 void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
 {
+  Control destControl = mFocusControl;
+  if ( ( destControl == Lower || destControl == Upper ) && mLowerValue == mUpperValue )
+    destControl = Both; //ambiguous destination, because both sliders are on top of each other
+
   switch ( event->key() )
   {
     case Qt::Key_Left:
     {
       switch ( mStyleOption.orientation )
       {
         case Qt::Horizontal:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Upper : Lower;
+
           applyStep( mFlipped ? mSingleStep : -mSingleStep );
           break;
 
@@ -764,6 +771,8 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
       switch ( mStyleOption.orientation )
       {
         case Qt::Horizontal:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Lower : Upper;
           applyStep( mFlipped ? -mSingleStep : mSingleStep );
           break;
 
@@ -851,6 +860,9 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
           break;
 
         case Qt::Vertical:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Upper : Lower;
+
           applyStep( mFlipped ? mSingleStep : -mSingleStep );
           break;
       }
@@ -900,6 +912,9 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
           break;
 
         case Qt::Vertical:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Lower : Upper;
+
           applyStep( mFlipped ? -mSingleStep : mSingleStep );
           break;
       }
@@ -911,10 +926,16 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
       switch ( mStyleOption.orientation )
       {
         case Qt::Horizontal:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Lower : Upper;
+
           applyStep( mFlipped ? -mPageStep : mPageStep );
           break;
 
         case Qt::Vertical:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Upper : Lower;
+
           applyStep( mFlipped ? mPageStep : -mPageStep );
           break;
       }
@@ -926,18 +947,24 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
       switch ( mStyleOption.orientation )
       {
         case Qt::Horizontal:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Upper : Lower;
+
           applyStep( mFlipped ? mPageStep : -mPageStep );
           break;
 
         case Qt::Vertical:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Lower : Upper;
+
           applyStep( mFlipped ? -mPageStep : mPageStep );
           break;
       }
       break;
     }
 
     case Qt::Key_Home:
-      switch ( mFocusControl )
+      switch ( destControl )
       {
         case Lower:
           applyStep( mFlipped ? mUpperValue - mLowerValue : mStyleOption.minimum - mLowerValue );
@@ -951,15 +978,21 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
           applyStep( mFlipped ? mStyleOption.maximum - mUpperValue : mStyleOption.minimum  - mLowerValue );
           break;
 
-        case None:
         case Both:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Upper : Lower;
+
+          applyStep( mFlipped ? mStyleOption.maximum - mUpperValue : mStyleOption.minimum - mLowerValue );
+          break;
+
+        case None:
           break;
       }
 
       break;
 
     case Qt::Key_End:
-      switch ( mFocusControl )
+      switch ( destControl )
       {
         case Lower:
           applyStep( mFlipped ? mStyleOption.minimum - mLowerValue : mUpperValue - mLowerValue );
@@ -973,8 +1006,14 @@ void QgsRangeSlider::keyPressEvent( QKeyEvent *event )
           applyStep( mFlipped ? mStyleOption.minimum  - mLowerValue : mStyleOption.maximum - mUpperValue );
           break;
 
-        case None:
         case Both:
+          if ( destControl == Both )
+            mFocusControl = mFlipped ? Lower : Upper;
+
+          applyStep( mFlipped ? mStyleOption.minimum - mLowerValue : mStyleOption.maximum - mUpperValue );
+          break;
+
+        case None:
           break;
       }
       break;

diff --git a/src/gui/qgsrangeslider.h b/src/gui/qgsrangeslider.h
@@ -264,8 +264,6 @@ class GUI_EXPORT QgsRangeSlider : public QWidget
     QRect selectedRangeRect();
     void drawFocusRect();
 
-    void applyStep( int step );
-
     int mLowerValue = 0;
     int mUpperValue = 0;
 
@@ -281,6 +279,9 @@ class GUI_EXPORT QgsRangeSlider : public QWidget
       Both,
       Range
     };
+
+    void applyStep( int step );
+
     Control mActiveControl = None;
     int mStartDragPos = -1;
     int mLowerClickOffset = 0;