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 17ec95e70c.

Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-28 14:53:22 -07:00
parent e99df4af2c
commit a5db03c2b3
3 changed files with 7 additions and 10 deletions

View file

@ -286,7 +286,6 @@ 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

View file

@ -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

View file

@ -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
}