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

mobile/UI: initialize Kirigami theme to use our colors

Browse source 
With this we should finally get the correct button colors even when
switching color theme.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-12-22 15:02:39 -08:00
parent 4dc1b4ef4a
commit d9661a7be8
4 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mobile-widgets/qml/DiveDetails.qml
View file

@ -58,7 +58,12 @@ Kirigami.Page {
bottomPadding: 0 bottomPadding: 0
background: Rectangle { color: subsurfaceTheme.backgroundColor } background: Rectangle { color: subsurfaceTheme.backgroundColor }
width: rootItem.colWidth width: rootItem.colWidth
// we want to use our own colors for Kirigami, so let's define our colorset
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.backgroundColor: subsurfaceTheme.backgroundColor Kirigami.Theme.backgroundColor: subsurfaceTheme.backgroundColor
Kirigami.Theme.textColor: subsurfaceTheme.textColor
property QtObject removeDiveFromTripAction: Kirigami.Action { property QtObject removeDiveFromTripAction: Kirigami.Action {
text: qsTr ("Remove this dive from trip") text: qsTr ("Remove this dive from trip")

7
mobile-widgets/qml/DiveList.qml
View file

@ -14,7 +14,12 @@ Kirigami.ScrollablePage {
verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
property int dlHorizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1 property int dlHorizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1
property QtObject diveListModel: null property QtObject diveListModel: null
Kirigami.Theme.backgroundColor: subsurfaceTheme.backgroundColor // used for background of left and right action button // we want to use our own colors for Kirigami, so let's define our colorset
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.backgroundColor: subsurfaceTheme.backgroundColor
Kirigami.Theme.textColor: subsurfaceTheme.textColor
supportsRefreshing: true supportsRefreshing: true
onRefreshingChanged: { onRefreshingChanged: {
if (refreshing) { if (refreshing) {

7
mobile-widgets/qml/TripDetails.qml
View file

@ -16,6 +16,13 @@ Kirigami.Page {
state: "view" state: "view"
padding: Kirigami.Units.largeSpacing padding: Kirigami.Units.largeSpacing
background: Rectangle { color: subsurfaceTheme.backgroundColor } background: Rectangle { color: subsurfaceTheme.backgroundColor }
// we want to use our own colors for Kirigami, so let's define our colorset
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.backgroundColor: subsurfaceTheme.backgroundColor
Kirigami.Theme.textColor: subsurfaceTheme.textColor
actions.main: saveAction actions.main: saveAction
actions.right: cancelAction actions.right: cancelAction
onVisibleChanged: { onVisibleChanged: {

7
mobile-widgets/qml/main.qml
View file

@ -22,6 +22,13 @@ Kirigami.ApplicationWindow {
font: Qt.application.font font: Qt.application.font
background: Rectangle { color: subsurfaceTheme.backgroundColor } background: Rectangle { color: subsurfaceTheme.backgroundColor }
// we want to use our own colors for Kirigami, so let's define our colorset
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.backgroundColor: subsurfaceTheme.backgroundColor
Kirigami.Theme.textColor: subsurfaceTheme.textColor
// next setup the tab bar on top
pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.Breadcrumb pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.Breadcrumb
pageStack.globalToolBar.showNavigationButtons: (Kirigami.ApplicationHeaderStyle.ShowBackButton | Kirigami.ApplicationHeaderStyle.ShowForwardButton) pageStack.globalToolBar.showNavigationButtons: (Kirigami.ApplicationHeaderStyle.ShowBackButton | Kirigami.ApplicationHeaderStyle.ShowForwardButton)
pageStack.globalToolBar.minimumHeight: 0 pageStack.globalToolBar.minimumHeight: 0