summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-03-10 00:30:55 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-03-10 00:30:55 +0000
commitc82df5c66babefcb2cddef10315a37d79fff6143 (patch)
treeff737c8fe94d02411e5528f4d239e1936644dc94 /data
parentf0a67e22d8030dd4407a49cace2a8030373327bc (diff)
TH - navbar/layout (and bvutton was missed)
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/efl/button.edc609
-rw-r--r--data/elementary/themes/edc/efl/navigation_bar.edc53
-rw-r--r--data/elementary/themes/edc/efl/navigation_layout.edc4
3 files changed, 242 insertions, 424 deletions
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 487866545b..eb28be4135 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -26,145 +26,64 @@ Group: efl/button:anchor (@since 1.23)
26 Signal: efl,text,set 26 Signal: efl,text,set
27 Signal: efl,text,unset 27 Signal: efl,text,unset
28*/ 28*/
29group { name: "efl/button"; data.item: "version" "123"; 29#define ICON 1
30 images.image: "button_normal.png" COMP; 30#define LABEL 2
31 images.image: "button_clicked.png" COMP; 31#define MASK 3
32 32#define DISABLE 4
33#undef ICON 33#define PRESSED 8
34#define ICON 1
35#define LABEL 2
36#define MASK 3
37#define DISABLE 4
38#define PRESSED 8
39#define BACKGROUND 16 34#define BACKGROUND 16
35
36group { name: "efl/button";
37 data.item: "version" "123";
40 script { 38 script {
41 public btmode; 39 BUTTONMODE_SCRIPT2
42 public eval_mode(m) { 40 }
43 new m1 = m & MASK; 41 images.image: "win_shadow.png" COMP;
44 new d = m & DISABLE; 42 parts {
45 new p = m & PRESSED; 43 part { name: "shadow"; mouse_events: 0;
46 new bg = m & BACKGROUND; 44 scale: 1;
47 if (bg) { 45 description { state: "default" 0.0;
48 set_state(PART:"base", "hidden", 0.0); 46 rel.to: "base";
49 set_state(PART:"efl.background", "visible", 0.0); 47 WIN_SHADOW_SMALL;
50 } else {
51 set_state(PART:"efl.background", "default", 0.0);
52 if (!d) {
53 if (!p)
54 {
55 set_state(PART:"base", "default", 0.0);
56 set_state(PART:"base", "default", 0.0);
57 }
58 else {
59 set_state(PART:"base", "pressed", 0.0);
60 }
61 } else {
62 set_state(PART:"base", "disabled", 0.0);
63 }
64 } 48 }
65 if (m1 == (ICON | LABEL)) { 49 description { state: "pressed" 0.0; inherit;
66 if (!d) { 50 image.border_scale_by: 0.1;
67 set_state(PART:"efl.content", "visible", 0.0); 51 rel1.offset: -2 -1;
68 set_state(PART:"sizer_content", "visible", 0.0); 52 rel2.offset: 0 1;
69 set_state(PART:"event", "default", 0.0); 53 }
70 if (!p) { 54 description { state: "disabled" 0.0; inherit;
71 set_state(PART:"efl.text", "visible", 0.0); 55 image.border_scale_by: 0.1;
72 set_state(PART:"icon_clip", "default", 0.0); 56 rel1.offset: -2 -1;
73 } else { 57 rel2.offset: 0 1;
74 set_state(PART:"efl.text", "pressed_visible", 0.0);
75 set_state(PART:"icon_clip", "pressed", 0.0);
76 }
77 } else {
78 set_state(PART:"efl.content", "visible", 0.0);
79 set_state(PART:"sizer_content", "visible", 0.0);
80 set_state(PART:"efl.text", "disabled_visible", 0.0);
81 set_state(PART:"icon_clip", "disabled", 0.0);
82 set_state(PART:"event", "disabled", 0.0);
83 }
84 } else if (m1 == (ICON)) {
85 if (!d) {
86 set_state(PART:"efl.content", "icononly", 0.0);
87 set_state(PART:"sizer_content", "icononly", 0.0);
88 set_state(PART:"event", "default", 0.0);
89 set_state(PART:"efl.text", "default", 0.0);
90 if (!p)
91 set_state(PART:"icon_clip", "default", 0.0);
92 else
93 set_state(PART:"icon_clip", "pressed", 0.0);
94 } else {
95 set_state(PART:"efl.content", "icononly", 0.0);
96 set_state(PART:"sizer_content", "icononly", 0.0);
97 set_state(PART:"efl.text", "default", 0.0);
98 set_state(PART:"icon_clip", "disabled", 0.0);
99 set_state(PART:"event", "disabled", 0.0);
100 }
101 } else if (m1 == (LABEL)) {
102 if (!d) {
103 set_state(PART:"efl.content", "default", 0.0);
104 set_state(PART:"sizer_content", "default", 0.0);
105 set_state(PART:"icon_clip", "default", 0.0);
106 set_state(PART:"event", "default", 0.0);
107 if (!p)
108 set_state(PART:"efl.text", "textonly", 0.0);
109 else
110 set_state(PART:"efl.text", "pressed_textonly", 0.0);
111 } else {
112 set_state(PART:"efl.content", "default", 0.0);
113 set_state(PART:"sizer_content", "default", 0.0);
114 set_state(PART:"efl.text", "disabled_textonly", 0.0);
115 set_state(PART:"icon_clip", "disabled", 0.0);
116 set_state(PART:"event", "disabled", 0.0);
117 }
118 } else {
119 if (!d) {
120 set_state(PART:"efl.content", "default", 0.0);
121 set_state(PART:"sizer_content", "default", 0.0);
122 set_state(PART:"icon_clip", "default", 0.0);
123 set_state(PART:"event", "default", 0.0);
124 } else {
125 set_state(PART:"efl.content", "default", 0.0);
126 set_state(PART:"sizer_content", "default", 0.0);
127 set_state(PART:"icon_clip", "disabled", 0.0);
128 set_state(PART:"event", "disabled", 0.0);
129 }
130 } 58 }
131 } 59 }
132 } 60 rect { "base";
133 parts { 61 scale: 1;
134 image { "base";
135 desc { "default"; 62 desc { "default";
136 image.normal: "button_normal.png"; 63 color: 96 96 96 255;
137 image.border: 4 4 3 5; 64 rel1.offset: 2 2;
138 image.middle: SOLID; 65 rel2.offset: -3 -3;
139 rel1.offset: -1 0; 66 offscale;
140 rel2.offset: 0 1;
141 fill.smooth: 0;
142 color_class: "button_bg";
143 } 67 }
144 desc { "pressed"; 68 desc { "pressed"; inherit;
145 inherit: "default"; 69 color: 128 128 128 255;
146 image.normal: "button_clicked.png"; 70 rel1.offset: 3 3;
147 image.border: 5 5 4 6; 71 rel2.offset: -4 -4;
148 color_class: "button_bg_pressed"; 72 offscale;
149 } 73 }
150 desc { "disabled"; 74 desc { "disabled"; inherit;
151 inherit: "default"; 75 color: 72 72 72 255;
152 color_class: "button_bg_disabled";
153 } 76 }
154 desc { "hidden"; 77 desc { "hidden"; inherit;
155 inherit: "default";
156 visible: 0; 78 visible: 0;
157 } 79 }
158 } 80 }
159 swallow { "efl.background"; nomouse; 81 swallow { "efl.background"; nomouse; required;
160 required;
161 desc { "default"; 82 desc { "default";
162 rel1.to: "base"; 83 rel.to: "base";
163 rel2.to: "base";
164 visible: 0; 84 visible: 0;
165 } 85 }
166 desc { "visible"; 86 desc { "visible"; inherit;
167 inherit: "default";
168 visible: 1; 87 visible: 1;
169 } 88 }
170 } 89 }
@@ -172,290 +91,224 @@ group { name: "efl/button"; data.item: "version" "123";
172 desc { "default"; 91 desc { "default";
173 color_class: "button_icon"; 92 color_class: "button_icon";
174 } 93 }
175 desc { "pressed"; 94 desc { "pressed"; inherit;
176 inherit: "default";
177 color_class: "button_icon_pressed"; 95 color_class: "button_icon_pressed";
178 } 96 }
179 desc { "disabled"; 97 desc { "disabled"; inherit;
180 inherit: "default";
181 color_class: "button_icon_disabled"; 98 color_class: "button_icon_disabled";
182 } 99 }
183 } 100 }
184 swallow { "efl.content"; nomouse; 101 swallow { "efl.content"; nomouse; required;
185 clip_to: "icon_clip"; 102 clip_to: "icon_clip";
186 required; 103 scale: 1;
187 desc { "default"; 104 desc { "default";
188 fixed: 1 0; 105 fixed: 1 0;
189 align: 0.0 0.5; 106 align: 0.0 0.5;
190 rel1.offset: 6 5; 107 rel1.offset: 6 6;
191 rel1.to: "base";
192 rel2.relative: 0.0 1.0; 108 rel2.relative: 0.0 1.0;
193 rel2.offset: 6 -8; 109 rel2.offset: 6 -7;
194 rel2.to: "base";
195 visible: 0; 110 visible: 0;
111 offscale;
196 } 112 }
197 desc { "visible"; 113 desc { "visible"; inherit;
198 inherit: "default";
199 fixed: 1 0; 114 fixed: 1 0;
200 aspect: 1.0 1.0; 115 aspect: 1.0 1.0;
201 visible: 1; 116 visible: 1;
202 } 117 }
203 desc { "icononly"; 118 desc { "icononly"; inherit;
204 inherit: "default";
205 fixed: 0 0; 119 fixed: 0 0;
206 align: 0.5 0.5; 120 align: 0.5 0.5;
207 rel2.relative: 1.0 1.0; 121 rel2.relative: 1.0 1.0;
208 rel2.offset: -7 -8; 122 rel2.offset: -5 -5;
209 visible: 1; 123 visible: 1;
210 } 124 }
211 } 125 }
212 text { "sizer_content"; nomouse; 126 text { "sizer_content"; nomouse;
213 scale: 1; 127 scale: 1;
214 desc { "default"; 128 desc { "default";
215// fixed: 1 1; 129 fixed: 1 1;
216 visible: 0; 130 visible: 0;
217 text { font: FN; size: 10; 131 text { font: FN; size: 10;
218 min: 0 0; 132 min: 0 0;
219 text_class: "button_text"; 133 text_class: "button_text";
220 } 134 }
221 } 135 }
222 desc { "visible"; 136 desc { "visible"; inherit;
223 inherit: "default"; 137 rel.to: "efl.content";
224 rel1.to: "efl.content";
225 rel2.to: "efl.content";
226 text { 138 text {
227 min: 1 1; 139 min: 1 1;
228 ellipsis: -1; 140 ellipsis: -1;
229 text: "M"; 141 text: SPACER_TEXT;
230 } 142 }
231 } 143 }
232 desc { "icononly"; 144 desc { "icononly"; inherit;
233 inherit: "default"; 145 fixed: 0 0;
234 rel1.to: "efl.content"; 146 rel.to: "efl.content";
235 rel2.to: "efl.content";
236 text { 147 text {
237 min: 1 1; 148 min: 1 1;
238 ellipsis: -1; 149 ellipsis: -1;
239 text: "M"; 150 text: SPACER_TEXT;
240 } 151 }
241 } 152 }
242 } 153 }
243 text { "efl.text"; nomouse; 154 text { "efl.text"; nomouse; required;
244 effect: SHADOW BOTTOM; 155 scale: 1;
245 scale;
246 required;
247 desc { "default"; 156 desc { "default";
248 rel1.offset: 0 5; 157 fixed: 1 1;
158 color: 192 192 192 255;
159 rel1.offset: 0 6;
249 rel1.relative: 1.0 0.0; 160 rel1.relative: 1.0 0.0;
250 rel1.to_x: "efl.content"; 161 rel1.to_x: "efl.content";
251 rel1.to_y: "base"; 162 rel2.offset: -7 -7;
252 rel2.offset: -8 -8;
253 rel2.to: "base";
254 color_class: "button_text";
255 color3: 255 255 255 255;
256 text { font: FN; size: 10; 163 text { font: FN; size: 10;
257 align: 0.5 0.5; 164 align: 0.5 0.5;
258 min: 0 0; 165 min: 0 0;
259 text_class: "button";
260 } 166 }
261 visible: 0; 167 visible: 0;
262 fixed: 1 1; 168 offscale;
263 } 169 }
264 desc { "visible"; 170 desc { "visible"; inherit;
265 inherit: "default"; 171 fixed: 0 0;
266 rel1.offset: 2 5; 172 rel1.offset: 6 6;
267 text.min: 1 1; 173 text.min: 1 1;
268 text.ellipsis: -1; 174 text.ellipsis: -1;
269 visible: 1; 175 visible: 1;
270 fixed: 0 0;
271 } 176 }
272 desc { "pressed_visible"; 177 desc { "pressed_visible"; inherit;
273 inherit: "default"; 178 fixed: 0 0;
274 rel1.offset: 2 5; 179 color: 255 255 255 255;
180 rel1.offset: 6 6;
275 text.min: 1 1; 181 text.min: 1 1;
276 text.ellipsis: -1; 182 text.ellipsis: -1;
277 visible: 1; 183 visible: 1;
278 fixed: 0 0;
279 color_class: "button_text_pressed";
280 } 184 }
281 desc { "textonly"; 185 desc { "textonly"; inherit;
282 inherit: "default"; 186 fixed: 0 0;
283 text.min: 1 1; 187 text.min: 1 1;
284 text.ellipsis: -1; 188 text.ellipsis: -1;
285 visible: 1; 189 visible: 1;
286 fixed: 0 0;
287 } 190 }
288 desc { "pressed_textonly"; 191 desc { "pressed_textonly"; inherit;
289 inherit: "default"; 192 fixed: 0 0;
193 color: 255 255 255 255;
290 text.min: 1 1; 194 text.min: 1 1;
291 text.ellipsis: -1; 195 text.ellipsis: -1;
292 visible: 1; 196 visible: 1;
293 fixed: 0 0;
294 color_class: "button_text_pressed";
295 } 197 }
296 desc { "disabled_visible"; 198 desc { "disabled_visible"; inherit;
297 inherit: "default"; 199 fixed: 0 0;
298 rel1.offset: 2 5; 200 color: 96 96 96 255;
299 color_class: "button_text_disabled"; 201 rel1.offset: 6 6;
300 color3: 255 255 255 255;
301 text.min: 1 1; 202 text.min: 1 1;
302 text.ellipsis: -1; 203 text.ellipsis: -1;
303 visible: 1; 204 visible: 1;
304 fixed: 0 0;
305 } 205 }
306 desc { "disabled_textonly"; 206 desc { "disabled_textonly"; inherit;
307 inherit: "default"; 207 fixed: 0 0;
308 color_class: "button_text_disabled"; 208 color: 96 96 96 255;
309 color3: 255 255 255 255;
310 text.min: 1 1; 209 text.min: 1 1;
311 text.ellipsis: -1; 210 text.ellipsis: -1;
312 visible: 1; 211 visible: 1;
313 fixed: 0 0;
314 } 212 }
315 } 213 }
316 rect { "event"; 214 rect { "event";
215 ignore_flags: ON_HOLD;
317 desc { "default"; 216 desc { "default";
318 color: 0 0 0 0; 217 color: 0 0 0 0;
319 } 218 }
320 desc { "disabled"; 219 desc { "disabled"; inherit;
321 inherit: "default";
322 visible: 0; 220 visible: 0;
323 } 221 }
324 } 222 }
325 } 223 }
326 programs { 224 programs {
327 EFL_UI_CLICKABLE_PART_BIND("event") 225 EFL_UI_CLICKABLE_PART_BIND("event")
328 program { 226 program { signal: "mouse,down,1"; source: "event";
329 signal: "mouse,down,1"; source: "event";
330 after: "button_click_anim"; 227 after: "button_click_anim";
331 } 228 }
332 program { name: "button_click_anim"; 229 program { name: "button_click_anim";
333 script { 230 script { flag_set(PRESSED); }
334 new m = get_int(btmode);
335 m |= PRESSED; set_int(btmode, m);
336 eval_mode(m);
337 }
338 } 231 }
339 program { name: "button_unclick"; 232 program { name: "button_unclick";
340 signal: "mouse,up,1"; source: "event"; 233 signal: "mouse,up,1"; source: "event";
341 after: "button_unclick_anim"; 234 after: "button_unclick_anim";
342 } 235 }
343 program { name: "button_unclick_anim"; 236 program { name: "button_unclick_anim";
344 script { 237 script { flag_unset(PRESSED); }
345 new m = get_int(btmode);
346 m &= ~PRESSED; set_int(btmode, m);
347 eval_mode(m);
348 }
349 } 238 }
350 program { name: "buttonactivate"; 239 program { signal: "efl,state,animation,activated"; source: "efl";
351 signal: "efl,state,animation,activated"; source: "efl";
352 action: STATE_SET "pressed" 0.0; 240 action: STATE_SET "pressed" 0.0;
241 target: "shadow";
353 target: "base"; 242 target: "base";
354 after: "button_unpressed_anim"; 243 after: "button_unpressed_anim";
355 } 244 }
356 program { name: "button_unpressed_anim"; 245 program { name: "button_unpressed_anim";
357 action: STATE_SET "default" 0.0;
358 in: 0.5 0.0; 246 in: 0.5 0.0;
247 action: STATE_SET "default" 0.0;
248 target: "shadow";
359 target: "base"; 249 target: "base";
360 } 250 }
361 program { name: "button_text_visible"; 251 program { signal: "efl,text,set"; source: "efl";
362 signal: "efl,text,set"; source: "efl"; 252 script { flag_set(LABEL); }
363 script {
364 new m = get_int(btmode);
365 m |= LABEL; set_int(btmode, m);
366 eval_mode(m);
367 }
368 } 253 }
369 program { name: "button_text_hidden"; 254 program { signal: "efl,text,unset"; source: "efl";
370 signal: "efl,text,unset"; source: "efl"; 255 script { flag_unset(LABEL); }
371 script {
372 new m = get_int(btmode);
373 m &= ~LABEL; set_int(btmode, m);
374 eval_mode(m);
375 }
376 } 256 }
377 program { name: "button_icon_visible"; 257 program { signal: "efl,content,set"; source: "efl";
378 signal: "efl,content,set"; source: "efl"; 258 script { flag_set(ICON); }
379 script {
380 new m = get_int(btmode);
381 m |= ICON; set_int(btmode, m);
382 eval_mode(m);
383 }
384 } 259 }
385 program { name: "button_icon_hidden"; 260 program { signal: "efl,content,unset"; source: "efl";
386 signal: "efl,content,unset"; source: "efl"; 261 script { flag_unset(ICON); }
387 script {
388 new m = get_int(btmode);
389 m &= ~ICON; set_int(btmode, m);
390 eval_mode(m);
391 }
392 } 262 }
393 program { name: "button_background_visible"; 263 program { signal: "efl,state,background,set"; source: "efl";
394 signal: "efl,state,background,set"; source: "efl"; 264 script { flag_set(BACKGROUND); }
395 script {
396 new m = get_int(btmode);
397 m |= BACKGROUND; set_int(btmode, m);
398 eval_mode(m);
399 }
400 } 265 }
401 program { name: "button_background_hidden"; 266 program { signal: "efl,state,background,unset"; source: "efl";
402 signal: "efl,state,background,unset"; source: "efl"; 267 script { flag_unset(BACKGROUND); }
403 script {
404 new m = get_int(btmode);
405 m &= ~BACKGROUND; set_int(btmode, m);
406 eval_mode(m);
407 }
408 } 268 }
409 program { name: "button_state_disabled"; 269 program { signal: "efl,state,disabled"; source: "efl";
410 signal: "efl,state,disabled"; source: "efl"; 270 script { flag_set(DISABLE); }
411 script {
412 new m = get_int(btmode);
413 m |= DISABLE; set_int(btmode, m);
414 eval_mode(m);
415 }
416 } 271 }
417 program { name: "button_state_enabled"; 272 program { signal: "efl,state,enabled"; source: "efl";
418 signal: "efl,state,enabled"; source: "efl"; 273 script { flag_unset(DISABLE); }
419 script {
420 new m = get_int(btmode);
421 m &= ~DISABLE; set_int(btmode, m);
422 eval_mode(m);
423 }
424 } 274 }
425 } 275 }
426#undef ICON
427#undef LABEL
428#undef MASK
429#undef DISABLE
430#undef PRESSED
431#undef BACKGROUND
432} 276}
433 277
434group { name: "efl/button:anchor"; data.item: "version" "123"; 278group { name: "efl/button:anchor";
435 images.image: "horizontal_separated_bar_small_glow.png" COMP; 279 data.item: "version" "123";
436#define ICON 1
437#define LABEL 2
438#define MASK 3
439#define DISABLE 4
440 script { 280 script {
441 public btmode; 281 public btmode;
442 public eval_mode(m) { 282 public eval_mode(m) {
443 new m1 = m & MASK; 283 new m1 = m & MASK;
444 new d = m & DISABLE; 284 new d = m & DISABLE;
285 new p = m & PRESSED;
286 if (!d) {
287 if (!p) {
288 set_state(PART:"bar", "default", 0.0);
289 }
290 else {
291 set_state(PART:"bar", "pressed", 0.0);
292 }
293 } else {
294 set_state(PART:"bar", "disabled", 0.0);
295 }
445 if (m1 == (ICON | LABEL)) { 296 if (m1 == (ICON | LABEL)) {
446 if (!d) { 297 if (!d) {
447 set_state(PART:"efl.content", "visible", 0.0); 298 set_state(PART:"efl.content", "visible", 0.0);
448 set_state(PART:"sizer_content", "visible", 0.0); 299 set_state(PART:"sizer_content", "visible", 0.0);
449 set_state(PART:"efl.text", "visible", 0.0); 300 if (!p) {
301 set_state(PART:"efl.text", "visible", 0.0);
302 } else {
303 set_state(PART:"efl.text", "pressed_visible", 0.0);
304 }
450 set_state(PART:"icon_clip", "default", 0.0); 305 set_state(PART:"icon_clip", "default", 0.0);
451 set_state(PART:"bar", "default", 0.0);
452 set_state(PART:"event", "default", 0.0); 306 set_state(PART:"event", "default", 0.0);
453 } else { 307 } else {
454 set_state(PART:"efl.content", "visible", 0.0); 308 set_state(PART:"efl.content", "visible", 0.0);
455 set_state(PART:"sizer_content", "visible", 0.0); 309 set_state(PART:"sizer_content", "visible", 0.0);
456 set_state(PART:"efl.text", "disabled_visible", 0.0); 310 set_state(PART:"efl.text", "disabled_visible", 0.0);
457 set_state(PART:"icon_clip", "disabled", 0.0); 311 set_state(PART:"icon_clip", "disabled", 0.0);
458 set_state(PART:"bar", "disabled", 0.0);
459 set_state(PART:"event", "disabled", 0.0); 312 set_state(PART:"event", "disabled", 0.0);
460 } 313 }
461 } else if (m1 == (ICON)) { 314 } else if (m1 == (ICON)) {
@@ -464,30 +317,30 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
464 set_state(PART:"sizer_content", "icononly", 0.0); 317 set_state(PART:"sizer_content", "icononly", 0.0);
465 set_state(PART:"efl.text", "default", 0.0); 318 set_state(PART:"efl.text", "default", 0.0);
466 set_state(PART:"icon_clip", "default", 0.0); 319 set_state(PART:"icon_clip", "default", 0.0);
467 set_state(PART:"bar", "default", 0.0);
468 set_state(PART:"event", "default", 0.0); 320 set_state(PART:"event", "default", 0.0);
469 } else { 321 } else {
470 set_state(PART:"efl.content", "icononly", 0.0); 322 set_state(PART:"efl.content", "icononly", 0.0);
471 set_state(PART:"sizer_content", "icononly", 0.0); 323 set_state(PART:"sizer_content", "icononly", 0.0);
472 set_state(PART:"efl.text", "default", 0.0); 324 set_state(PART:"efl.text", "default", 0.0);
473 set_state(PART:"icon_clip", "disabled", 0.0); 325 set_state(PART:"icon_clip", "disabled", 0.0);
474 set_state(PART:"bar", "disabled", 0.0);
475 set_state(PART:"event", "disabled", 0.0); 326 set_state(PART:"event", "disabled", 0.0);
476 } 327 }
477 } else if (m1 == (LABEL)) { 328 } else if (m1 == (LABEL)) {
478 if (!d) { 329 if (!d) {
479 set_state(PART:"efl.content", "default", 0.0); 330 set_state(PART:"efl.content", "default", 0.0);
480 set_state(PART:"sizer_content", "default", 0.0); 331 set_state(PART:"sizer_content", "default", 0.0);
481 set_state(PART:"efl.text", "textonly", 0.0); 332 if (!p) {
333 set_state(PART:"efl.text", "textonly", 0.0);
334 } else {
335 set_state(PART:"efl.text", "pressed_textonly", 0.0);
336 }
482 set_state(PART:"icon_clip", "default", 0.0); 337 set_state(PART:"icon_clip", "default", 0.0);
483 set_state(PART:"bar", "default", 0.0);
484 set_state(PART:"event", "default", 0.0); 338 set_state(PART:"event", "default", 0.0);
485 } else { 339 } else {
486 set_state(PART:"efl.content", "default", 0.0); 340 set_state(PART:"efl.content", "default", 0.0);
487 set_state(PART:"sizer_content", "default", 0.0); 341 set_state(PART:"sizer_content", "default", 0.0);
488 set_state(PART:"efl.text", "disabled_textonly", 0.0); 342 set_state(PART:"efl.text", "disabled_textonly", 0.0);
489 set_state(PART:"icon_clip", "disabled", 0.0); 343 set_state(PART:"icon_clip", "disabled", 0.0);
490 set_state(PART:"bar", "disabled", 0.0);
491 set_state(PART:"event", "disabled", 0.0); 344 set_state(PART:"event", "disabled", 0.0);
492 } 345 }
493 } else { 346 } else {
@@ -495,13 +348,11 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
495 set_state(PART:"efl.content", "default", 0.0); 348 set_state(PART:"efl.content", "default", 0.0);
496 set_state(PART:"sizer_content", "default", 0.0); 349 set_state(PART:"sizer_content", "default", 0.0);
497 set_state(PART:"icon_clip", "default", 0.0); 350 set_state(PART:"icon_clip", "default", 0.0);
498 set_state(PART:"bar", "default", 0.0);
499 set_state(PART:"event", "default", 0.0); 351 set_state(PART:"event", "default", 0.0);
500 } else { 352 } else {
501 set_state(PART:"efl.content", "default", 0.0); 353 set_state(PART:"efl.content", "default", 0.0);
502 set_state(PART:"sizer_content", "default", 0.0); 354 set_state(PART:"sizer_content", "default", 0.0);
503 set_state(PART:"icon_clip", "disabled", 0.0); 355 set_state(PART:"icon_clip", "disabled", 0.0);
504 set_state(PART:"bar", "disabled", 0.0);
505 set_state(PART:"event", "disabled", 0.0); 356 set_state(PART:"event", "disabled", 0.0);
506 } 357 }
507 } 358 }
@@ -512,6 +363,15 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
512 desc { "default"; 363 desc { "default";
513 color: 0 0 0 0; 364 color: 0 0 0 0;
514 } 365 }
366 desc { "pressed"; inherit;
367 inherit: "default";
368 }
369 desc { "disabled"; inherit;
370 inherit: "default";
371 }
372 desc { "hidden"; inherit;
373 inherit: "default";
374 }
515 } 375 }
516 rect { "icon_clip"; 376 rect { "icon_clip";
517 desc { "default"; 377 desc { "default";
@@ -523,8 +383,7 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
523 } 383 }
524 swallow { "efl.background"; nomouse; required; 384 swallow { "efl.background"; nomouse; required;
525 desc { "default"; 385 desc { "default";
526 rel1.to: "base"; 386 rel.to: "base";
527 rel2.to: "base";
528 visible: 0; 387 visible: 0;
529 } 388 }
530 desc { "visible"; 389 desc { "visible";
@@ -537,10 +396,10 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
537 desc { "default"; 396 desc { "default";
538 fixed: 1 0; 397 fixed: 1 0;
539 align: 0.0 0.5; 398 align: 0.0 0.5;
540 rel1.offset: 0 4; 399 rel1.offset: 4 4;
541 rel1.to: "base"; 400 rel1.to: "base";
542 rel2.relative: 0.0 1.0; 401 rel2.relative: 0.0 1.0;
543 rel2.offset: 0 -5; 402 rel2.offset: 4 -5;
544 rel2.to: "base"; 403 rel2.to: "base";
545 visible: 0; 404 visible: 0;
546 } 405 }
@@ -555,141 +414,116 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
555 fixed: 0 0; 414 fixed: 0 0;
556 align: 0.5 0.5; 415 align: 0.5 0.5;
557 rel2.relative: 1.0 1.0; 416 rel2.relative: 1.0 1.0;
558 rel2.offset: -1 -5; 417 rel2.offset: -5 -5;
559 visible: 1; 418 visible: 1;
560 } 419 }
561 } 420 }
562 text { "sizer_content"; nomouse; 421 text { "sizer_content"; nomouse;
563 scale: 1; 422 scale: 1;
564 desc { "default"; 423 desc { "default";
424 fixed: 1 1;
565 visible: 0; 425 visible: 0;
566 text { font: FN; size: 10; 426 text { font: FN; size: 10;
567 min: 0 0; 427 min: 0 0;
568 text_class: "button_text"; 428 text_class: "button_text";
569 } 429 }
570 } 430 }
571 desc { "visible"; 431 desc { "visible"; inherit;
572 inherit: "default"; 432 rel.to: "efl.content";
573 rel1.to: "efl.content";
574 rel2.to: "efl.content";
575 text { 433 text {
576 min: 1 1; 434 min: 1 1;
577 ellipsis: -1; 435 ellipsis: -1;
578 text: "M"; 436 text: SPACER_TEXT;
579 } 437 }
580 } 438 }
581 desc { "icononly"; 439 desc { "icononly"; inherit;
582 inherit: "default"; 440 fixed: 0 0;
583 rel1.to: "efl.content"; 441 rel.to: "efl.content";
584 rel2.to: "efl.content";
585 text { 442 text {
586 min: 1 1; 443 min: 1 1;
587 ellipsis: -1; 444 ellipsis: -1;
588 text: "M"; 445 text: SPACER_TEXT;
589 } 446 }
590 } 447 }
591 } 448 }
592 text { "efl.text"; nomouse; 449 text { "efl.text"; nomouse; required;
593 effect: GLOW;
594 scale: 1; 450 scale: 1;
595 desc { "default"; 451 desc { "default";
596 rel1.offset: -2 0; 452 rel1.offset: 0 4;
597 rel1.relative: 1.0 0.0; 453 rel1.relative: 1.0 0.0;
598 rel1.to_x: "efl.content"; 454 rel1.to_x: "efl.content";
599 rel1.to_y: "base"; 455 rel1.to_y: "base";
600 rel2.offset: -1 -1; 456 rel2.offset: -5 -5;
601 rel2.to: "base"; 457 rel2.to: "base";
602 color_class: "button_text_anchor"; 458 color: 51 153 255 255;
603 color2: 255 255 255 255;
604 color3: 255 255 255 255;
605 text { font: FN; size: 10; 459 text { font: FN; size: 10;
606 align: 0.5 0.5; 460 align: 0.5 0.5;
607 min: 0 0; 461 min: 0 0;
608 text_class: "button_anchor";
609 } 462 }
610 visible: 0; 463 visible: 0;
611 } 464 }
612 desc { "visible"; 465 desc { "visible";
613 inherit: "default"; 466 inherit: "default";
614 rel1.offset: 0 0; 467 rel1.offset: 4 4;
615 text.min: 1 1; 468 text.min: 1 1;
616 text.ellipsis: -1; 469 text.ellipsis: -1;
617 visible: 1; 470 visible: 1;
618 } 471 }
619 desc { "textonly"; 472 desc { "pressed_visible";
620 inherit: "default"; 473 inherit: "default";
474 color: 255 255 255 255;
475 rel1.offset: 4 4;
621 text.min: 1 1; 476 text.min: 1 1;
622 text.ellipsis: -1; 477 text.ellipsis: -1;
623 visible: 1; 478 visible: 1;
479 fixed: 0 0;
624 } 480 }
625 desc { "disabled_visible"; 481 desc { "textonly";
626 inherit: "default"; 482 inherit: "default";
627 rel1.offset: 0 0; 483 rel1.offset: 0 4;
628 color_class: "button_text_anchor_disabled";
629 text.min: 1 1; 484 text.min: 1 1;
630 text.ellipsis: -1; 485 text.ellipsis: -1;
631 visible: 1; 486 visible: 1;
632 } 487 }
633 desc { "disabled_textonly"; 488 desc { "pressed_textonly";
634 inherit: "default"; 489 inherit: "default";
635 color_class: "button_text_anchor_disabled"; 490 color: 255 255 255 255;
636 text.min: 1 1; 491 text.min: 1 1;
637 text.ellipsis: -1; 492 text.ellipsis: -1;
638 visible: 1; 493 visible: 1;
494 fixed: 0 0;
639 } 495 }
640 } 496 desc { "disabled_visible";
641 text { "text2"; nomouse; 497 inherit: "default";
642 effect: GLOW; 498 rel1.offset: 0 0;
643 scale: 1; 499 color: 96 96 96 255;
644 desc { "default"; 500 text.min: 1 1;
645 fixed: 1 1; 501 text.ellipsis: -1;
646 rel1.to: "efl.text"; 502 visible: 1;
647 rel2.to: "efl.text";
648 color_class: "button_text_anchor";
649 color2: 255 255 255 255;
650 color3: 255 255 255 255;
651 text { font: FN; size: 10;
652 text_source: "efl.text";
653 min: 1 1;
654 ellipsis: -1;
655 text_class: "button_anchor";
656 }
657 visible: 0;
658 } 503 }
659 desc { "clicked"; 504 desc { "disabled_textonly";
660 inherit: "default"; 505 inherit: "default";
506 rel1.offset: 0 4;
507 color: 96 96 96 255;
508 text.min: 1 1;
509 text.ellipsis: -1;
661 visible: 1; 510 visible: 1;
662 } 511 }
663 } 512 }
664 image { "bar"; nomouse; 513 rect { "bar"; nomouse;
665 desc { "default"; 514 desc { "default";
666 image.normal: "horizontal_separated_bar_small_glow.png"; 515 color: 51 153 255 255;
667 image.border: 4 4 4 4;
668 fill.smooth: 0;
669 fixed: 0 1;
670 rel1.relative: 0.0 1.0; 516 rel1.relative: 0.0 1.0;
671 rel1.offset: -3 -6; 517 rel1.offset: 2 -3;
672 rel2.offset: 2 3; 518 rel2.offset: -3 -3;
673 } 519 }
674 desc { "disabled"; 520 desc { "pressed";
675 inherit: "default"; 521 inherit: "default";
676 color: 255 255 255 64; 522 color: 255 255 255 255;
677 }
678 }
679 image { "bar2"; nomouse;
680 desc { "default";
681 image.normal: "horizontal_separated_bar_small_glow.png";
682 image.border: 4 4 4 4;
683 fill.smooth: 0;
684 rel1.to: "bar";
685 rel2.to: "bar";
686 color: 255 255 255 0;
687 visible: 0;
688 } 523 }
689 desc { "clicked"; 524 desc { "disabled";
690 inherit: "default"; 525 inherit: "default";
691 color: 255 255 255 255; 526 color: 96 96 96 255;
692 visible: 1;
693 } 527 }
694 } 528 }
695 rect { "event"; 529 rect { "event";
@@ -704,89 +538,80 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
704 } 538 }
705 programs { 539 programs {
706 EFL_UI_CLICKABLE_PART_BIND("event") 540 EFL_UI_CLICKABLE_PART_BIND("event")
707 program { 541 program { signal: "mouse,down,1"; source: "event";
708 signal: "mouse,down,1"; source: "event";
709 after: "button_click_anim"; 542 after: "button_click_anim";
710 } 543 }
711 program { name: "button_click_anim"; 544 program { name: "button_click_anim";
712 action: STATE_SET "clicked" 0.0; 545 script {
713 target: "bar2"; 546 new m = get_int(btmode);
714 target: "text2"; 547 m |= PRESSED; set_int(btmode, m);
548 eval_mode(m);
549 }
715 } 550 }
716 program { 551 program { signal: "mouse,up,1"; source: "event";
717 signal: "mouse,up,1"; source: "event";
718 after: "button_unclick_anim"; 552 after: "button_unclick_anim";
719 } 553 }
720 program { name: "button_unclick_anim"; 554 program { name: "button_unclick_anim";
721 action: STATE_SET "default" 0.0; 555 script {
722 target: "bar2"; 556 new m = get_int(btmode);
723 target: "text2"; 557 m &= ~PRESSED; set_int(btmode, m);
724 } 558 eval_mode(m);
725 program { 559 }
726 signal: "efl,state,animation,activated"; source: "efl"; 560 }
727 action: STATE_SET "clicked" 0.0; 561 program { signal: "efl,state,animation,activated"; source: "efl";
728 target: "bar2"; 562 action: STATE_SET "pressed" 0.0;
729 target: "text2"; 563 target: "base";
730 after: "button_unpressed_anim"; 564 after: "button_unpressed_anim";
731 } 565 }
732 program { name: "button_unpressed_anim"; 566 program { name: "button_unpressed_anim";
733 action: STATE_SET "default" 0.0; 567 action: STATE_SET "default" 0.0;
734 in: 0.5 0.0; 568 in: 0.5 0.0;
735 target: "bar2"; 569 target: "base";
736 target: "text2";
737 } 570 }
738 program { name: "button_text_visible"; 571 program { signal: "efl,text,set"; source: "efl";
739 signal: "efl,text,set"; source: "efl";
740 script { 572 script {
741 new m = get_int(btmode); 573 new m = get_int(btmode);
742 m |= LABEL; set_int(btmode, m); 574 m |= LABEL; set_int(btmode, m);
743 eval_mode(m); 575 eval_mode(m);
744 } 576 }
745 } 577 }
746 program { name: "button_text_hidden"; 578 program { signal: "efl,text,unset"; source: "efl";
747 signal: "efl,text,unset"; source: "efl";
748 script { 579 script {
749 new m = get_int(btmode); 580 new m = get_int(btmode);
750 m &= ~LABEL; set_int(btmode, m); 581 m &= ~LABEL; set_int(btmode, m);
751 eval_mode(m); 582 eval_mode(m);
752 } 583 }
753 } 584 }
754 program { name: "button_icon_visible"; 585 program { signal: "efl,content,set"; source: "efl";
755 signal: "efl,content,set"; source: "efl";
756 script { 586 script {
757 new m = get_int(btmode); 587 new m = get_int(btmode);
758 m |= ICON; set_int(btmode, m); 588 m |= ICON; set_int(btmode, m);
759 eval_mode(m); 589 eval_mode(m);
760 } 590 }
761 } 591 }
762 program { name: "button_icon_hidden"; 592 program { signal: "efl,content,unset"; source: "efl";
763 signal: "efl,content,unset"; source: "efl";
764 script { 593 script {
765 new m = get_int(btmode); 594 new m = get_int(btmode);
766 m &= ~ICON; set_int(btmode, m); 595 m &= ~ICON; set_int(btmode, m);
767 eval_mode(m); 596 eval_mode(m);
768 } 597 }
769 } 598 }
770 program { name: "button_background_visible"; 599 program { signal: "efl,state,background,set"; source: "efl";
771 signal: "efl,state,background,set"; source: "efl";
772 action: STATE_SET "visible" 0.0; 600 action: STATE_SET "visible" 0.0;
773 target: "efl.background"; 601 target: "efl.background";
774 } 602 }
775 program { name: "button_background_hidden"; 603 program { signal: "efl,state,background,unset"; source: "efl";
776 signal: "efl,state,background,unset"; source: "efl";
777 action: STATE_SET "default" 0.0; 604 action: STATE_SET "default" 0.0;
778 target: "efl.background"; 605 target: "efl.background";
779 } 606 }
780 program { name: "button_state_disabled"; 607 program { signal: "efl,state,disabled"; source: "efl";
781 signal: "efl,state,disabled"; source: "efl";
782 script { 608 script {
783 new m = get_int(btmode); 609 new m = get_int(btmode);
784 m |= DISABLE; set_int(btmode, m); 610 m |= DISABLE; set_int(btmode, m);
785 eval_mode(m); 611 eval_mode(m);
786 } 612 }
787 } 613 }
788 program { name: "button_state_enabled"; 614 program { signal: "efl,state,enabled"; source: "efl";
789 signal: "efl,state,enabled"; source: "efl";
790 script { 615 script {
791 new m = get_int(btmode); 616 new m = get_int(btmode);
792 m &= ~DISABLE; set_int(btmode, m); 617 m &= ~DISABLE; set_int(btmode, m);
@@ -794,8 +619,4 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
794 } 619 }
795 } 620 }
796 } 621 }
797#undef ICON
798#undef LABEL
799#undef MASK
800#undef DISABLE
801} 622}
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index ab51d4aea6..93ef542cb0 100644
--- a/data/elementary/themes/edc/efl/navigation_bar.edc
+++ b/data/elementary/themes/edc/efl/navigation_bar.edc
@@ -1,8 +1,9 @@
1//Efl.Ui.Navigation_Bar Themes 1//Efl.Ui.Navigation_Bar Themes
2group { "efl/navigation_bar"; data.item: "version" "123"; 2group { "efl/navigation_bar";
3 data.item: "version" "123";
3 styles { 4 styles {
4 style { name: "navigation_bar_text"; 5 style { name: "navigation_bar_text";
5 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=navigation_bar_text style=shadow,bottom shadow_color=#00000080 ellipsis=1.0 wrap=mixed"; 6 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed";
6 tag: "br" "\n"; 7 tag: "br" "\n";
7 tag: "hilight" "+ font="FNBD" text_class=label_light"; 8 tag: "hilight" "+ font="FNBD" text_class=label_light";
8 tag: "b" "+ font="FNBD" text_class=label_light"; 9 tag: "b" "+ font="FNBD" text_class=label_light";
@@ -16,6 +17,7 @@ group { "efl/navigation_bar"; data.item: "version" "123";
16 } 17 }
17 } 18 }
18 swallow { "efl.back_button"; 19 swallow { "efl.back_button";
20 scale;
19 desc { "default"; 21 desc { "default";
20 fixed: 1 0; 22 fixed: 1 0;
21 min: 0 0; 23 min: 0 0;
@@ -27,71 +29,65 @@ group { "efl/navigation_bar"; data.item: "version" "123";
27 } 29 }
28 desc { "visible"; 30 desc { "visible";
29 inherit: "default"; 31 inherit: "default";
30 min: 40 0; 32 min: 40 20;
31 max: 40 -1; 33 max: 40 -1;
32 vis; 34 vis;
33 } 35 }
34 } 36 }
35 swallow { "efl.left_content"; 37 swallow { "efl.left_content";
38 scale;
36 desc { "default"; 39 desc { "default";
37 rel.to: "base"; 40 rel.to: "base";
38 rel2.relative: 0.0 1.0; 41 rel2.relative: 0.0 1.0;
39 align: 0.0 0.5; 42 align: 0.0 0.5;
43 min: 40 20;
44 max: 40 -1;
40 } 45 }
41 } 46 }
42 swallow { "efl.right_content"; 47 swallow { "efl.right_content";
48 scale;
43 desc { "default"; 49 desc { "default";
44 rel.to: "base"; 50 rel.to: "base";
45 rel1.relative: 1.0 0.0; 51 rel1.relative: 1.0 0.0;
46 align: 1.0 0.5; 52 align: 1.0 0.5;
53 min: 40 20;
54 max: 40 -1;
47 } 55 }
48 } 56 }
49 spacer { "text_base"; 57 spacer { "text_base";
50 desc { "default"; 58 desc { "default";
51 rel1 { 59 rel1.to: "efl.back_button";
52 to: "efl.back_button"; 60 rel1.relative: 1.0 0.0;
53 relative: 1.0 0.0; 61 rel2.to: "efl.right_content";
54 } 62 rel2.relative: 0.0 1.0;
55 rel2 {
56 to: "efl.right_content";
57 relative: 0.0 1.0;
58 }
59 } 63 }
60 desc { "left_content"; 64 desc { "left_content";
61 inherit: "default"; 65 inherit: "default";
62 rel1 { 66 rel1.to: "efl.left_content";
63 to: "efl.left_content"; 67 rel1.relative: 1.0 0.0;
64 relative: 1.0 0.0;
65 }
66 } 68 }
67 } 69 }
68 textblock { "efl.text"; 70 textblock { "efl.text";
69 scale; 71 scale;
70 desc { "default"; 72 desc { "default";
71 text {
72 style: "navigation_bar_text";
73 }
74 rel.to: "text_base"; 73 rel.to: "text_base";
74 text.style: "navigation_bar_text";
75 } 75 }
76 } 76 }
77 programs { 77 programs {
78 program { 78 program { signal: "efl,state,back_button,visible"; source: "efl";
79 signal: "efl,state,back_button,visible"; source: "efl";
80 action: STATE_SET "visible" 0.0; 79 action: STATE_SET "visible" 0.0;
81 target: "efl.back_button"; 80 target: "efl.back_button";
82 } 81 }
83 program { 82 program { signal: "efl,state,back_button,hidden"; source: "efl";
84 signal: "efl,state,back_button,hidden"; source: "efl";
85 action: STATE_SET "default" 0.0; 83 action: STATE_SET "default" 0.0;
86 target: "efl.back_button"; 84 target: "efl.back_button";
87 } 85 }
88 program { 86 program { signal: "efl,state,left_content,set"; source: "efl";
89 signal: "efl,state,left_content,set"; source: "efl";
90 action: STATE_SET "left_content" 0.0; 87 action: STATE_SET "left_content" 0.0;
91 target: "text_base"; 88 target: "text_base";
92 } 89 }
93 program { 90 program { signal: "efl,state,left_content,unset"; source: "efl";
94 signal: "efl,state,left_content,unset"; source: "efl";
95 action: STATE_SET "default" 0.0; 91 action: STATE_SET "default" 0.0;
96 target: "text_base"; 92 target: "text_base";
97 } 93 }
@@ -102,13 +98,12 @@ group { "efl/navigation_bar"; data.item: "version" "123";
102group { name: "efl/navigation_bar/back_button"; 98group { name: "efl/navigation_bar/back_button";
103 inherit: "efl/button"; 99 inherit: "efl/button";
104 data.item: "version" "123"; 100 data.item: "version" "123";
105 images.image: "icon_arrow_left.png" COMP;
106 parts { 101 parts {
107 image { name: "icon_arrow_left"; 102 image { name: "icon_arrow_left";
108 insert_before: "efl.content"; 103 insert_before: "efl.content";
109 desc { "default"; 104 desc { "default";
110 image.normal: "icon_arrow_left.png"; 105 image.normal: "i-arrow-l";
111 fill.smooth: 0; 106 color: 160 160 160 255;
112 } 107 }
113 } 108 }
114 } 109 }
diff --git a/data/elementary/themes/edc/efl/navigation_layout.edc b/data/elementary/themes/edc/efl/navigation_layout.edc
index a75157da28..eac4558b82 100644
--- a/data/elementary/themes/edc/efl/navigation_layout.edc
+++ b/data/elementary/themes/edc/efl/navigation_layout.edc
@@ -1,11 +1,13 @@
1//Efl.Ui.Navigation_Layout Themes 1//Efl.Ui.Navigation_Layout Themes
2group { "efl/navigation_layout"; data.item: "version" "123"; 2group { "efl/navigation_layout";
3 data.item: "version" "123";
3 parts { 4 parts {
4 spacer { "base"; 5 spacer { "base";
5 desc { "default"; 6 desc { "default";
6 } 7 }
7 } 8 }
8 swallow { "efl.bar"; 9 swallow { "efl.bar";
10 scale: 1;
9 desc { "default"; 11 desc { "default";
10 fixed: 0 1; 12 fixed: 0 1;
11 min: 0 40; 13 min: 0 40;