From 6995b4ae81a2f3ca3c24d2fa6d1560bfe0898737 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Mon, 10 Feb 2020 11:47:00 +0100 Subject: ScrollView: Use scrollbar height as bottom padding, not width Summary: Apparently I accidentally used the bottom scrollbar width instead of height. Oops. Test Plan: ScrollView with horizontal scrollbar no longer hides content Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D27280 --- org.kde.desktop/ScrollView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.kde.desktop/ScrollView.qml b/org.kde.desktop/ScrollView.qml index 4bea5c7..38bc8ed 100644 --- a/org.kde.desktop/ScrollView.qml +++ b/org.kde.desktop/ScrollView.qml @@ -45,7 +45,7 @@ T.ScrollView { rightPadding: (internal.backgroundVisible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0) + (!LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0) bottomPadding: (internal.backgroundVisible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0) - + internal.horizontalScrollBarWidth + + internal.horizontalScrollBarHeight //create a background only after Component.onCompleted, see on the component creation below for explanation Component.onCompleted: { @@ -97,7 +97,7 @@ T.ScrollView { readonly property bool backgroundVisible: controlRoot.background && controlRoot.background.visible readonly property real verticalScrollBarWidth: controlRoot.ScrollBar.vertical.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.vertical.width : 0 - readonly property real horizontalScrollBarWidth: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.width : 0 + readonly property real horizontalScrollBarHeight: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.height : 0 } ] ScrollBar.vertical: ScrollBar { -- cgit v1.1