mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "QML UI: newer Kirigami and fallout""

Browse source 
This reverts commit a5db03c2b3.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-09-30 20:59:32 +02:00 committed by Dirk Hohndel
parent e321d1563e
commit 5681f686ba
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -286,6 +286,7 @@ 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="8b803828ad9ea67559a64a93c927862d6b19c96e" CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9"
CURRENT_BREEZE_ICONS="" CURRENT_BREEZE_ICONS=""
# Checkout library from git # Checkout library from git

14
scripts/kirigami.diff
View file

@ -1,7 +1,8 @@
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-06-16 16:18:42.000000000 +0900 --- ../kirigami/src/controls/GlobalDrawer.qml 2018-09-27 15:27:32.340600738 +0200
+++ src/controls/GlobalDrawer.qml 2018-06-17 05:05:31.000000000 +0900 +++ src/controls/GlobalDrawer.qml 2018-09-27 16:45:29.689438950 +0200
@@ -249,15 +249,11 @@ @@ -328,17 +328,13 @@
ColumnLayout {
id: topContent id: topContent
spacing: 0 spacing: 0
- Layout.alignment: Qt.AlignHCenter - 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.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 visible: children.length > 0 && childrenRect.height > 0 && opacity > 0
} opacity: !root.collapsed || showTopContentWhenCollapsed
Behavior on opacity {