Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r0e2a9c05ce36fd5ffd717b83be813174121dd0cf -r261fa5939140953733f764f2c783c35347de415f --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 0e2a9c05ce36fd5ffd717b83be813174121dd0cf) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 261fa5939140953733f764f2c783c35347de415f) @@ -55,10 +55,13 @@ property bool isRoundedEnds : true property bool hasBorder : true property bool showMinMaxText : true - property color borderColor : Colors.borderDisableButton - property color highlightColor : Colors.sliderHighlightColor + property color borderColor : Colors.borderDisableButton + property color highlightActiveColor : Colors.sliderHighlightColor + property color highlightInactiveColor : Colors.createTreatmentInactive property color progressBorderActiveColor : Colors.sliderProgressBorderActive property color progressBorderInactiveColor : Colors.borderDisableButton + property color handlerActiveColor : Colors.createTreatmentActive + property color handlerInactiveColor : Colors.createTreatmentInactive signal activeChanged() signal handleSelected() @@ -111,11 +114,11 @@ function setActiveVisuals(active) { if (active) { - color = _root.highlightColor - handlerColor = Colors.createTreatmentActive + color = _root.highlightActiveColor + handlerColor = _root.handlerActiveColor } else { - color = Colors.createTreatmentInactive - handlerColor = Colors.createTreatmentInactive + color = _root.highlightInactiveColor + handlerColor = _root.handlerInactiveColor } } @@ -293,7 +296,7 @@ ProgressRect { id: _progressRect property real previousSliderValue: Number.NaN value : minimum - color : _root.highlightColor + color : _root.highlightActiveColor decimal : _root.decimal minimum : _root.minimum @@ -373,7 +376,7 @@ width : diameter height : diameter radius : diameter - color : Colors.highlightProgressBar + color : _root.handlerActiveColor border { width: Variables.progressbarHandlerBorderWidth color: _root.handleBorderColor Index: sources/gui/qml/components/SliderUfAdjustment.qml =================================================================== diff -u -r4746b6bcbf4def7888f7b29d72431b28e6672f12 -r261fa5939140953733f764f2c783c35347de415f --- sources/gui/qml/components/SliderUfAdjustment.qml (.../SliderUfAdjustment.qml) (revision 4746b6bcbf4def7888f7b29d72431b28e6672f12) +++ sources/gui/qml/components/SliderUfAdjustment.qml (.../SliderUfAdjustment.qml) (revision 261fa5939140953733f764f2c783c35347de415f) @@ -115,11 +115,12 @@ enabled : _root.adjustable height : Variables.ultraFiltrationProgressBarHeight bgColor : Colors.ufAdjustmentProgressBarBg - highlightColor : Colors.ufAdjustmentDeltaFill + highlightActiveColor : Colors.ufAdjustmentDeltaFill + handlerActiveColor : Colors.backgroundButtonSelect + progressBorderActiveColor: _slider.borderColor diameter : Variables.progressbarHandler touchMargin : Variables.createTreatmentSliderMargin handler.z : 5 - handlerColor : Colors.createTreatmentInactive handlerVisible : _root.adjustable isActive : _root.active stepSnap : true Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r4746b6bcbf4def7888f7b29d72431b28e6672f12 -r261fa5939140953733f764f2c783c35347de415f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 4746b6bcbf4def7888f7b29d72431b28e6672f12) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 261fa5939140953733f764f2c783c35347de415f) @@ -29,7 +29,7 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationEdit" //SquishQt testability QtObject { id: _private - property int decimal : Variables.ultrafiltrationPrecision + property int decimal : Variables.ultrafiltrationPrecision property real setVolume : vTreatmentUltrafiltration.setVolume property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved } @@ -70,18 +70,21 @@ SliderUfAdjustment { id: _setVolumeSlider anchors { top : _ufMetrics.bottom - topMargin : 160 + topMargin : Variables.ultrafiltrationContentMargin left : parent.left leftMargin : 80 right : parent.right rightMargin : anchors.leftMargin horizontalCenter: undefined } + decimal : Variables.ultrafiltrationPrecision minimum : 0 minStop : _private.volumeRemoved - maximum : 20 - defaultValue : { defaultValue =_private.setVolume } // set without binding + maximum : 8 unit : Variables.unitVolume + step : 0.1 + defaultValue : { defaultValue = _private.setVolume } // set without binding + active : true } TouchRect { id: _continueButton