From c4ebce1dc617819779a955f5d58209649efbfe31 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 13 Feb 2020 22:36:12 +0100 Subject: kirigami2: fix scrollbar behaviour --- kde/patch/kirigami2.patch | 4 ++++ kde/patch/kirigami2/kirigami_scrollbar.patch | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 kde/patch/kirigami2/kirigami_scrollbar.patch diff --git a/kde/patch/kirigami2.patch b/kde/patch/kirigami2.patch index 4dc70bb..ab60b57 100644 --- a/kde/patch/kirigami2.patch +++ b/kde/patch/kirigami2.patch @@ -2,3 +2,7 @@ # Should be fixed post kirigami2 5.64.0): #cat $CWD/patch/kirigami2/kirigami_iconview_crash.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Make headerParent correctly aligned when there is a scrollbar: +# Should be fixed post kirigami2 5.67.0): +cat $CWD/patch/kirigami2/kirigami_scrollbar.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kirigami2/kirigami_scrollbar.patch b/kde/patch/kirigami2/kirigami_scrollbar.patch new file mode 100644 index 0000000..e81bf0e --- /dev/null +++ b/kde/patch/kirigami2/kirigami_scrollbar.patch @@ -0,0 +1,25 @@ +From f695cde36a6829b8b92b2fd82deff16d9385fcb9 Mon Sep 17 00:00:00 2001 +From: Marco Martin +Date: Mon, 10 Feb 2020 11:48:50 +0100 +Subject: make headerParent correctly alignedwhen there is a scrollbar + +--- + src/controls/GlobalDrawer.qml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/controls/GlobalDrawer.qml b/src/controls/GlobalDrawer.qml +index 0e8e512..9166ad7 100644 +--- a/src/controls/GlobalDrawer.qml ++++ b/src/controls/GlobalDrawer.qml +@@ -301,6 +301,7 @@ OverlayDrawer { + anchors { + left: parent.left + right: parent.right ++ rightMargin: Math.min(0, -scrollView.width + mainFlickable.width) + } + spacing: 0 + y: bannerImage.visible ? Math.max(headerContainer.height, -mainFlickable.contentY) - height : 0 +-- +cgit v1.1 + + -- cgit v1.2.3