Index: sources/gui/qml/components/RangeRect.qml =================================================================== diff -u -r839893734937449efb6e7c31787d2c44515b69af -rbbbd9cbf805779ef498a8f59cc74b9b597802a55 --- sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 839893734937449efb6e7c31787d2c44515b69af) +++ sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision bbbd9cbf805779ef498a8f59cc74b9b597802a55) @@ -46,7 +46,7 @@ property bool hasBorder : false color : Colors.backgroundRangeRect - radius : isRoundedEnds ? Variables.rangeRectRadiusRounded : Variables.rangeRectRadius + radius : isRoundedEnds ? (height/2) : Variables.rangeRectRadius border.width: hasBorder ? Variables.rangeRectBorderWidth : 0 border.color: Colors.rangeRectBorderColor Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rbbbd9cbf805779ef498a8f59cc74b9b597802a55 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision bbbd9cbf805779ef498a8f59cc74b9b597802a55) @@ -79,10 +79,14 @@ /// root attributes clip : false + color: Colors.transparent height : Variables.progressbarHeight touchMargin : 25 + isRoundedEnds : true + hasBorder : true + minimum : 0 maximum : 0 @@ -107,7 +111,7 @@ /// function setAdjusted() { function check() { - _rangeRect .color = minAdjusted && maxAdjusted ? Colors.createTreatmentActive : Colors.createTreatmentInactive + _rangeRect .color = minAdjusted && maxAdjusted ? Colors.sliderHighlightColor : Colors.createTreatmentInactive _handlerLeft .color = minAdjusted ? Colors.createTreatmentActive: Colors.createTreatmentInactive _handlerRight.color = maxAdjusted ? Colors.createTreatmentActive: Colors.createTreatmentInactive } @@ -226,13 +230,13 @@ property alias lowerBound : _rangeRect.minimum property alias upperBound : _rangeRect.maximum property real minmaxDiff : parent.maximum - parent.minimum - x : minmaxDiff ? ((parent.width * (lowerBound - parent.minimum)) / minmaxDiff) : minmaxDiff width : minmaxDiff ? ((parent.width * (upperBound - lowerBound )) / minmaxDiff) : minmaxDiff height : parent.height - radius : 0 decimal : _root.decimal + isRoundedEnds : _root.isRoundedEnds + hasBorder : _root.hasBorder minText { visible: false @@ -268,6 +272,9 @@ step : _root.step stepSnap : _root.stepSnap textColor : _root.color + length : _rangeRect.height + isTickMarkRound : _root.isRoundedEnds + yDisplacement : _root.isRoundedEnds ? (-_rangeRect.height) : 0 } } Index: sources/gui/qml/components/TickMarks.qml =================================================================== diff -u -r839893734937449efb6e7c31787d2c44515b69af -rbbbd9cbf805779ef498a8f59cc74b9b597802a55 --- sources/gui/qml/components/TickMarks.qml (.../TickMarks.qml) (revision 839893734937449efb6e7c31787d2c44515b69af) +++ sources/gui/qml/components/TickMarks.qml (.../TickMarks.qml) (revision bbbd9cbf805779ef498a8f59cc74b9b597802a55) @@ -42,7 +42,7 @@ property bool isTickMarkRound : false property real roundTickMarkDiameter : Variables.sliderDefaultRoundTickMarkDiameter property real yDisplacement : 0 - property bool showFirstMark : false + property bool showFirstMark : true property bool textVisible : false property color textColor : Colors.textMain Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r839893734937449efb6e7c31787d2c44515b69af -rbbbd9cbf805779ef498a8f59cc74b9b597802a55 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 839893734937449efb6e7c31787d2c44515b69af) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision bbbd9cbf805779ef498a8f59cc74b9b597802a55) @@ -71,7 +71,6 @@ readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 - readonly property int rangeRectRadiusRounded : sliderCreateTreatmentHeight/2 readonly property int rangeRectTextMargin : 7 readonly property int rangeRectBorderWidth : 2 readonly property int rangeMarkerHeight : 60 Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r930128c05f11253bddce102380f4512dbb454aae -rbbbd9cbf805779ef498a8f59cc74b9b597802a55 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 930128c05f11253bddce102380f4512dbb454aae) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision bbbd9cbf805779ef498a8f59cc74b9b597802a55) @@ -412,7 +412,7 @@ RangeSlider { id: _arterialPressureLimits objectName : "_arterialPressureLimitsSlider" // dimension - height : Variables.progressbarFluidHeight + height : Variables.sliderCreateTreatmentHeight width : Variables.createTreatmentSliderWidth diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter @@ -498,7 +498,7 @@ RangeSlider { id: _venousPressureLimits objectName: "_venousPressureLimitsSlider" // dimension - height : Variables.progressbarFluidHeight + height : Variables.sliderCreateTreatmentHeight width : Variables.createTreatmentSliderWidth diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter