Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -r9391d4058233e096350d9dc3ced79aed8ed93b38 -r79bf4dda5c027044ebd0014e7deac42a058a7fcf --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 9391d4058233e096350d9dc3ced79aed8ed93b38) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf) @@ -14,7 +14,6 @@ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project // Qml imports @@ -25,13 +24,16 @@ */ RangeRect { id: _root property alias value : _progressRect.value - property alias valueEx : _progressRectEx.value property alias color : _progressRect.color property alias bgColor : _root.color property alias marker : _marker + property alias markerHeight: _marker.height + property alias minimum : _root.minimum + property alias maximum : _root.maximum + height : Variables.progressbarHeight minimum : 0 @@ -40,35 +42,29 @@ minText.visible : true maxText.visible : true - - ProgressRect { id: _progressRectEx - visible : value - - minimum : _root.minimum - maximum : _root.maximum - value : _root.valueEx - - color : Colors.highlightMedProgressBar - maxText.visible: visible - margin : 0 - } - + // Since this Component is the base Component of the ProgressBarEx + // we need to use the z order + // to order the parent object (ProgressBar) Components + // in the child(ProgressBarEx) ProgressRect { id: _progressRect + z: 1 // Main ProgressBar Rect, z order in the gui minimum : _root.minimum maximum : _root.maximum value : _root.value color : Colors.highlightProgressBar - RangeMarker { id: _marker - anchors { - left : parent.right - } + } - height : Variables.rangeMarkerHeight - hasHandle : true - - value : _root.value + RangeMarker { id: _marker + z : 3 // ProgressBar marker should be on top of the all ProgressBars z order in the gui + anchors { + left : _progressRect.right } + + height : Variables.rangeMarkerHeight + hasHandle : true + + value : _root.value } }