summaryrefslogtreecommitdiffstats
path: root/mobile-widgets
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-05-18 07:22:10 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-05-18 13:00:03 -0700
commit58d97c571da851e3a2f4118b882d664b55fa66a4 (patch)
treeb3c304e090dcfffcc9cade2853c812392430b3c7 /mobile-widgets
parent4798382e708bd57e0d3a664e59c374c153c6d72e (diff)
downloadsubsurface-58d97c571da851e3a2f4118b882d664b55fa66a4.tar.gz
mobile/UI: correctly theme template spin box
This was all hard coded and wrong. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets')
-rw-r--r--mobile-widgets/qml/TemplateSpinBox.qml33
1 files changed, 16 insertions, 17 deletions
diff --git a/mobile-widgets/qml/TemplateSpinBox.qml b/mobile-widgets/qml/TemplateSpinBox.qml
index 69e39bea3..51f26aa66 100644
--- a/mobile-widgets/qml/TemplateSpinBox.qml
+++ b/mobile-widgets/qml/TemplateSpinBox.qml
@@ -2,6 +2,8 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
+import org.subsurfacedivelog.mobile 1.0
+import org.kde.kirigami 2.4 as Kirigami
SpinBox {
id: control
@@ -11,9 +13,8 @@ SpinBox {
contentItem: TextInput {
z: 2
text: control.textFromValue(control.value, control.locale)
-
font: control.font
- color: control.enabled ? "black" : "lightgrey"
+ color: control.enabled ? subsurfaceTheme.textColor : subsurfaceTheme.disabledTextColor
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
@@ -24,16 +25,15 @@ SpinBox {
up.indicator: Rectangle {
x: control.mirrored ? 0 : parent.width - width
- height: control.height
- implicitWidth: 30
- implicitHeight: 30
- color: control.enabled ? "grey" : "lightgrey"
- border.color: control.enabled ? "grey" : "lightgrey"
-
+ height: Kirigami.Units.gridUnit * 2
+ implicitWidth: Kirigami.Units.gridUnit * 1.5
+ implicitHeight: Kirigami.Units.gridUnit * 1.5
+ color: control.enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor
+ border.color: control.enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor
Text {
text: "+"
font.pixelSize: control.font.pixelSize * 2
- color: control.enabled ? "black" : "lightgrey"
+ color: control.enabled ? subsurfaceTheme.textColor : subsurfaceTheme.disabledTextColor
anchors.fill: parent
fontSizeMode: Text.Fit
horizontalAlignment: Text.AlignHCenter
@@ -43,16 +43,15 @@ SpinBox {
down.indicator: Rectangle {
x: control.mirrored ? parent.width - width : 0
- height: control.height
- implicitWidth: 30
- implicitHeight: 30
- color: control.enabled ? "grey" : "lightgrey"
- border.color: control.enabled ? "grey" : "lightgrey"
-
+ height: Kirigami.Units.gridUnit * 2
+ implicitWidth: Kirigami.Units.gridUnit * 1.5
+ implicitHeight: Kirigami.Units.gridUnit * 1.5
+ color: control.enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor
+ border.color: control.enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor
Text {
text: "-"
font.pixelSize: control.font.pixelSize * 2
- color: control.enabled ? "black" : "lightgrey"
+ color: control.enabled ? subsurfaceTheme.textColor : subsurfaceTheme.disabledTextColor
anchors.fill: parent
fontSizeMode: Text.Fit
horizontalAlignment: Text.AlignHCenter
@@ -61,7 +60,7 @@ SpinBox {
}
background: Rectangle {
- implicitWidth: 140
+ implicitWidth: 5* Kirigami.Units.gridUnit
color: subsurfaceTheme.backgroundColor
border.color: subsurfaceTheme.backgroundColor
}