diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-09-30 20:59:32 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-01 05:29:46 -0700 |
| commit | 5681f686ba832a1e2a831ce60900cfd3f2873f45 (patch) | |
| tree | 955eeb983ea43f4d1031dfbab44d10325d185f96 /scripts | |
| parent | e321d1563e0d2971c7bfc420b722ebd67b8b077d (diff) | |
| download | subsurface-5681f686ba832a1e2a831ce60900cfd3f2873f45.tar.gz | |
Revert "Revert "QML UI: newer Kirigami and fallout""
This reverts commit a5db03c2b32115b14e4b83501a0771b186d87913.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 | ||||
| -rw-r--r-- | scripts/kirigami.diff | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index fbb689f77..ec2f8313c 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -13,7 +13,7 @@ CURRENT_XSLT="v1.1.29" CURRENT_SQLITE="3190200" CURRENT_LIBXML2="v2.9.4" CURRENT_LIBFTDI="1.3" -CURRENT_KIRIGAMI="8b803828ad9ea67559a64a93c927862d6b19c96e" +CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9" CURRENT_BREEZE_ICONS="" # Checkout library from git diff --git a/scripts/kirigami.diff b/scripts/kirigami.diff index daa42841b..49027d23f 100644 --- a/scripts/kirigami.diff +++ b/scripts/kirigami.diff @@ -1,7 +1,8 @@ diff -ur ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml ---- ../kirigami/src/controls/GlobalDrawer.qml 2018-06-16 16:18:42.000000000 +0900 -+++ src/controls/GlobalDrawer.qml 2018-06-17 05:05:31.000000000 +0900 -@@ -249,15 +249,11 @@ +--- ../kirigami/src/controls/GlobalDrawer.qml 2018-09-27 15:27:32.340600738 +0200 ++++ src/controls/GlobalDrawer.qml 2018-09-27 16:45:29.689438950 +0200 +@@ -328,17 +328,13 @@ + ColumnLayout { id: topContent spacing: 0 - Layout.alignment: Qt.AlignHCenter @@ -11,10 +12,11 @@ diff -ur ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/s - Layout.topMargin: root.topPadding Layout.fillWidth: true Layout.fillHeight: true + Layout.preferredHeight: implicitHeight * opacity //NOTE: why this? just Layout.fillWidth: true doesn't seem sufficient //as items are added only after this column creation - Layout.minimumWidth: parent.width - root.leftPadding - root.rightPadding + Layout.minimumWidth: parent.width - visible: children.length > 0 && childrenRect.height > 0 - } - + visible: children.length > 0 && childrenRect.height > 0 && opacity > 0 + opacity: !root.collapsed || showTopContentWhenCollapsed + Behavior on opacity { |