mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "QML UI: newer Kirigami and fallout"

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -286,7 +286,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
mobile-widgets/qml/kirigami/src/mnemonicattached.cpp mobile-widgets/qml/kirigami/src/mnemonicattached.cpp
mobile-widgets/qml/kirigami/src/delegaterecycler.cpp mobile-widgets/qml/kirigami/src/delegaterecycler.cpp
mobile-widgets/qml/kirigami/src/desktopicon.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/basictheme.cpp
mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp
mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp

2
scripts/get-dep-lib.sh
View file

@ -13,7 +13,7 @@ CURRENT_XSLT="v1.1.29"
CURRENT_SQLITE="3190200" CURRENT_SQLITE="3190200"
CURRENT_LIBXML2="v2.9.4" CURRENT_LIBXML2="v2.9.4"
CURRENT_LIBFTDI="1.3" CURRENT_LIBFTDI="1.3"
CURRENT_KIRIGAMI="1aad35067deeae02a325582f570dacfccd4ecc33" CURRENT_KIRIGAMI="8b803828ad9ea67559a64a93c927862d6b19c96e"
CURRENT_BREEZE_ICONS="" CURRENT_BREEZE_ICONS=""
# Checkout library from git # Checkout library from git

14
scripts/kirigami.diff
View file

@ -1,8 +1,7 @@
diff -ur ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml 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 --- ../kirigami/src/controls/GlobalDrawer.qml 2018-06-16 16:18:42.000000000 +0900
+++ src/controls/GlobalDrawer.qml 2018-09-27 16:45:29.689438950 +0200 +++ src/controls/GlobalDrawer.qml 2018-06-17 05:05:31.000000000 +0900
@@ -328,17 +328,13 @@ @@ -249,15 +249,11 @@
ColumnLayout {
id: topContent id: topContent
spacing: 0 spacing: 0
- Layout.alignment: Qt.AlignHCenter - 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.topMargin: root.topPadding
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredHeight: implicitHeight * opacity
//NOTE: why this? just Layout.fillWidth: true doesn't seem sufficient //NOTE: why this? just Layout.fillWidth: true doesn't seem sufficient
//as items are added only after this column creation //as items are added only after this column creation
- Layout.minimumWidth: parent.width - root.leftPadding - root.rightPadding - Layout.minimumWidth: parent.width - root.leftPadding - root.rightPadding
+ Layout.minimumWidth: parent.width + Layout.minimumWidth: parent.width
visible: children.length > 0 && childrenRect.height > 0 && opacity > 0 visible: children.length > 0 && childrenRect.height > 0
opacity: !root.collapsed || showTopContentWhenCollapsed }
Behavior on opacity {