Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r839893734937449efb6e7c31787d2c44515b69af -r2f0b2e204b42597e08be24df48a3b3d470b73051 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 839893734937449efb6e7c31787d2c44515b69af) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 2f0b2e204b42597e08be24df48a3b3d470b73051) @@ -42,12 +42,15 @@ property bool active : false property bool valid : true + property alias showAdjustButtons : _sliderArrows.visible + property bool isUsingDisplayValue : true // indicate whether using the slider's actual value or displayedValue + signal pressed () signal released() height : Variables.createTreatmentSliderHeight width : Variables.createTreatmentSliderWidth - color : "transparent" + color : Colors.transparent anchors.horizontalCenter: parent.horizontalCenter @@ -71,7 +74,7 @@ if ( _slider.value === 0 && zeroLabel !== "" ) { return _root.zeroLabel } - mValue = _slider.value + mValue = isUsingDisplayValue ? _slider.displayedValue : _slider.value } return mValue + unit } @@ -118,11 +121,25 @@ ticks : true isRoundedEnds : true hasBorder : true - onPressed : { setInteractive(false) ; _root.pressed ( ) ; setActiveValid( ) } - onDragged : { setInteractive(false) ; ; setActiveValid( ) } - onReleased : { setInteractive(true ) ; _root.released( ) ; } - onClicked : { ; ; setActiveValid( ) } - onProgressRectClicked : { ; ; setActiveValid( ) } - onProgressRectDragged : { ; ; setActiveValid( ) } + onDragged : { setInteractive(false) ; ; setActiveValid( );} + onPressed : { setInteractive(false) ; _root.pressed ( ) ; } + onReleased : { setInteractive(true ) ; _root.released( ) ; } + onHandleSelected : { setActiveValid(); } } + + SliderArrows{ id:_sliderArrows + visible : true + anchors.verticalCenter : _slider.verticalCenter + anchors.left : _slider.right + anchors.leftMargin : Variables.sliderAdjustButtonLeftMargin + + onIncrementValue : { + setActiveValid() + _slider.incrementValue(true) + } + onDecrementValue : { + setActiveValid() + _slider.decrementValue(true) + } + } }