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
subsurface/scripts/kirigami.diff

76 lines
4 KiB
Diff
Raw Normal View History

Mobile: hack around toolbar theme issue Whatever I try, the toolbar background is always based on the 'active' color set in qtquickcontrols2.conf, not on anything that I can set in QML code. So in an effort to brute-force the issue, this hardcodes the subsurfaceTheme value in the toolbar UI code of Kirigami. To make this easier, this (and one of the other hacks) is added to the existing kirigami.diff. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 12:06:02 -05:00
diff -rwu ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml
Mobile: hack around missing icons in the toolbar This looks extremely fishy to me, but it does seem sufficient to get the forward and backward buttons to show up in the toolbar. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 14:24:47 -05:00
--- ../kirigami/src/controls/GlobalDrawer.qml 2019-10-08 13:21:17.459065272 -0500
+++ src/controls/GlobalDrawer.qml 2019-10-08 14:15:17.892762708 -0500
Mobile: hack around toolbar theme issue Whatever I try, the toolbar background is always based on the 'active' color set in qtquickcontrols2.conf, not on anything that I can set in QML code. So in an effort to brute-force the issue, this hardcodes the subsurfaceTheme value in the toolbar UI code of Kirigami. To make this easier, this (and one of the other hacks) is added to the existing kirigami.diff. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 12:06:02 -05:00
@@ -331,17 +331,13 @@
Revert "Revert "QML UI: newer Kirigami and fallout"" This reverts commit a5db03c2b32115b14e4b83501a0771b186d87913. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-30 20:59:32 +02:00
ColumnLayout {
build-system: add another Kirigami hack We want to be able to roll our own banner image, logo, title, and other information in the GlobalDrawer - but Kirigami adds an ugly margin around that. This attempts to remove that margin (but for some reason there is still a margin on the left side). This requires the patch command to be installed, but because of the context sensitivity of the changes, I couldn't figure out how to do this with sed or perl (which we already require). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-17 05:59:02 +09:00
id: topContent
spacing: 0
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: root.leftPadding
- Layout.rightMargin: root.rightPadding
Layout.bottomMargin: Units.smallSpacing
- Layout.topMargin: root.topPadding
Layout.fillWidth: true
Layout.fillHeight: true
Revert "Revert "QML UI: newer Kirigami and fallout"" This reverts commit a5db03c2b32115b14e4b83501a0771b186d87913. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-30 20:59:32 +02:00
Layout.preferredHeight: implicitHeight * opacity
build-system: add another Kirigami hack We want to be able to roll our own banner image, logo, title, and other information in the GlobalDrawer - but Kirigami adds an ugly margin around that. This attempts to remove that margin (but for some reason there is still a margin on the left side). This requires the patch command to be installed, but because of the context sensitivity of the changes, I couldn't figure out how to do this with sed or perl (which we already require). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-17 05:59:02 +09:00
//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
Mobile: hack around missing icons in the toolbar This looks extremely fishy to me, but it does seem sufficient to get the forward and backward buttons to show up in the toolbar. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 14:24:47 -05:00
+ Layout.minimumWidth: parent.width
Revert "Revert "QML UI: newer Kirigami and fallout"" This reverts commit a5db03c2b32115b14e4b83501a0771b186d87913. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-30 20:59:32 +02:00
visible: children.length > 0 && childrenRect.height > 0 && opacity > 0
opacity: !root.collapsed || showTopContentWhenCollapsed
Behavior on opacity {
Mobile: hack around toolbar theme issue Whatever I try, the toolbar background is always based on the 'active' color set in qtquickcontrols2.conf, not on anything that I can set in QML code. So in an effort to brute-force the issue, this hardcodes the subsurfaceTheme value in the toolbar UI code of Kirigami. To make this easier, this (and one of the other hacks) is added to the existing kirigami.diff. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 12:06:02 -05:00
diff -rwu ../kirigami/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml mobile-widgets/qml/kirigami/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
--- ../kirigami/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml 2019-10-05 11:32:27.135224411 -0500
+++ src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml 2019-10-08 10:57:14.603086232 -0500
@@ -40,6 +40,7 @@
preferredHeight: globalToolBar.preferredHeight
maximumHeight: globalToolBar.maximumHeight
separatorVisible: globalToolBar.separatorVisible
+ background: Rectangle { color: subsurfaceTheme.primaryColor }
RowLayout {
anchors.fill: parent
@@ -110,6 +111,6 @@
Layout.preferredWidth: height
}
}
- background.opacity: breadcrumbLoader.opacity
+ //background.opacity: breadcrumbLoader.opacity
}
Mobile: hack around missing icons in the toolbar This looks extremely fishy to me, but it does seem sufficient to get the forward and backward buttons to show up in the toolbar. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 14:24:47 -05:00
diff -rwu ../kirigami/src/controls/templates/private/BackButton.qml mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml
--- ../kirigami/src/controls/templates/private/BackButton.qml 2019-10-05 11:32:27.138557762 -0500
+++ src/controls/templates/private/BackButton.qml 2019-10-08 14:16:53.677758571 -0500
@@ -27,6 +27,7 @@
id: button
icon.name: (LayoutMirroring.enabled ? "go-previous-symbolic-rtl" : "go-previous-symbolic")
+ icon.source: (LayoutMirroring.enabled ? "go-previous-symbolic-rtl" : "go-previous-symbolic")
enabled: applicationWindow().pageStack.layers.depth > 1 || (applicationWindow().pageStack.depth > 1 && (applicationWindow().pageStack.currentIndex > 0 || applicationWindow().pageStack.contentItem.contentX > 0))
diff -rwu ../kirigami/src/controls/templates/private/ForwardButton.qml mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml
--- ../kirigami/src/controls/templates/private/ForwardButton.qml 2019-10-05 11:32:27.138557762 -0500
+++ src/controls/templates/private/ForwardButton.qml 2019-10-08 14:13:40.804488568 -0500
@@ -27,6 +27,7 @@
id: button
icon.name: (LayoutMirroring.enabled ? "go-next-symbolic-rtl" : "go-next-symbolic")
+ icon.source: (LayoutMirroring.enabled ? "go-next-symbolic-rtl" : "go-next-symbolic")
enabled: applicationWindow().pageStack.currentIndex < applicationWindow().pageStack.depth-1
Mobile: hack around toolbar theme issue Whatever I try, the toolbar background is always based on the 'active' color set in qtquickcontrols2.conf, not on anything that I can set in QML code. So in an effort to brute-force the issue, this hardcodes the subsurfaceTheme value in the toolbar UI code of Kirigami. To make this easier, this (and one of the other hacks) is added to the existing kirigami.diff. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 12:06:02 -05:00
diff -rwu ../kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp
--- ../kirigami/src/kirigamiplugin.cpp 2019-10-05 11:32:27.141891113 -0500
+++ src/kirigamiplugin.cpp 2019-10-05 11:52:30.444777441 -0500
@@ -41,7 +41,7 @@
//Q_INIT_RESOURCE(kirigami);
#ifdef KIRIGAMI_BUILD_TYPE_STATIC
-#include <qrc_kirigami.cpp>
+//#include <qrc_kirigami.cpp>
#endif
QUrl KirigamiPlugin::componentUrl(const QString &fileName) const
Reference in a new issue Copy permalink