diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-14 15:09:02 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-14 19:17:23 +0000 |
commit | 2e19d8eafa9aeb75a09f2f54f8da272acd9700be (patch) | |
tree | 034e61d987de41bae63837954ccbba9c7aac7d64 /src/quicktemplates2/qquickscrollbar.cpp | |
parent | 23e88e009bcb861756b9f6419d2c0c713c010a10 (diff) |
Fix missing scroll bars and indicators
The layouting code broke in commit aa823b2 that fixed the build
after item change listener changes in qtdeclarative.
Change-Id: Ife3c598c6aca03f0aebe1fdf32f5ca412de62f0d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar.cpp')
-rw-r--r-- | src/quicktemplates2/qquickscrollbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index 196ee5ed..5f26814d 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -481,11 +481,11 @@ void QQuickScrollBarAttachedPrivate::itemGeometryChanged(QQuickItem *item, const Q_UNUSED(item); Q_UNUSED(change); if (horizontal && horizontal->height() > 0) { - bool move = qFuzzyIsNull(horizontal->y()) || qFuzzyCompare(horizontal->y(), item->height() - diff.height()); + bool move = qFuzzyIsNull(horizontal->y()) || qFuzzyCompare(horizontal->y(), item->height() - diff.height() - horizontal->height()); layoutHorizontal(move); } if (vertical && vertical->width() > 0) { - bool move = qFuzzyIsNull(vertical->x()) || qFuzzyCompare(vertical->x(), item->width() - diff.width()); + bool move = qFuzzyIsNull(vertical->x()) || qFuzzyCompare(vertical->x(), item->width() - diff.width() - vertical->width()); layoutVertical(move); } } |