Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r9ac163d4aeadc39a1bcd1d8110991f32e37fc806 -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 9ac163d4aeadc39a1bcd1d8110991f32e37fc806) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) @@ -57,6 +57,7 @@ signal activeChanged() signal handleSelected() + signal sliderSelected() function incrementValue (vInStepSegments) { updateValue(vInStepSegments, true) @@ -67,8 +68,6 @@ } function updateValue(vInStepSegments, vIsIncrement) { - _root.isActive = true - let amountChanged = 1 if (vInStepSegments) { amountChanged = step @@ -106,7 +105,11 @@ // This is to resolve the use of slider with a switch and arrows enabled. // It allows correct behavior when using arrow on a first initialize increment of // the slider when the slider has inActiveZero to true. - value = (inActiveZero && (!isActive)) ? 0 : initActiveValue + if(!isActive) { + value = inActiveZero ? 0 : minimum + } else { + value = initActiveValue + } activeChanged() // emit } @@ -287,9 +290,8 @@ update(newCurrentValue) } onPressed: { - if(!_root.isActive) { - _root.isActive = true - } + // Indicate that the slider body was selected to provide handling/activation + sliderSelected() // emit // On a pressed action, if the snapped version of the new value is the same as the // current snapped value, do nothing; otherwise update the value to stay under Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r9ac163d4aeadc39a1bcd1d8110991f32e37fc806 -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 9ac163d4aeadc39a1bcd1d8110991f32e37fc806) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) @@ -119,10 +119,11 @@ handlerVisible : _root.adjustable isActive : _root.active ticks : true - onDragged : { setInteractive(false) ; ; setActiveValid( );} - onPressed : { setInteractive(false) ; _root.pressed ( ) ; setActiveValid( );} - onReleased : { setInteractive(true ) ; _root.released( ) ; } - onHandleSelected : { setActiveValid(); } + onDragged : { setInteractive(false) ; ; } + onPressed : { setInteractive(false) ; _root.pressed () ; } + onReleased : { setInteractive(true ) ; _root.released() ; } + onHandleSelected : { setActiveValid(); } + onSliderSelected : { setActiveValid(); } } SliderArrows{ id:_sliderArrows Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -r9ac163d4aeadc39a1bcd1d8110991f32e37fc806 -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 9ac163d4aeadc39a1bcd1d8110991f32e37fc806) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) @@ -153,7 +153,7 @@ diameter: Variables.sliderCircleDiameter decimal : 1 - bgColor : Colors.pressuresOutOfRaneBg + bgColor : Colors.pressuresOutOfRangeBg hasAdjust : true // imply that both handle need to be adjusted to mark as active @@ -194,7 +194,7 @@ step : _root.step ticks : _root.ticksVisible - // The min/max edge line markers visibility + // The min/max edge line markers' visibility minVerticalEdgeVisible: false maxVerticalEdgeVisible: false Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r376fa09daeeca0afef2b157005cc85e9595c4c96 -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 376fa09daeeca0afef2b157005cc85e9595c4c96) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) @@ -82,7 +82,7 @@ readonly property color pressuresText : white readonly property color pressuresArterialBar : "#31bcdb" readonly property color pressuresVenousBar : "#c568ed" - readonly property color pressuresOutOfRaneBg : red + readonly property color pressuresOutOfRangeBg : red readonly property color fluidText : white readonly property color fluidValue : white Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r376fa09daeeca0afef2b157005cc85e9595c4c96 -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 376fa09daeeca0afef2b157005cc85e9595c4c96) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) @@ -183,7 +183,6 @@ onCheckedChanged: { if ( ! active ) { active = true - checked = ! checked } vTreatmentCreate.heparinDispensingRate = 0 _heparinDispensingRate.value = 0