Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r0d1939fed65f8d71135c31dc8a94b77da069e1bf -r4c45b0a8be6589f9fb55b646edbe075a1f7df4fd --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 0d1939fed65f8d71135c31dc8a94b77da069e1bf) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 4c45b0a8be6589f9fb55b646edbe075a1f7df4fd) @@ -53,10 +53,14 @@ property bool isRoundedEnds : true property bool hasBorder : true - property color borderColor : Colors.borderDisableButton - property color highlightColor : Colors.sliderHighlightColor + property bool showMinMaxText : true + 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() @@ -109,11 +113,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 } } @@ -291,7 +295,7 @@ ProgressRect { id: _progressRect property real previousSliderValue: Number.NaN value : minimum - color : _root.highlightColor + color : _root.highlightActiveColor decimal : _root.decimal minimum : _root.minimum @@ -371,7 +375,7 @@ width : diameter height : diameter radius : diameter - color : Colors.highlightProgressBar + color : _root.handlerActiveColor border { width: Variables.progressbarHandlerBorderWidth color: Colors.textMain Index: sources/gui/qml/components/SliderUfAdjustment.qml =================================================================== diff -u -r5001ec3cb4b5e76db9fa3c70a36e9c8d64677348 -r4c45b0a8be6589f9fb55b646edbe075a1f7df4fd --- sources/gui/qml/components/SliderUfAdjustment.qml (.../SliderUfAdjustment.qml) (revision 5001ec3cb4b5e76db9fa3c70a36e9c8d64677348) +++ sources/gui/qml/components/SliderUfAdjustment.qml (.../SliderUfAdjustment.qml) (revision 4c45b0a8be6589f9fb55b646edbe075a1f7df4fd) @@ -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 -r5001ec3cb4b5e76db9fa3c70a36e9c8d64677348 -r4c45b0a8be6589f9fb55b646edbe075a1f7df4fd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 5001ec3cb4b5e76db9fa3c70a36e9c8d64677348) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 4c45b0a8be6589f9fb55b646edbe075a1f7df4fd) @@ -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