Skip to content

Commit

Permalink
Change switch label color if disabled.
Browse files Browse the repository at this point in the history
  • Loading branch information
marxoft committed Jan 29, 2017
1 parent 5e5112b commit 9103c5d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
3 changes: 1 addition & 2 deletions app/src/symbian/qml/MyButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ Button {
radius: 5
border {
width: 1
color: root.platformInverted ? platformStyle.colorDisabledLightInverted
: platformStyle.colorDisabledMid
color: platformStyle.colorDisabledMid
}
}
}
6 changes: 1 addition & 5 deletions app/src/symbian/qml/MySwitch.qml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Item {
property alias text: title.text
property alias checked: switcher.checked
property alias pressed: switcher.pressed
property bool platformInverted: false

width: parent.width
height: Math.max(title.height, switcher.height)
Expand All @@ -40,8 +39,7 @@ Item {
radius: 5
border {
width: 1
color: root.platformInverted ? platformStyle.colorDisabledLightInverted
: platformStyle.colorDisabledMid
color: platformStyle.colorDisabledMid
}
}

Expand All @@ -54,8 +52,6 @@ Item {
rightMargin: platformStyle.paddingSmall
verticalCenter: parent.verticalCenter
}

platformInverted: root.platformInverted
verticalAlignment: Text.AlignVCenter
maximumLineCount: 2
elide: Text.ElideRight
Expand Down

0 comments on commit 9103c5d

Please sign in to comment.