diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-28 14:53:22 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-09-28 14:53:22 -0700 |
| commit | a5db03c2b32115b14e4b83501a0771b186d87913 (patch) | |
| tree | 81194ac61e00ff7f4c9fdec17185aa679e74fbc4 /scripts | |
| parent | e99df4af2cf9d5a94797107b8e221b7dbe89ea78 (diff) | |
| download | subsurface-a5db03c2b32115b14e4b83501a0771b186d87913.tar.gz | |
Revert "QML UI: newer Kirigami and fallout"
Turns out that Jan found an issue with the latest Kirigami, so let's go back to
the known good one.
This reverts commit 17ec95e70c3ae58d505b8c3cbbaf6815186b93cb.
Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 | ||||
| -rw-r--r-- | scripts/kirigami.diff | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index cc48c36fa..fbb689f77 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="1aad35067deeae02a325582f570dacfccd4ecc33" +CURRENT_KIRIGAMI="8b803828ad9ea67559a64a93c927862d6b19c96e" CURRENT_BREEZE_ICONS="" # Checkout library from git diff --git a/scripts/kirigami.diff b/scripts/kirigami.diff index 49027d23f..daa42841b 100644 --- a/scripts/kirigami.diff +++ b/scripts/kirigami.diff @@ -1,8 +1,7 @@ diff -ur ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml ---- ../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 { +--- ../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 @@ id: topContent spacing: 0 - Layout.alignment: Qt.AlignHCenter @@ -12,11 +11,10 @@ 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 && opacity > 0 - opacity: !root.collapsed || showTopContentWhenCollapsed - Behavior on opacity { + visible: children.length > 0 && childrenRect.height > 0 + } + |