Range can be dragged by clicking and dragging over the selected range

qgis · Nov 26, 2020 · cb8574a · cb8574a
1 parent 29a83c1
commit cb8574a
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 47 deletions.
diff --git a/src/gui/qgsrangeslider.cpp b/src/gui/qgsrangeslider.cpp
@@ -261,6 +261,52 @@ bool QgsRangeSlider::newHoverControl( const QPoint &pos )
   return mHoverSubControl != lastHoverSubControl || mHoverControl != lastHoverControl;
 }
 
+QRect QgsRangeSlider::selectedRangeRect()
+{
+  QRect selectionRect;
+
+  mStyleOption.activeSubControls = mHoverControl == Lower || mActiveControl == Lower ? QStyle::SC_SliderHandle : QStyle::SC_None;
+  mStyleOption.sliderPosition = mFlipped ? mStyleOption.maximum - mLowerValue : mLowerValue;
+  const QRect lowerHandleRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderHandle, nullptr );
+
+  mStyleOption.activeSubControls = mHoverControl == Upper || mActiveControl == Lower ? QStyle::SC_SliderHandle : QStyle::SC_None;
+  mStyleOption.sliderPosition = mFlipped ? mStyleOption.maximum - mUpperValue : mUpperValue;
+  const QRect upperHandleRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderHandle, nullptr );
+
+  const QRect grooveRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderGroove, nullptr );
+
+  switch ( mStyleOption.orientation )
+  {
+    case Qt::Horizontal:
+      selectionRect = mFlipped ? QRect( upperHandleRect.left(),
+                                        grooveRect.y(),
+                                        lowerHandleRect.right() - upperHandleRect.right(),
+                                        grooveRect.height()
+                                      )
+                      : QRect( lowerHandleRect.right(),
+                               grooveRect.y(),
+                               upperHandleRect.left() - lowerHandleRect.right(),
+                               grooveRect.height()
+                             );
+      break;
+
+    case Qt::Vertical:
+      selectionRect = mFlipped ? QRect( grooveRect.x(),
+                                        lowerHandleRect.bottom(),
+                                        grooveRect.width(),
+                                        upperHandleRect.top() - lowerHandleRect.top()
+                                      )
+                      : QRect( grooveRect.x(),
+                               upperHandleRect.top(),
+                               grooveRect.width(),
+                               lowerHandleRect.bottom() - upperHandleRect.top()
+                             );
+      break;
+  }
+
+  return selectionRect.adjusted( -1, 1, 1, -1 );
+}
+
 void QgsRangeSlider::setTickPosition( QSlider::TickPosition position )
 {
   mStyleOption.tickPosition = position;
@@ -328,48 +374,7 @@ void QgsRangeSlider::paintEvent( QPaintEvent * )
   color.setAlpha( 160 );
   painter.setBrush( QBrush( color ) );
   painter.setPen( Qt::NoPen );
-
-  mStyleOption.activeSubControls = mHoverControl == Lower || mActiveControl == Lower ? QStyle::SC_SliderHandle : QStyle::SC_None;
-  mStyleOption.sliderPosition = mFlipped ? mStyleOption.maximum - mLowerValue : mLowerValue;
-  const QRect lowerHandleRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderHandle, nullptr );
-
-  mStyleOption.activeSubControls = mHoverControl == Upper || mActiveControl == Lower ? QStyle::SC_SliderHandle : QStyle::SC_None;
-  mStyleOption.sliderPosition = mFlipped ? mStyleOption.maximum - mUpperValue : mUpperValue;
-  const QRect upperHandleRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderHandle, nullptr );
-
-  const QRect grooveRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderGroove, nullptr );
-
-  QRect selectionRect;
-  switch ( mStyleOption.orientation )
-  {
-    case Qt::Horizontal:
-      selectionRect = mFlipped ? QRect( upperHandleRect.left(),
-                                        grooveRect.y(),
-                                        lowerHandleRect.right() - upperHandleRect.right(),
-                                        grooveRect.height()
-                                      )
-                      : QRect( lowerHandleRect.right(),
-                               grooveRect.y(),
-                               upperHandleRect.left() - lowerHandleRect.right(),
-                               grooveRect.height()
-                             );
-      break;
-
-    case Qt::Vertical:
-      selectionRect = mFlipped ? QRect( grooveRect.x(),
-                                        lowerHandleRect.bottom(),
-                                        grooveRect.width(),
-                                        upperHandleRect.top() - lowerHandleRect.top()
-                                      )
-                      : QRect( grooveRect.x(),
-                               upperHandleRect.top(),
-                               grooveRect.width(),
-                               lowerHandleRect.bottom() - upperHandleRect.top()
-                             );
-      break;
-  }
-
-  painter.drawRect( selectionRect.adjusted( -1, 1, 1, -1 ) );
+  painter.drawRect( selectedRangeRect() );
 
   // draw first handle
   mStyleOption.subControls = QStyle::SC_SliderHandle;
