diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-27 13:42:11 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-08 12:30:03 +0000 |
commit | 3d44442331ba6f1ba7a5d5ad9f3834993911e288 (patch) | |
tree | f989e99c2a918f67b1ac7548e78b57e5e70d6908 | |
parent | 85df0b9ba60fba38f063175cd00365221737dae2 (diff) |
Fix scroll position after resizev5.13.0-beta3v5.13.0-beta2
We didn't update the position if it ended up with an invalid value.
Fixes: QTBUG-63437
Change-Id: Idc4d3b0cb43fd63bdb0ff10b4162dfabe49455df
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 530501080..4f1d59f0f 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -78,6 +78,8 @@ Item { scrollHelper.availableWidth = viewport.width scrollHelper.availableHeight = viewport.height blockUpdates = false; + hscrollbar.valueChanged(); + vscrollbar.valueChanged(); } } @@ -133,8 +135,11 @@ Item { anchors.leftMargin: leftMargin anchors.bottomMargin: bottomMargin onScrollAmountChanged: { + var scrollableAmount = scrollable ? scrollAmount : 0 if (flickableItem && (flickableItem.atXBeginning || flickableItem.atXEnd)) { - value = flickableItem.contentX - flickableItem.originX + value = Math.min(scrollableAmount, flickableItem.contentX - flickableItem.originX); + } else if (value > scrollableAmount) { + value = scrollableAmount; } } onValueChanged: { |