4f9155e · unity8 · git.iko.soy

git.iko.soy/unity8

Adjust the color to highlighting indicator. Fixes: #1457098

Approved by: Nick Dedekind

commit4f9155e67ec543f96da5f510033a48a9d51e5a51 authorhandsome_feng <445865575@qq.com> dateWed 12 Aug 2015, 08:41 (11 years ago) parent24479ac 2bac7f3

4 files changed+17−17

compare with xenial

unifiedsplit

qml/Panel/IndicatorItem.qml+3−3 qml/Panel/IndicatorItemRow.qml+1−1 qml/Panel/IndicatorsBar.qml+1−1 tests/qmltests/Panel/tst_IndicatorItem.qml+12−12

qml/Panel/IndicatorItem.qml+3−3

@@ -31,9 +31,9 @@ IndicatorDelegate {

3131 property bool selected: false

3232 property real iconHeight: units.gu(2)

3333 readonly property color color: {

34− if (!expanded) return "#ededed";

35− if (!selected) return "#4c4c4c";

36− return "#ededed";

34+ if (!expanded) return "#ffffff";

35+ if (!selected) return "#888888";

36+ return "#ffffff";

3737 }

3838

3939 signal clicked()

qml/Panel/IndicatorItemRow.qml+1−1

@@ -31,7 +31,7 @@ Item {

3131 property real unitProgress: 0.0

3232 property real selectionChangeBuffer: units.gu(2)

3333 property bool enableLateralChanges: false

34− property color hightlightColor: "#ededed"

34+ property color hightlightColor: "#ffffff"

3535

3636 property real lateralPosition: -1

3737 onLateralPositionChanged: {

qml/Panel/IndicatorsBar.qml+1−1

@@ -123,7 +123,7 @@ Item {

123123 width: parent.width

124124 anchors.bottom: parent.bottom

125125

126− color: "#4c4c4c"

126+ color: "#888888"

127127 opacity: expanded ? 1.0 : 0.0

128128 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }

129129 }

tests/qmltests/Panel/tst_IndicatorItem.qml+12−12

@@ -181,25 +181,25 @@ Rectangle {

181181 }

182182

183183 function test_select() {

184− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ededed");

184+ tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");

185185 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

186− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ededed");

187− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ededed");

188− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ededed");

186+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");

187+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");

188+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");

189189

190190 indicatorItem.expanded = true;

191− tryCompare(findChild(indicatorItem, "icon0"), "color", "#4c4c4c");

191+ tryCompare(findChild(indicatorItem, "icon0"), "color", "#888888");

192192 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);

193− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#4c4c4c");

194− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#4c4c4c");

195− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#4c4c4c");

193+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#888888");

194+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#888888");

195+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#888888");

196196

197197 indicatorItem.selected = true;

198− tryCompare(findChild(indicatorItem, "icon0"), "color", "#ededed");

198+ tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");

199199 tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);

200− tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ededed");

201− tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ededed");

202− tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ededed");

200+ tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");

201+ tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");

202+ tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");

203203 }

204204 }

205205}