diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 17:03:08 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 17:03:08 +0100 |
| commit | 7903979d3585b73adf3c2c2b88b5c94c303b8302 (patch) | |
| tree | 5e7b1b6ec6025778002f9312de7a14acf39011dc /src/quicktemplates2/qquickrangeslider.cpp | |
| parent | af9729ecf4434c5884cb61b990b819aaccd3af9b (diff) | |
| parent | 2202d79b39ff90eed19fb8106f79d4604e47acfd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/auto/controls/data/tst_button.qml
Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 219292c8..2f2b621c 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -68,8 +68,8 @@ QT_BEGIN_NAMESPACE } \endcode - The \l {first.position} and \l {second.position} properties are defined as a - percentage of the control's size, scaled within the range \c {0.0 - 1.0}. + The \l {first.position} and \l {second.position} properties are expressed as + fractions of the control's size, in the range \c {0.0 - 1.0}. The \l {first.visualPosition} and \l {second.visualPosition} properties are the same, except that they are reversed in a \l {Right-to-left User Interfaces}{right-to-left} application. @@ -485,7 +485,7 @@ void QQuickRangeSlider::setTo(qreal to) \li visualPosition \li This property holds the visual position of the first handle. - The position is defined as a percentage of the control's size, scaled to + The position is expressed as a fraction of the control's size, in the range \c {0.0 - 1.0}. When the control is \l {Control::mirrored}{mirrored}, the value is equal to \c {1.0 - position}. This makes the value suitable for visualizing the slider, taking right-to-left support into account. @@ -493,8 +493,8 @@ void QQuickRangeSlider::setTo(qreal to) \li position \li This property holds the logical position of the first handle. - The position is defined as a percentage of the control's size, scaled - to \c {0.0 - 1.0}. Unlike \l {first.value}{value}, position is + The position is expressed as a fraction of the control's size, in the range + \c {0.0 - 1.0}. Unlike \l {first.value}{value}, position is continuously updated while the handle is dragged. For visualizing a slider, the right-to-left aware \l {first.visualPosition}{visualPosition} should be used instead. @@ -547,7 +547,7 @@ QQuickRangeSliderNode *QQuickRangeSlider::first() const \li visualPosition \li This property holds the visual position of the second handle. - The position is defined as a percentage of the control's size, scaled to + The position is expressed as a fraction of the control's size, in the range \c {0.0 - 1.0}. When the control is \l {Control::mirrored}{mirrored}, the value is equal to \c {1.0 - position}. This makes the value suitable for visualizing the slider, taking right-to-left support into account. @@ -555,8 +555,8 @@ QQuickRangeSliderNode *QQuickRangeSlider::first() const \li position \li This property holds the logical position of the second handle. - The position is defined as a percentage of the control's size, scaled - to \c {0.0 - 1.0}. Unlike \l {second.value}{value}, position is + The position is expressed as a fraction of the control's size, in the range + \c {0.0 - 1.0}. Unlike \l {second.value}{value}, position is continuously updated while the handle is dragged. For visualizing a slider, the right-to-left aware \l {second.visualPosition}{visualPosition} should be used instead. |