diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-09-27 15:57:27 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-27 08:42:47 -0700 |
| commit | 17ec95e70c3ae58d505b8c3cbbaf6815186b93cb (patch) | |
| tree | 3c106e02d7e11eb8de81db6bcbb2b0c8ec657b48 | |
| parent | 2d1ef04e2f6d8d84172b4be532de6231ea044200 (diff) | |
| download | subsurface-17ec95e70c3ae58d505b8c3cbbaf6815186b93cb.tar.gz | |
QML UI: newer Kirigami and fallout
Update to the master of today, and no issues detected on mobile-on-desktop
and Android.
Only, the ugly border is back as the magic hack of 0b16b547ae2aefb1 failed
due to the patch file that errored. So that is fixed too.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | scripts/get-dep-lib.sh | 2 | ||||
| -rw-r--r-- | scripts/kirigami.diff | 14 |
3 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a4a82f640..040531621 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,6 +286,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") mobile-widgets/qml/kirigami/src/mnemonicattached.cpp mobile-widgets/qml/kirigami/src/delegaterecycler.cpp mobile-widgets/qml/kirigami/src/desktopicon.cpp + mobile-widgets/qml/kirigami/src/scenepositionattached.cpp mobile-widgets/qml/kirigami/src/libkirigami/basictheme.cpp mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index fbb689f77..cc48c36fa 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="1aad35067deeae02a325582f570dacfccd4ecc33" 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 { |