@@ -408,19 +413,22 @@ void QgsRangeSlider::mousePressEvent( QMouseEvent *event )
   const bool overUpperControl = style()->hitTestComplexControl( QStyle::CC_Slider, &mStyleOption, event->pos(), this ) == QStyle::SC_SliderHandle;
   const QRect upperSliderRect = style()->subControlRect( QStyle::CC_Slider, &mStyleOption, QStyle::SC_SliderHandle, this );
 
+  const bool overSelectedRange = selectedRangeRect().contains( event->pos() );
+
   mLowerClickOffset = pick( event->pos() - lowerSliderRect.topLeft() );
   mUpperClickOffset = pick( event->pos() - upperSliderRect.topLeft() );
 
+  mPreDragLowerValue = mLowerValue;
+  mPreDragUpperValue = mUpperValue;
+
   if ( overLowerControl && overUpperControl )
-  {
     mActiveControl = Both;
-    mPreDragLowerValue = mLowerValue;
-    mPreDragUpperValue = mUpperValue;
-  }
   else if ( overLowerControl )
     mActiveControl = Lower;
   else if ( overUpperControl )
     mActiveControl = Upper;
+  else if ( overSelectedRange )
+    mActiveControl = Range;
   else
     mActiveControl = None;
 
@@ -510,6 +518,33 @@ void QgsRangeSlider::mouseMoveEvent( QMouseEvent *event )
       }
       break;
     }
+
+    case Range:
+    {
+      int delta = newPosition - mStartDragPos;
+
+      if ( delta > 0 )
+      {
+        // move range up
+        int maxDelta = mStyleOption.maximum - mPreDragUpperValue;
+        delta = std::min( maxDelta, delta );
+        mLowerValue = mPreDragLowerValue + delta;
+        mUpperValue = mPreDragUpperValue + delta;
+        changed = true;
+      }
+      else if ( delta < 0 )
+      {
+        // move range down
+        delta = -delta;
+        int maxDelta = mPreDragLowerValue - mStyleOption.minimum ;
+        delta = std::min( maxDelta, delta );
+        mLowerValue = mPreDragLowerValue - delta;
+        mUpperValue = mPreDragUpperValue - delta;
+        changed = true;
+      }
+
+      break;
+    }
   }
 
   if ( changed )

diff --git a/src/gui/qgsrangeslider.h b/src/gui/qgsrangeslider.h
@@ -220,6 +220,7 @@ class GUI_EXPORT QgsRangeSlider : public QWidget
     int pixelPosToRangeValue( int pos ) const;
     bool updateHoverControl( const QPoint &pos );
     bool newHoverControl( const QPoint &pos );
+    QRect selectedRangeRect();
 
     int mLowerValue = 0;
     int mUpperValue = 0;
@@ -230,7 +231,8 @@ class GUI_EXPORT QgsRangeSlider : public QWidget
       None,
       Lower,
       Upper,
-      Both
+      Both,
+      Range
     };
     Control mActiveControl = None;
     int mStartDragPos = -1;