Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r9ec7a27375189ad75f0bef142cd6beb386db0955 -r56e378f7504701b9e9a9dccaf205aef2fd52c58e --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 9ec7a27375189ad75f0bef142cd6beb386db0955) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) @@ -1,14 +1,15 @@ /*! * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. - * \copyright \n - * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n - * IN PART OR IN WHOLE, \n - * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * \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 Slider.qml - * \date 2020/03/13 - * \author Behrouz NematiPour + * \file Slider.qml + * \author (last) Behrouz NemaiPour + * \date (last) 04-Jun-2020 + * \author (original) Behrouz NematiPour + * \date (original) 18-Mar-2020 * */ @@ -24,7 +25,8 @@ */ RangeRect { id: _root property alias value : _progressRect.value - property int step : 1 + + property real step : 1 property bool stepSnap : false property bool ticks : false @@ -88,11 +90,11 @@ ProgressRect { id: _progressRect color : Colors.highlightProgressBar touchMargin : parent.touchMargin + decimal : _root.decimal + minimum : _root.minimum + maximum : _root.maximum - minimum : parent.minimum - maximum : parent.maximum - - // propagation is not working on drag + // propagation is not working on drag ! onDragged: { setValue(vMouseEvent.x) } @@ -107,6 +109,7 @@ active : ticks anchors.fill : parent sourceComponent : TickMarks { + decimal : _root.decimal minimum : _root.minimum maximum : _root.maximum step : _root.step @@ -131,10 +134,10 @@ width : diameter height : diameter radius : diameter - color : "white" + color : Colors.highlightProgressBar border { width: 4 - color: Colors.highlightProgressBar + color: "white" } } }