diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:04:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:04:11 +0200 |
commit | e56eb1fc60d614b652400030074ca334deea98b6 (patch) | |
tree | b0961159a61d7cc75e2b1c11d17d9c24ff30c367 /src/controls/Private/qquickwheelarea.cpp | |
parent | 293dee361a8483aaa5bc3de49b896f012f1b337d (diff) | |
parent | 378bd7b4454a5a049072ae1043981984f30e8329 (diff) | |
download | qtquickcontrols-e56eb1fc60d614b652400030074ca334deea98b6.tar.gz |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ife389a8fd4df1eef4f521ff734d02748b25ec184
Diffstat (limited to 'src/controls/Private/qquickwheelarea.cpp')
-rw-r--r-- | src/controls/Private/qquickwheelarea.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/controls/Private/qquickwheelarea.cpp b/src/controls/Private/qquickwheelarea.cpp index 9c0a70a2..bd77ae24 100644 --- a/src/controls/Private/qquickwheelarea.cpp +++ b/src/controls/Private/qquickwheelarea.cpp @@ -141,7 +141,11 @@ void QQuickWheelArea1::wheelEvent(QWheelEvent *we) void QQuickWheelArea1::setHorizontalMinimumValue(qreal value) { + if (value == m_horizontalMinimumValue) + return; + m_horizontalMinimumValue = value; + emit horizontalMinimumValueChanged(); } qreal QQuickWheelArea1::horizontalMinimumValue() const @@ -151,7 +155,11 @@ qreal QQuickWheelArea1::horizontalMinimumValue() const void QQuickWheelArea1::setHorizontalMaximumValue(qreal value) { + if (value == m_horizontalMaximumValue) + return; + m_horizontalMaximumValue = value; + emit horizontalMaximumValueChanged(); } qreal QQuickWheelArea1::horizontalMaximumValue() const @@ -161,7 +169,11 @@ qreal QQuickWheelArea1::horizontalMaximumValue() const void QQuickWheelArea1::setVerticalMinimumValue(qreal value) { + if (value == m_verticalMinimumValue) + return; + m_verticalMinimumValue = value; + emit verticalMinimumValueChanged(); } qreal QQuickWheelArea1::verticalMinimumValue() const @@ -171,7 +183,11 @@ qreal QQuickWheelArea1::verticalMinimumValue() const void QQuickWheelArea1::setVerticalMaximumValue(qreal value) { + if (value == m_verticalMaximumValue) + return; + m_verticalMaximumValue = value; + emit verticalMaximumValueChanged(); } qreal QQuickWheelArea1::verticalMaximumValue() const |