Index: sources/gui/qml/components/RangeRect.qml =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -r5f6975c6ee7823fc884328418298128cdb97107f --- sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 5f6975c6ee7823fc884328418298128cdb97107f) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file RangeRect.qml - * \author (last) Peter Lucia - * \date (last) 06-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 24-Jan-2020 + * \file RangeRect.qml + * \author (last) Behrouz NematiPour + * \date (last) 20-Nov-2020 + * \author (original) Behrouz NematiPour + * \date (original) 24-Jan-2020 * */ @@ -26,9 +26,9 @@ Rectangle { id: _root signal clicked(var vMouseEvent) signal dragged(var vMouseEvent) - signal pressChanged() + signal released(var vMouseEvent) + signal pressed(var vMouseEvent) - property int decimal : 0 property real minimum : 0 ///< minimum value of the range property real maximum : 0 ///< maximum value of the range @@ -42,13 +42,15 @@ property string unit : "" property real touchMargin: 0 + property bool isRoundedEnds : true + property bool hasBorder : true - width : parent.width - height : parent.height - color : Colors.backgroundRangeRect - radius : Variables.rangeRectRadius + radius : isRoundedEnds ? (height/2) : Variables.rangeRectRadius + border.width: hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: Colors.rangeRectBorderColor + Text { id: _textMinimum visible : false @@ -90,12 +92,14 @@ onPositionChanged: { _root.dragged(mouse) } - onClicked: { _root.clicked(mouse) } - onPressedChanged: { - _root.pressChanged(); + onReleased: { + _root.released(mouse) } + onPressed: { + _root.pressed(mouse) + } } }