Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -70,6 +70,10 @@ property bool showTickmarks : true ///< Indicate whether tickMarks should be shown property bool isTickMarksRound : true ///< Indicate whether the tickmakrs are round + property bool isRoundedEnds : true + property bool hasBorder : true + property color borderColor : Colors.borderDisableButton + onHasAdjustChanged : { setAdjusted() } @@ -88,10 +92,11 @@ touchMargin : 25 leftRightTouchMargin: _root.diameter / 2 - isRoundedEnds : true - hasBorder : true - borderColor : (_root.minAdjusted && _root.maxAdjusted) ? Colors.sliderBorderActive : Colors.sliderBorderInactive + radius : _root.isRoundedEnds ? (height/2) : Variables.rangeRectRadius + border.width: _root.hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: (_root.minAdjusted && _root.maxAdjusted) ? Colors.borderButton : Colors.borderDisableButton + minimum : 0 maximum : 0 @@ -252,11 +257,12 @@ x : minmaxDiff ? ((parent.width * (lowerBound - parent.minimum)) / minmaxDiff) : minmaxDiff width : minmaxDiff ? ((parent.width * (upperBound - lowerBound )) / minmaxDiff) : minmaxDiff height : parent.height + radius : _root.isRoundedEnds ? (height/2) : Variables.rangeRectRadius + border.width: _root.hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: (_root.minAdjusted && _root.maxAdjusted) ? Colors.borderButton : Colors.borderDisableButton + decimal : _root.decimal - isRoundedEnds : _root.isRoundedEnds - hasBorder : _root.hasBorder - borderColor : (_root.minAdjusted && _root.maxAdjusted) ? Colors.sliderBorderActive : Colors.sliderBorderInactive minText { visible: false