mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
mobile/settings: make the color swatches work as color swatches
In a color swatch the color of the body of the swatch is the one that matters. And we need to ensure readability. So for each pair of colors, use the combination in the regular order (color/textcolor) for the background swatch, and inverted for the text swatch. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
0f33aee1af
commit
2a0ba04d33
1 changed files with 17 additions and 19 deletions
|
@ -166,14 +166,14 @@ TemplatePage {
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("background")
|
text: qsTr("background")
|
||||||
color: "black"
|
color: subsurfaceTheme.textColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Rectangle {
|
Rectangle {
|
||||||
color: "white"
|
color: subsurfaceTheme.backgroundColor
|
||||||
width: rootItem.width / 2 - 60
|
width: rootItem.width / 2 - 60
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ TemplatePage {
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("primary")
|
text: qsTr("primary")
|
||||||
color: "black"
|
color: subsurfaceTheme.primaryTextColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -205,13 +205,13 @@ TemplatePage {
|
||||||
Rectangle {
|
Rectangle {
|
||||||
border.width: 2
|
border.width: 2
|
||||||
border.color: "black"
|
border.color: "black"
|
||||||
color: "white"
|
color: subsurfaceTheme.primaryTextColor
|
||||||
width: rootItem.width / 2 - 60
|
width: rootItem.width / 2 - 60
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("text")
|
text: qsTr("primary text")
|
||||||
color: subsurfaceTheme.primaryTextColor
|
color: subsurfaceTheme.primaryColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -222,13 +222,12 @@ TemplatePage {
|
||||||
border.width: 2
|
border.width: 2
|
||||||
border.color: "black"
|
border.color: "black"
|
||||||
color: subsurfaceTheme.darkerPrimaryColor
|
color: subsurfaceTheme.darkerPrimaryColor
|
||||||
|
|
||||||
width: rootItem.width / 2 - 20
|
width: rootItem.width / 2 - 20
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("darker primary")
|
text: qsTr("darker primary")
|
||||||
color: "black"
|
color: subsurfaceTheme.darkerPrimaryTextColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -237,13 +236,13 @@ TemplatePage {
|
||||||
Rectangle {
|
Rectangle {
|
||||||
border.width: 2
|
border.width: 2
|
||||||
border.color: "black"
|
border.color: "black"
|
||||||
color: "white"
|
color: subsurfaceTheme.darkerPrimaryTextColor
|
||||||
width: rootItem.width / 2 - 60
|
width: rootItem.width / 2 - 60
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("text")
|
text: qsTr("darker primary text")
|
||||||
color: subsurfaceTheme.darkerPrimaryTextColor
|
color: subsurfaceTheme.darkerPrimaryColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -254,13 +253,12 @@ TemplatePage {
|
||||||
border.width: 2
|
border.width: 2
|
||||||
border.color: "black"
|
border.color: "black"
|
||||||
color: subsurfaceTheme.lightPrimaryColor
|
color: subsurfaceTheme.lightPrimaryColor
|
||||||
|
|
||||||
width: rootItem.width / 2 - 20
|
width: rootItem.width / 2 - 20
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("light primary")
|
text: qsTr("light primary")
|
||||||
color: "black"
|
color: subsurfaceTheme.lightPrimaryTextColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -269,13 +267,13 @@ TemplatePage {
|
||||||
Rectangle {
|
Rectangle {
|
||||||
border.width: 2
|
border.width: 2
|
||||||
border.color: "black"
|
border.color: "black"
|
||||||
color: "white"
|
color: subsurfaceTheme.lightPrimaryTextColor
|
||||||
width: rootItem.width / 2 - 60
|
width: rootItem.width / 2 - 60
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("text")
|
text: qsTr("light primary text")
|
||||||
color: subsurfaceTheme.lightPrimaryTextColor
|
color: subsurfaceTheme.lightPrimaryColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -289,13 +287,13 @@ TemplatePage {
|
||||||
Rectangle {
|
Rectangle {
|
||||||
border.width: 2
|
border.width: 2
|
||||||
border.color: "black"
|
border.color: "black"
|
||||||
color: "white"
|
color: subsurfaceTheme.secondaryTextColor
|
||||||
width: rootItem.width / 2 - 60
|
width: rootItem.width / 2 - 60
|
||||||
height: subsurfaceTheme.regularPointSize + 10
|
height: subsurfaceTheme.regularPointSize + 10
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("secondary text")
|
text: qsTr("secondary text")
|
||||||
color: subsurfaceTheme.secondaryTextColor
|
color: subsurfaceTheme.primaryColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
@ -312,7 +310,7 @@ TemplatePage {
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("drawer")
|
text: qsTr("drawer")
|
||||||
color: "black"
|
color: subsurfaceTheme.textColor
|
||||||
colorBackground: parent.color
|
colorBackground: parent.color
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue