summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/elementary/themes/colorclasses.edc5
-rw-r--r--data/elementary/themes/edc/elm/segment_control.edc67
2 files changed, 27 insertions, 45 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 2bb1eff68a..c2af19b86b 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -80,6 +80,11 @@ color_classes {
80 color_class { name: "/bg/normal/tiling/position/outline"; 80 color_class { name: "/bg/normal/tiling/position/outline";
81 color: 51 153 255 255; } 81 color: 51 153 255 255; }
82/////////////////////////////////////////////////////////////////////////////// 82///////////////////////////////////////////////////////////////////////////////
83 color_class { name: "/bg/normal/segmentcontrol/item";
84 color: 96 96 96 255; }
85 color_class { name: "/bg/pressed/segmentcontrol/item";
86 color: 32 32 32 255; }
87///////////////////////////////////////////////////////////////////////////////
83 color_class { name: "/fg/normal/init/logo"; 88 color_class { name: "/fg/normal/init/logo";
84 color: 255 255 255 255; } 89 color: 255 255 255 255; }
85 color_class { name: "/fg/normal/init/text/version"; 90 color_class { name: "/fg/normal/init/text/version";
diff --git a/data/elementary/themes/edc/elm/segment_control.edc b/data/elementary/themes/edc/elm/segment_control.edc
index 2020286b20..b8983c246b 100644
--- a/data/elementary/themes/edc/elm/segment_control.edc
+++ b/data/elementary/themes/edc/elm/segment_control.edc
@@ -13,8 +13,8 @@ group { name: "elm/segment_control/base/default";
13 part { name: "bg"; type: RECT; mouse_events: 0; 13 part { name: "bg"; type: RECT; mouse_events: 0;
14 scale: 1; 14 scale: 1;
15 description { state: "default" 0.0; 15 description { state: "default" 0.0;
16 color: 0 0 0 0; 16 color: 0 0 0 0; // no cc
17 min: 160 31; 17 min: 160 24;
18 } 18 }
19 } 19 }
20 } 20 }
@@ -29,81 +29,60 @@ group { name: "elm/segment_control/item/default";
29 } 29 }
30 description { state: "default_single" 0.0; 30 description { state: "default_single" 0.0;
31 inherit: "default" 0.0; 31 inherit: "default" 0.0;
32 color: 80 80 80 255; 32 color_class: "/bg/normal/segmentcontrol/item";
33 visible: 1; 33 visible: 1;
34 } 34 }
35 description { state: "default_left" 0.0; 35 description { state: "default_left" 0.0;
36 inherit: "default" 0.0; 36 inherit: "default_single" 0.0;
37 color: 80 80 80 255;
38 visible: 1; 37 visible: 1;
39 rel2.offset: -2 -1;
40 } 38 }
41 description { state: "default_right" 0.0; 39 description { state: "default_right" 0.0;
42 inherit: "default" 0.0; 40 inherit: "default_single" 0.0;
43 color: 80 80 80 255;
44 visible: 1; 41 visible: 1;
45 rel1.offset: 1 0;
46 } 42 }
47 description { state: "default_middle" 0.0; 43 description { state: "default_middle" 0.0;
48 inherit: "default" 0.0; 44 inherit: "default_single" 0.0;
49 color: 80 80 80 255;
50 visible: 1; 45 visible: 1;
51 rel1.offset: 1 0;
52 rel2.offset: -2 -1;
53 } 46 }
54 description { state: "pressed_single" 0.0; 47 description { state: "pressed_single" 0.0;
55 inherit: "default" 0.0; 48 inherit: "default" 0.0;
56 color: 40 40 40 255; 49 color_class: "/bg/pressed/segmentcontrol/item";
57 visible: 1; 50 visible: 1;
58 } 51 }
59 description { state: "pressed_left" 0.0; 52 description { state: "pressed_left" 0.0;
60 inherit: "default" 0.0; 53 inherit: "pressed_single" 0.0;
61 color: 40 40 40 255;
62 visible: 1; 54 visible: 1;
63 rel2.offset: -2 -1;
64 } 55 }
65 description { state: "pressed_right" 0.0; 56 description { state: "pressed_right" 0.0;
66 inherit: "default" 0.0; 57 inherit: "pressed_single" 0.0;
67 color: 40 40 40 255;
68 visible: 1; 58 visible: 1;
69 rel1.offset: 1 0;
70 } 59 }
71 description { state: "pressed_middle" 0.0; 60 description { state: "pressed_middle" 0.0;
72 inherit: "default" 0.0; 61 inherit: "pressed_single" 0.0;
73 color: 40 40 40 255;
74 visible: 1; 62 visible: 1;
75 rel1.offset: 1 0;
76 rel2.offset: -2 -1;
77 } 63 }
78 description { state: "selected_single" 0.0; 64 description { state: "selected_single" 0.0;
79 inherit: "default" 0.0; 65 inherit: "default" 0.0;
80 color: 51 153 255 255; 66 color_class: "/bg/selected/segmentcontrol/item";
81 visible: 1; 67 visible: 1;
82 } 68 }
83 description { state: "selected_left" 0.0; 69 description { state: "selected_left" 0.0;
84 inherit: "default" 0.0; 70 inherit: "selected_single" 0.0;
85 color: 51 153 255 255;
86 visible: 1; 71 visible: 1;
87 rel2.offset: -2 -1;
88 } 72 }
89 description { state: "selected_right" 0.0; 73 description { state: "selected_right" 0.0;
90 inherit: "default" 0.0; 74 inherit: "selected_single" 0.0;
91 color: 51 153 255 255;
92 visible: 1; 75 visible: 1;
93 rel1.offset: 1 0;
94 } 76 }
95 description { state: "selected_middle" 0.0; 77 description { state: "selected_middle" 0.0;
96 inherit: "default" 0.0; 78 inherit: "selected_single" 0.0;
97 color: 51 153 255 255;
98 visible: 1; 79 visible: 1;
99 rel1.offset: 1 0;
100 rel2.offset: -2 -1;
101 } 80 }
102 } 81 }
103 part { name: "disabler"; type: RECT; 82 part { name: "disabler"; type: RECT;
104 description { state: "default" 0.0; 83 description { state: "default" 0.0;
105 rel.to: "segment"; 84 rel.to: "segment";
106 color: 64 64 64 255; 85 color_class: "/bg/disabled/segmentcontrol/item";
107 visible: 0; 86 visible: 0;
108 } 87 }
109 description { state: "disabled" 0.0; 88 description { state: "disabled" 0.0;
@@ -114,11 +93,11 @@ group { name: "elm/segment_control/item/default";
114 part { name: "icon_disabler"; type: RECT; 93 part { name: "icon_disabler"; type: RECT;
115 description { state: "default" 0.0; 94 description { state: "default" 0.0;
116 rel.to: "segment"; 95 rel.to: "segment";
117 color: 255 255 255 255; 96 color: 255 255 255 255; // no cc
118 } 97 }
119 description { state: "disabled" 0.0; 98 description { state: "disabled" 0.0;
120 inherit: "default" 0.0; 99 inherit: "default" 0.0;
121 color: 255 255 255 64; 100 color: 255 255 255 64; // no cc
122 } 101 }
123 } 102 }
124 part { name: "elm.swallow.icon"; type: SWALLOW; 103 part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -159,25 +138,23 @@ group { name: "elm/segment_control/item/default";
159 rel1.relative: 1.0 0.0; 138 rel1.relative: 1.0 0.0;
160 rel1.offset: 4 4; 139 rel1.offset: 4 4;
161 rel2.offset: -5 -5; 140 rel2.offset: -5 -5;
162 color: 160 160 160 255; 141 color_class: "/fg/normal/segmentcontrol/item";
163 text { 142 text { font: FN; size: 10;
164 font: FN;
165 size: 10;
166 min: 0 1; 143 min: 0 1;
167 text_class: "button"; 144 text_class: "button";
168 } 145 }
169 } 146 }
170 description { state: "pressed" 0.0; 147 description { state: "pressed" 0.0;
171 inherit: "default" 0.0; 148 inherit: "default" 0.0;
172 color: 255 255 255 255; 149 color_class: "/fg/pressed/segmentcontrol/item";
173 } 150 }
174 description { state: "selected" 0.0; 151 description { state: "selected" 0.0;
175 inherit: "default" 0.0; 152 inherit: "default" 0.0;
176 color: 255 255 255 255; 153 color_class: "/fg/selected/segmentcontrol/item";
177 } 154 }
178 description { state: "disabled" 0.0; 155 description { state: "disabled" 0.0;
179 inherit: "default" 0.0; 156 inherit: "default" 0.0;
180 color: 96 96 96 255; 157 color_class: "/fg/disabled/segmentcontrol/item";
181 } 158 }
182 } 159 }
183 } 160 }