[frameworks/kirigami] src/controls: ScrollablePage: Fix enter animation running when changing focus

Manuel Alcaraz Zambrano <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit da8c22add61cc0f3b52f456bb2d447b5b1572836 by Manuel Alcaraz Zambrano.
Committed on 24/07/2026 at 18:27.
Pushed by carlschwan into branch 'master'.

ScrollablePage: Fix enter animation running when changing focus

BUG: 515811

M  +2    -2    src/controls/ScrollablePage.qml

https://invent.kde.org/frameworks/kirigami/-/commit/da8c22add61cc0f3b52f456bb2d447b5b1572836

diff --git a/src/controls/ScrollablePage.qml b/src/controls/ScrollablePage.qml
index a519d5468..edc48d623 100644
--- a/src/controls/ScrollablePage.qml
+++ b/src/controls/ScrollablePage.qml
@@ -211,12 +211,12 @@ KC.Page {
             : actualItemY
         if (actualItemX < root.flickable.contentX) {
             root.flickable.contentX = Math.max(0, viewXPosition)
-        } else if ((actualItemX + item.width) > (root.flickable.contentX + root.flickable.width)) {
+        } else if ((actualItemX + item.width - scrollView.QQC2.ScrollBar.vertical.width) > (root.flickable.contentX + root.flickable.width)) {
             root.flickable.contentX = Math.min(root.flickable.contentWidth - root.flickable.width, viewXPosition)
         }
         if (actualItemY < root.flickable.contentY) {
             root.flickable.contentY = Math.max(0, viewYPosition)
-        } else if ((actualItemY + item.height) > (root.flickable.contentY + root.flickable.height)) {
+        } else if ((actualItemY + item.height - scrollView.QQC2.ScrollBar.horizontal.height) > (root.flickable.contentY + root.flickable.height)) {
             root.flickable.contentY = Math.min(root.flickable.contentHeight - root.flickable.height, viewYPosition)
         }
         root.flickable.returnToBounds()
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.