Merge lp:~zsombi/ubuntu-ui-toolkit/focusedValueSet into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri
Status: Merged
Merged at revision: 1878
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/focusedValueSet
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 97 lines (+17/-7)
7 files modified
components.api (+1/-0)
examples/ubuntu-ui-toolkit-gallery/Colors.qml (+1/-1)
src/Ubuntu/Components/Themes/1.3/Palette.qml (+5/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml (+1/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+4/-0)
src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+4/-0)
src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml (+1/-3)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/focusedValueSet
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+287499@code.launchpad.net

Commit message

Introducing focused valueset.
-= IN PROGRESS =-

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2016-02-24 13:18:49 +0000
3+++ components.api 2016-02-29 17:24:05 +0000
4@@ -862,6 +862,7 @@
5 property PaletteValues selected
6 Ubuntu.Components.Themes.Palette 1.3: QtObject
7 property PaletteValues disabled
8+ property PaletteValues focused
9 property PaletteValues highlighted
10 property PaletteValues normal
11 property PaletteValues selected
12
13=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
14--- examples/ubuntu-ui-toolkit-gallery/Colors.qml 2016-02-25 15:03:52 +0000
15+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml 2016-02-29 17:24:05 +0000
16@@ -29,7 +29,7 @@
17 className: "Palette"
18 documentation: "qml-palette.html"
19
20- property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted"]
21+ property var palettes: ["normal", "disabled", "selected", "selectedDisabled", "highlighted", "focused"]
22 property var paletteValues: [["background", ["backgroundText", "backgroundSecondaryText", "backgroundTertiaryText"]],
23 ["base", ["baseText"]],
24 ["foreground", ["foregroundText"]],
25
26=== modified file 'src/Ubuntu/Components/Themes/1.3/Palette.qml'
27--- src/Ubuntu/Components/Themes/1.3/Palette.qml 2016-01-27 15:17:56 +0000
28+++ src/Ubuntu/Components/Themes/1.3/Palette.qml 2016-02-29 17:24:05 +0000
29@@ -66,6 +66,11 @@
30 property PaletteValues selected: PaletteValues{}
31
32 /*!
33+ Color palette to use when the widget is in focused state.
34+ */
35+ property PaletteValues focused: PaletteValues{}
36+
37+ /*!
38 Color palette to use when the widget is selected and disabled.
39 \since Ubuntu.Components.Themes 1.3
40 */
41
42=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml'
43--- src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml 2016-01-25 14:26:32 +0000
44+++ src/Ubuntu/Components/Themes/Ambiance/1.3/AmbianceSelected.qml 2016-02-29 17:24:05 +0000
45@@ -19,9 +19,7 @@
46
47 AmbianceNormal {
48 background: UbuntuColors.porcelain
49- backgroundText: UbuntuColors.blue
50- backgroundTertiaryText: UbuntuColors.blue
51 base: UbuntuColors.ash
52- baseText: UbuntuColors.blue
53 foreground: UbuntuColors.ash
54+ overlay: UbuntuColors.porcelain
55 }
56
57=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
58--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml 2016-01-27 15:17:56 +0000
59+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml 2016-02-29 17:24:05 +0000
60@@ -56,4 +56,8 @@
61 base: UbuntuColors.jet
62 foreground: UbuntuColors.silk
63 }
64+
65+ focused: AmbianceNormal {
66+ background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
67+ }
68 }
69
70=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
71--- src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml 2016-01-27 15:17:56 +0000
72+++ src/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml 2016-02-29 17:24:05 +0000
73@@ -58,5 +58,9 @@
74 base: UbuntuColors.graphite
75 foreground: UbuntuColors.slate
76 }
77+
78+ focused: SuruDarkNormal {
79+ background: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.4)
80+ }
81 }
82 //![0]
83
84=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml'
85--- src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml 2016-01-25 14:26:32 +0000
86+++ src/Ubuntu/Components/Themes/SuruDark/1.3/SuruDarkSelected.qml 2016-02-29 17:24:05 +0000
87@@ -20,10 +20,8 @@
88
89 SuruDarkNormal {
90 background: UbuntuColors.inkstone
91- backgroundText: UbuntuColors.blue
92- backgroundTertiaryText: UbuntuColors.blue
93 base: UbuntuColors.ash
94- baseText:UbuntuColors.blue
95 foreground: UbuntuColors.slate
96+ overlay: UbuntuColors.slate
97 }
98

Subscribers

People subscribed via source and target branches