Index: sources/gui/qml/components/RangeMarker.qml =================================================================== diff -u -ra6ad83a73eb80978261a408ee5a92fbc8f7faa4e -rde68fcc0e2885ef78670ce8edf5e10f88b705d8d --- sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision a6ad83a73eb80978261a408ee5a92fbc8f7faa4e) +++ sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision de68fcc0e2885ef78670ce8edf5e10f88b705d8d) @@ -46,7 +46,7 @@ Rectangle { id: _handle visible : false - width : _root.width * 4 + width : _root.width * 3 height : width radius : width color : _root.color @@ -69,15 +69,15 @@ Text { id: _textValue font { pixelSize : Fonts.fontPixelRangeMarker - weight : Font.DemiBold + weight : Font.Bold } anchors { right : valueOnTop ? parent.left : undefined top : valueOnTop ? undefined : parent.top bottom : valueOnTop ? _handle.top : undefined - bottomMargin: valueOnTop ? 10 : 0 + bottomMargin: valueOnTop ? 5 : 0 rightMargin : valueOnTop ? -12 : 5 topMargin : valueOnTop ? 0 : -5 horizontalCenter: valueOnTop ? _handle.horizontalCenter : undefined Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -ra6ad83a73eb80978261a408ee5a92fbc8f7faa4e -rde68fcc0e2885ef78670ce8edf5e10f88b705d8d --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision a6ad83a73eb80978261a408ee5a92fbc8f7faa4e) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision de68fcc0e2885ef78670ce8edf5e10f88b705d8d) @@ -41,7 +41,7 @@ readonly property int fontPixelVitals : 60 - readonly property int fontPixelRangeMarker : 32 + readonly property int fontPixelRangeMarker : 16 readonly property int fontPixelRangeRectText : 14 readonly property int fontPixelStepCurrent : 18 @@ -78,6 +78,7 @@ readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 readonly property int fontPixelUltrafiltrationAdjustmentNotification : 32 + readonly property int fontPixelUltrafiltrationRangeMarker : 32 readonly property int fontPixelUltrafiltrationRateUnit : 16 readonly property int fontPixelRinsebackAdjustmentButton : 26 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -ra6ad83a73eb80978261a408ee5a92fbc8f7faa4e -rde68fcc0e2885ef78670ce8edf5e10f88b705d8d --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision a6ad83a73eb80978261a408ee5a92fbc8f7faa4e) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision de68fcc0e2885ef78670ce8edf5e10f88b705d8d) @@ -80,10 +80,11 @@ readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 10 readonly property int rangeRectBorderWidth : 2 - readonly property int rangeMarkerHeight : 50 + readonly property int rangeMarkerHeight : 60 readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 30 - readonly property int rangeMarkerWidth : 3 + readonly property int rangeMarkerWidth : 2 + readonly property int rangeMarkerWidthMidle : 3 readonly property int progressbarHeight : 30 readonly property int progressbarHandler : 30 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -re92a0be33661bf292d90661f9cc206531aa3032f -rde68fcc0e2885ef78670ce8edf5e10f88b705d8d --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision e92a0be33661bf292d90661f9cc206531aa3032f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision de68fcc0e2885ef78670ce8edf5e10f88b705d8d) @@ -96,6 +96,17 @@ } text : _private.setVolume.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume } + marker { + width : Variables.rangeMarkerWidthMidle + handle.width : marker.width * 4 + text { + anchors.bottomMargin: marker.valueOnTop ? 10 : 0 + font { + pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker + weight: Font.DemiBold + } + } + } } TouchRect { id: _pauseButton