Index: sources/gui/qml/components/ProgressRect.qml =================================================================== diff -u -r00e025a5d672cae66e592608792c17d98be54d19 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/components/ProgressRect.qml (.../ProgressRect.qml) (revision 00e025a5d672cae66e592608792c17d98be54d19) +++ sources/gui/qml/components/ProgressRect.qml (.../ProgressRect.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,20 +1,20 @@ /*! * - * 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 (c) 2020-2024 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 ProgressRect.qml - * \date 2020/01/23 - * \author Behrouz NematiPour + * \author (last) Vy + * \date (last) 15-Mar-2023 + * \author (original) Behrouz NematiPour + * \date (original) 23-Jan-2020 * */ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project // Qml imports @@ -26,11 +26,21 @@ * in regards to the min, max, width, current value of the parent */ RangeRect { id: _root - property int value : 0 - property real margin : Variables.rangeRectMargin + property real value : 0 + property real margin : Variables.progressbarRectMargin QtObject { id: _private - property int length: ((parent.width * (value - minimum)) / (maximum - minimum) - (margin * 2)) + property int length: if ( value < minimum ) { + 0 + } else if ( value > maximum ) { + width + } else { + if (maximum > minimum) { + ((parent.width * (value - minimum)) / (maximum - minimum) - (margin * 2)) + } else { + 0 + } + } } width : _private.length