summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-28 23:32:39 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-28 23:32:39 +0000
commit60adecf11dcef7ce6d85473a888e968b288c52bd (patch)
treecd45a95b2f7a12119e3c737aa4c64062aef65f55 /data
parent8852214816433700c969a45f1bdfe75e7b75294e (diff)
TH - grid + group header
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/comp.edc1
-rw-r--r--data/elementary/themes/edc/comp_compat.edc11
-rw-r--r--data/elementary/themes/edc/efl/grid.edc340
-rw-r--r--data/elementary/themes/edc/efl/group_item.edc100
4 files changed, 149 insertions, 303 deletions
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index f325b9621f..f7e3e0be99 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -254,6 +254,7 @@ group { name: "e/comp/frame/default";
254 description { state: "focused" 0.0; 254 description { state: "focused" 0.0;
255 inherit; 255 inherit;
256 color_class: "comp_focus_color"; 256 color_class: "comp_focus_color";
257 color: 255 255 255 255;
257 } 258 }
258 } 259 }
259 part { name: "e.swallow.content"; type: SWALLOW; 260 part { name: "e.swallow.content"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index 3cf0364730..ffc9990b37 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -45,8 +45,7 @@ group { name: "e/comp/border/default";
45 mouse_events: 0; 45 mouse_events: 0;
46 description { state: "default" 0.0; 46 description { state: "default" 0.0;
47 color_class: "comp_alpha"; 47 color_class: "comp_alpha";
48 rel1.to: "clipper"; 48 rel.to: "clipper";
49 rel2.to: "clipper";
50 } 49 }
51 } 50 }
52 part { name: "focus-clipper"; 51 part { name: "focus-clipper";
@@ -55,20 +54,18 @@ group { name: "e/comp/border/default";
55 mouse_events: 0; 54 mouse_events: 0;
56 description { state: "default" 0.0; 55 description { state: "default" 0.0;
57 color_class: "comp_focus-out_color"; 56 color_class: "comp_focus-out_color";
58 rel1.to: "clipper"; 57 rel.to: "clipper";
59 rel2.to: "clipper";
60 } 58 }
61 description { state: "focused" 0.0; 59 description { state: "focused" 0.0;
62 inherit: "default" 0.0; 60 inherit: "default" 0.0;
63 color_class: ""; 61 color_class: "comp_focus_color";
64 color: 255 255 255 255; 62 color: 255 255 255 255;
65 } 63 }
66 } 64 }
67 part { name: "e.swallow.content"; type: SWALLOW; 65 part { name: "e.swallow.content"; type: SWALLOW;
68 clip_to: "focus-clipper"; 66 clip_to: "focus-clipper";
69 description { state: "default" 0.0; 67 description { state: "default" 0.0;
70 rel1.to: "shower"; 68 rel.to: "shower";
71 rel2.to: "shower";
72 } 69 }
73 } 70 }
74 } 71 }
diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc
index d312ee71db..5879f543ef 100644
--- a/data/elementary/themes/edc/efl/grid.edc
+++ b/data/elementary/themes/edc/efl/grid.edc
@@ -41,265 +41,163 @@ group { "efl/view_grid";
41 data.item: "version" "123"; 41 data.item: "version" "123";
42} 42}
43 43
44group { "efl/grid_item"; data.item: "version" "124"; 44group { "efl/grid_item";
45 data.item: "version" "124";
45 data.item: "selectraise" "on"; 46 data.item: "selectraise" "on";
46 data.item: "focusraise" "on"; 47 data.item: "focusraise" "on";
47 images.image: "bevel_dark_out.png" COMP; 48 data.item: "texts" "elm.text";
48 images.image: "shadow_rounded_horiz.png" COMP;
49 images.image: "vgrad_med_dark.png" COMP;
50 images.image: "bevel_out.png" COMP;
51 images.image: "shine.png" COMP;
52 parts { 49 parts {
50//---------------------------------------------------------------------------
51#define BASEP() \
52 part { name: "base"; type: RECT; mouse_events: 0; \
53 description { state: "default" 0.0; \
54 color: 64 64 64 255; \
55 } \
56 } \
57 part { name: "sel_base"; type: RECT; mouse_events: 0; \
58 description { state: "default" 0.0; \
59 color: 51 153 255 255; \
60 visible: 0; \
61 } \
62 description { state: "selected" 0.0; \
63 inherit: "default" 0.0; \
64 visible: 1; \
65 } \
66 } \
67 program { signal: "efl,state,selected"; source: "efl"; \
68 action: STATE_SET "selected" 0.0; \
69 target: "sel_base"; \
70 } \
71 program { signal: "efl,state,unselected"; source: "efl"; \
72 action: STATE_SET "default" 0.0; \
73 target: "sel_base"; \
74 } \
75 program { signal: "efl,state,disabled"; source: "efl"; \
76 action: STATE_SET "disabled" 0.0; \
77 target: "event"; \
78 } \
79 program { signal: "efl,state,enabled"; source: "efl"; \
80 action: STATE_SET "default" 0.0; \
81 target: "event"; \
82 }
83#define TOPP() \
84 part { name: "event"; type: RECT; \
85 repeat_events: 1; \
86 description { state: "default" 0.0; \
87 color: 0 0 0 0; \
88 } \
89 description { state: "disabled" 0.0; \
90 inherit: "default" 0.0; \
91 visible: 0; \
92 } \
93 } \
94 part { name: "event_block"; type: RECT; \
95 description { state: "default" 0.0; \
96 color: 0 0 0 0; \
97 visible: 0; \
98 } \
99 description { state: "disabled" 0.0; \
100 inherit: "default" 0.0; \
101 visible: 1; \
102 } \
103 } \
104 program { signal: "efl,state,disabled"; source: "efl"; \
105 action: STATE_SET "disabled" 0.0; \
106 target: "event_block"; \
107 } \
108 program { signal: "efl,state,enabled"; source: "efl"; \
109 action: STATE_SET "default" 0.0; \
110 target: "event_block"; \
111 }
112//---------------------------------------------------------------------------
113 BASEP()
53 114
54 // BASE PARTS // 115 //##//
55 rect { "base"; mouse; 116 part { name: "efl.text"; type: TEXT; mouse_events: 0;
56 desc { "default";
57 }
58 }
59 image { "bevel"; nomouse;
60 desc { "default";
61 image.normal: "bevel_dark_out.png";
62 image.border: 2 2 2 2;
63 image.middle: 0;
64 fill.smooth: 0;
65 }
66 }
67 image { "sel_shadow"; nomouse;
68 desc { "default";
69 image.normal: "shadow_rounded_horiz.png";
70 image.border: 0 0 9 9;
71 rel1.offset: 0 -4;
72 rel2.offset: -1 5;
73 fill.smooth: 0;
74 hid;
75 }
76 desc { "selected";
77 inherit: "default";
78 vis;
79 }
80 }
81 image { "sel_base"; nomouse;
82 desc { "default";
83 image.normal: "vgrad_med_dark.png";
84 fill.smooth: 0;
85 hid;
86 TILED_HORIZ(120)
87 }
88 desc { "selected";
89 inherit: "default";
90 vis;
91 }
92 }
93 image { "sel_bevel"; nomouse;
94 desc { "default";
95 image.normal: "bevel_out.png";
96 image.border: 2 2 2 2;
97 image.middle: 0;
98 fill.smooth: 0;
99 hid;
100 }
101 desc { "selected";
102 inherit: "default";
103 vis;
104 }
105 }
106 // BASE PARTS //
107
108 // TEXT PARTS //
109 text { "efl.text"; nomouse;
110 effect: SHADOW BOTTOM;
111 scale: 1; 117 scale: 1;
112 desc { "default"; 118 description { state: "default" 0.0;
113 fixed: 0 1; 119 fixed: 0 1;
114 rel1.relative: 0.0 1.0; 120 rel1.relative: 0.0 1.0;
115 rel1.offset: 5 -5; 121 rel1.offset: 4 -5;
116 rel2.relative: 1.0 1.0;
117 rel2.offset: -5 -5; 122 rel2.offset: -5 -5;
118 color: FN_COL_DEFAULT; 123 color: 160 160 160 255;
119 color_class: "grid_item";
120 align: 0.5 1.0; 124 align: 0.5 1.0;
125 offscale;
121 text { font: FN; size: 10; 126 text { font: FN; size: 10;
122 min: 0 1; 127 min: 0 1;
123 align: 0.5 1.0; 128 align: 0.5 1.0;
124 text_class: "grid_item"; 129 text_class: "grid_item";
125 } 130 }
126 } 131 }
127 desc { "selected"; 132 description { state: "selected" 0.0;
128 inherit: "default"; 133 inherit: "default" 0.0;
129 hid; 134 color: 255 255 255 255;
130 } 135 }
131 desc { "disabled"; 136 description { state: "disabled" 0.0;
132 inherit: "default"; 137 inherit: "default" 0.0;
133 hid; 138 color: 80 80 80 255;
134 } 139 }
135 } 140 }
136 text { "label2"; nomouse; 141 program { signal: "efl,state,selected"; source: "efl";
137 effect: SHADOW BOTTOM; 142 action: STATE_SET "selected" 0.0;
138 scale: 1; 143 target: "efl.text";
139 desc { "default";
140 rel1.to: "efl.text";
141 rel2.to: "efl.text";
142 color: FN_COL_DISABLE;
143 color_class: "grid_item_disabled";
144 text { font: FN; size: 10;
145 text_source: "efl.text";
146 align: 0.5 1.0;
147 text_class: "grid_item";
148 }
149 hid;
150 }
151 desc { "selected";
152 inherit: "default";
153 hid;
154 }
155 desc { "disabled";
156 inherit: "default";
157 vis;
158 }
159 } 144 }
160 text { "label3"; nomouse; 145 program { signal: "efl,state,unselected"; source: "efl";
161 effect: GLOW; 146 action: STATE_SET "default" 0.0;
162 scale: 1; 147 target: "efl.text";
163 desc { "default";
164 rel1.offset: -2 -2;
165 rel1.to: "efl.text";
166 rel2.offset: 1 0;
167 rel2.to: "efl.text";
168 color: FN_COL_HIGHLIGHT;
169 color_class: "grid_item_selected";
170 text { font: FN; size: 10;
171 text_source: "efl.text";
172 align: 0.5 1.0;
173 text_class: "grid_item";
174 }
175 hid;
176 }
177 desc { "selected";
178 inherit: "default";
179 vis;
180 }
181 desc { "disabled";
182 inherit: "default";
183 hid;
184 }
185 } 148 }
186 // TEXT PARTS // 149 program { signal: "efl,state,disabled"; source: "efl";
187 150 action: STATE_SET "disabled" 0.0;
188 // CONTENT PARTS // 151 target: "efl.text";
189 rect { "icon_area"; 152 target: "icon_area";
190 desc { "default"; 153 }
191 fixed: 1 0; 154 program { signal: "efl,state,enabled"; source: "efl";
192 rel1.offset: 2 2; 155 action: STATE_SET "default" 0.0;
156 target: "efl.text";
157 target: "icon_area";
158 }
159 //##//
160 part { name: "icon_area"; type: RECT;
161 scale: 1;
162 description { state: "default" 0.0;
163 rel1.offset: 4 4;
193 rel2.to_y: "efl.text"; 164 rel2.to_y: "efl.text";
194 rel2.relative: 1.0 0.0; 165 rel2.relative: 1.0 0.0;
195 rel2.offset: -3 -3; 166 rel2.offset: -5 -5;
167 offscale;
196 } 168 }
197 desc { "disabled"; 169 description { state: "disabled" 0.0;
198 inherit: "default"; 170 inherit: "default" 0.0;
199 color: 255 255 255 64; 171 color: 255 255 255 64;
200 } 172 }
201 } 173 }
202 rect { "event"; 174 part { name: "efl.icon"; type: SWALLOW;
203 desc { "default";
204 color: 0 0 0 0;
205 }
206 desc { "disabled";
207 inherit: "default";
208 hid;
209 }
210 }
211 swallow { "efl.icon";
212 clip_to: "icon_area"; 175 clip_to: "icon_area";
213 desc { "default"; 176 description { state: "default" 0.0;
214 rel1.to: "icon_area"; 177 rel.to: "icon_area";
215 rel2.to: "icon_area";
216 } 178 }
217 } 179 }
218 swallow { "efl.extra"; 180 part { name: "efl.extra"; type: SWALLOW;
181 scale: 1;
219 clip_to: "icon_area"; 182 clip_to: "icon_area";
220 desc { "default"; 183 description { state: "default" 0.0;
221 fixed: 1 1; 184 min: ICMIN ICMIN;
222 align: 1.0 0.0; 185 align: 1.0 0.0;
186 rel.to: "icon_area";
223 rel1.relative: 1.0 0.0; 187 rel1.relative: 1.0 0.0;
224 rel1.offset: -3 2; 188 rel1.offset: -5 4;
225 rel2.relative: 1.0 0.0; 189 rel2.relative: 1.0 0.0;
226 rel2.offset: -3 2; 190 rel2.offset: -5 4;
191 offscale;
227 } 192 }
228 } 193 }
229 // CONTENT PARTS // 194 //##//
230 195
231 // TOP PARTS // 196 TOPP()
232 image { "sel_shine"; nomouse;
233 desc { "default";
234 image.normal: "shine.png";
235 rel1.offset: 0 -2;
236 rel1.to: "sel_base";
237 rel2.relative: 1.0 0.0;
238 rel2.offset: -1 2;
239 rel2.to: "sel_base";
240 hid;
241 FIXED_SIZE(69, 5)
242 }
243 desc { "selected";
244 inherit: "default";
245 vis;
246 }
247 }
248 rect { "event_block";
249 desc { "default";
250 color: 0 0 0 0;
251 hid;
252 }
253 desc { "disabled";
254 inherit: "default";
255 vis;
256 }
257 }
258 // TOP PARTS //
259 } 197 }
260 programs { 198 programs {
261 EFL_UI_CLICKABLE_PART_BIND("event") 199 EFL_UI_CLICKABLE_PART_BIND("event")
262 program {
263 signal: "efl,state,selected"; source: "efl";
264 action: STATE_SET "selected";
265 target: "sel_shadow";
266 target: "sel_base";
267 target: "sel_bevel";
268 target: "sel_shine";
269 target: "efl.text";
270 target: "label2";
271 target: "label3";
272 }
273 program {
274 signal: "efl,state,unselected"; source: "efl";
275 action: STATE_SET "default";
276 target: "sel_shadow";
277 target: "sel_base";
278 target: "sel_bevel";
279 target: "sel_shine";
280 target: "efl.text";
281 target: "label2";
282 target: "label3";
283 }
284 program {
285 signal: "efl,state,disabled"; source: "efl";
286 action: STATE_SET "disabled";
287 target: "event";
288 target: "event_block";
289 target: "efl.text";
290 target: "label2";
291 target: "label3";
292 target: "icon_area";
293 }
294 program {
295 signal: "efl,state,enabled"; source: "efl";
296 action: STATE_SET "default";
297 target: "event";
298 target: "event_block";
299 target: "efl.text";
300 target: "label2";
301 target: "label3";
302 target: "icon_area";
303 }
304 } 200 }
305} 201}
202#undef BASEP
203#undef TOPP
diff --git a/data/elementary/themes/edc/efl/group_item.edc b/data/elementary/themes/edc/efl/group_item.edc
index 16d4c78b94..f19a720a83 100644
--- a/data/elementary/themes/edc/efl/group_item.edc
+++ b/data/elementary/themes/edc/efl/group_item.edc
@@ -7,56 +7,29 @@ Group: efl/group_item (@since 1.23)
7 Signal: efl,state,enabled 7 Signal: efl,state,enabled
8 8
9*/ 9*/
10 10group { "efl/group_item";
11group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "efl"; 11 data.item: "version" "124";
12 images.image: "shadow_square_tiny.png" COMP; 12 nomouse;
13 images.image: "bevel_out.png" COMP; 13 program_source: "efl";
14 images.image: "horizontal_separated_bar_small_glow.png" COMP;
15
16 parts { 14 parts {
17 image { "shadow_vbar"; 15 rect { "base";
18 desc { "default";
19 rel1.offset: -3 -2;
20 rel1.to: "base_vbar";
21 rel2.offset: 2 4;
22 rel2.to: "base_vbar";
23 image.normal: "shadow_square_tiny.png";
24 image.border: 6 6 6 6;
25 fill.smooth: 0;
26 }
27 }
28 image { "base_vbar";
29 desc { "default";
30 image.normal: "vgrad_med_lighter.png";
31 fill.smooth: 0;
32 min: 5 13;
33 TILED_HORIZ(120)
34 }
35 }
36 image { "bevel_vbar";
37 desc { "default"; 16 desc { "default";
38 rel1.to: "base_vbar"; 17 color: 32 32 32 255;
39 rel2.to: "base_vbar";
40 image.normal: "bevel_out.png";
41 image.border: 1 1 1 1;
42 image.middle: 0;
43 fill.smooth: 0;
44 min: 5 5;
45 } 18 }
46 } 19 }
47
48 text { "efl.text"; 20 text { "efl.text";
49 effect: SHADOW BOTTOM;
50 scale; 21 scale;
51 desc { "default"; 22 desc { "default";
52 rel1.offset: 2 3; 23 offscale;
24 min: 0 ICMIN;
25 rel1.offset: 4 4;
53 rel1.relative: 1.0 0.0; 26 rel1.relative: 1.0 0.0;
54 rel1.to_x: "efl.icon"; 27 rel1.to_x: "efl.icon";
55 rel2.offset: -3 -3; 28 rel2.offset: -5 -5;
56 rel2.relative: 0.0 1.0; 29 rel2.relative: 0.0 1.0;
57 rel2.to_x: "efl.extra"; 30 rel2.to_x: "efl.extra";
58 color: FN_COL_DEFAULT; 31 align: 0.0 0.5;
59 color_class: "list_group_item"; 32 color: 255 255 255 255;
60 text { font: FNBD; size: 10; 33 text { font: FNBD; size: 10;
61 min: 1 1; 34 min: 1 1;
62 ellipsis: -1; 35 ellipsis: -1;
@@ -67,56 +40,33 @@ group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "
67 } 40 }
68 desc { "disabled"; 41 desc { "disabled";
69 inherit: "default"; 42 inherit: "default";
70 color: FN_COL_DISABLE; 43 color: 80 80 80 255;
71 color_class: "list_group_item_disabled";
72 link.base: "efl,state,disabled"; 44 link.base: "efl,state,disabled";
73 } 45 }
74 } 46 }
75 swallow { "pad"; mouse;
76 desc { "default";
77 fixed: 1 0;
78 align: 0.0 0.5;
79 rel1.offset: 2 2;
80 rel2.relative: 0.0 1.0;
81 rel2.offset: 2 -3;
82 }
83 }
84 swallow { "efl.icon"; mouse; 47 swallow { "efl.icon"; mouse;
48 scale;
85 desc { "default"; 49 desc { "default";
50 offscale;
51 min: ICMIN ICMIN;
86 fixed: 1 0; 52 fixed: 1 0;
87 align: 0.0 0.5; 53 align: 0.0 0.5;
88 rel1.to_x: "pad"; 54 rel1.relative: 0.0 0.0;
89 rel1.relative: 1.0 0.0; 55 rel1.offset: 4 2;
90 rel1.offset: -1 2; 56 rel2.relative: 0.0 1.0;
91 rel2.to_x: "pad"; 57 rel2.offset: 4 -3;
92 rel2.relative: 1.0 1.0;
93 rel2.offset: -1 -3;
94 } 58 }
95 } 59 }
96 swallow { "efl.extra"; mouse; 60 swallow { "efl.extra"; mouse;
61 scale;
97 desc { "default"; 62 desc { "default";
63 offscale;
64 min: ICMIN ICMIN;
98 fixed: 1 0; 65 fixed: 1 0;
99 align: 1.0 0.5; 66 align: 1.0 0.5;
100 rel1.offset: -3 2; 67 rel1.offset: -5 4;
101 rel1.relative: 1.0 0.0; 68 rel1.relative: 1.0 0.0;
102 rel2.offset: -3 -3; 69 rel2.offset: -5 -5;
103 }
104 }
105 image { "bar";
106 desc { "default";
107 image.normal: "horizontal_separated_bar_small_glow.png";
108 image.border: 4 4 4 4;
109 fill.smooth: 0;
110 fixed: 0 1;
111 rel1.relative: 0.0 1.0;
112 rel1.offset: -3 -6;
113 rel2.offset: 2 3;
114 link.base: "efl,state,enabled";
115 }
116 desc { "disabled";
117 inherit: "default";
118 color: 255 255 255 64;
119 link.base: "efl,state,disabled";
120 } 70 }
121 } 71 }
122 } 72 }