26a7cf1698
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>
54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
diff -rwu ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml
|
|
--- ../kirigami/src/controls/GlobalDrawer.qml 2019-10-05 11:32:27.131891061 -0500
|
|
+++ src/controls/GlobalDrawer.qml 2019-10-06 13:14:34.830804840 -0500
|
|
@@ -331,17 +331,13 @@
|
|
ColumnLayout {
|
|
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
|
|
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 {
|
|
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
|
|
}
|
|
|
|
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
|