summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-03 19:33:57 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-03 19:33:57 +0000
commit81a0aab318aeff1a933abd83ebaf46faf2beab3e (patch)
tree97c514f44b4e39372c13525f9700023fb776c7f3 /data
parent4ccc2828f6d92fce082e7dcf2d52b652a12e0fe1 (diff)
TH - start efl.ui - bg + border done
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/efl/bg.edc10
-rw-r--r--data/elementary/themes/edc/efl/border.edc772
-rw-r--r--data/elementary/themes/edc/elm/bg.edc1
-rw-r--r--data/elementary/themes/edc/elm/border.edc4
4 files changed, 298 insertions, 489 deletions
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index b494e60cd1..50be1caa46 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -13,7 +13,6 @@ Group: efl/bg (@since 1.23)
13 13
14group { "efl/bg"; 14group { "efl/bg";
15 data.item: "version" "123"; 15 data.item: "version" "123";
16 images.image: "bevel_dark_out.png" COMP;
17 parts { 16 parts {
18 part { name: "clipper"; type: RECT; 17 part { name: "clipper"; type: RECT;
19 description { state: "default" 0.0; 18 description { state: "default" 0.0;
@@ -21,7 +20,6 @@ group { "efl/bg";
21 } 20 }
22 part { name: "base"; type: RECT; 21 part { name: "base"; type: RECT;
23 description { state: "default" 0.0; 22 description { state: "default" 0.0;
24 color_class: "dialog_base";
25 color: 64 64 64 255; 23 color: 64 64 64 255;
26 } 24 }
27 } 25 }
@@ -35,14 +33,6 @@ group { "efl/bg";
35 fixed: 1 1; 33 fixed: 1 1;
36 } 34 }
37 } 35 }
38 part { name: "bevel";
39 description { state: "default" 0.0;
40 image.normal: "bevel_dark_out.png";
41 image.border: 1 1 1 1;
42 image.middle: 0;
43 fill.smooth: 0;
44 }
45 }
46 part { name: "efl.content"; type: SWALLOW; required; 36 part { name: "efl.content"; type: SWALLOW; required;
47 description { state: "default" 0.0; 37 description { state: "default" 0.0;
48 } 38 }
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index 71ec6d2e7f..475b96f405 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -8,28 +8,52 @@
8 */ 8 */
9 9
10group { "efl/border"; data.item: "version" "123"; 10group { "efl/border"; data.item: "version" "123";
11 images.image: "vgrad_med_lighter.png" COMP; 11 images.image: "win_shad_flat.png" COMP;
12 images.image: "vgrad_med_dark.png" COMP;
13 images.image: "bevel_out.png" COMP;
14 images.image: "shine.png" COMP;
15 images.image: "bevel_dark_out.png" COMP;
16 images.image: "sym_close_dark_normal.png" COMP;
17 images.image: "sym_close_dark_selected.png" COMP;
18 images.image: "sym_close_light_normal.png" COMP;
19 images.image: "sym_close_light_selected.png" COMP;
20 images.image: "sym_down_dark_normal.png" COMP;
21 images.image: "sym_down_dark_selected.png" COMP;
22 images.image: "sym_down_light_normal.png" COMP;
23 images.image: "sym_down_light_selected.png" COMP;
24 images.image: "sym_up_dark_normal.png" COMP;
25 images.image: "sym_up_dark_selected.png" COMP;
26 images.image: "sym_up_light_normal.png" COMP;
27 images.image: "sym_up_light_selected.png" COMP;
28 images.image: "glow_round_corners_small.png" COMP;
29 images.image: "knob_round_small_busy.png" COMP;
30 images.image: "screen_circular_shadow.png" COMP;
31 images.image: "win_shadow.png" COMP;
32 data.item: "shadow" "1"; 12 data.item: "shadow" "1";
13#define BORDERLESS 1
14#define MAXIMIZED 2
15#define UNRESIZABLE 4
16#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
17#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
18
19#define INDICATOR_TYPE_UNKNOWN 0
20#define INDICATOR_TYPE_BG_OPAQUE 1
21#define INDICATOR_TYPE_BG_TRANSPARENT 2
22#define INDICATOR_TYPE_HIDDEN 3
23 script {
24 public hide_shadow;
25 public show_menu;
26 public eval_shadow_menu() {
27 new m_show = get_int(show_menu);
28 new s_hide = get_int(hide_shadow);
29
30 if (s_hide) {
31 set_state(PART:"shadow_clip", "hidden", 0.0);
32 set_state(PART:"shadow_base", "hidden", 0.0);
33 } else {
34 set_state(PART:"shadow_clip", "default", 0.0);
35 set_state(PART:"shadow_base", "default", 0.0);
36 }
37 if ((m_show)/* && (s_hide)*/) {
38 set_state(PART:"efl.menu", "visible", 0.0);
39 } else {
40 set_state(PART:"efl.menu", "default", 0.0);
41 }
42 }
43
44 public border_mode;
45 public indicator_type = 0;
46 public indicator_enabled = 0;
47 public eval_mode(m) {
48 if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
49 set_state(PART:"bottom_clip", "hidden", 0.0);
50 set_state(PART:"top_resize_clip", "hidden", 0.0);
51 } else {
52 set_state(PART:"bottom_clip", "default", 0.0);
53 set_state(PART:"top_resize_clip", "default", 0.0);
54 }
55 }
56 }
33 parts { 57 parts {
34 /* opaque region of the window, to inform the compositor */ 58 /* opaque region of the window, to inform the compositor */
35 spacer { "efl.spacer.opaque"; 59 spacer { "efl.spacer.opaque";
@@ -49,9 +73,17 @@ group { "efl/border"; data.item: "version" "123";
49 rel2.relative: 1.0 0.0; 73 rel2.relative: 1.0 0.0;
50 } 74 }
51 } 75 }
52 /* shadow spacer and clipper */ 76 part { name: "shadow_clip"; type: RECT; mouse_events: 0;
53 spacer { "shadow_spacer"; 77 description { state: "default";
54 desc { "default"; 78 rel.to: "_sh1";
79 }
80 description { state: "hidden";
81 visible: 0;
82 }
83 }
84 part { name: "shadow_base"; type: SPACER;
85 scale: 1;
86 description { state: "default" 0.0;
55 WIN_SHADOW_SPACER; 87 WIN_SHADOW_SPACER;
56 } 88 }
57 desc { "hidden"; 89 desc { "hidden";
@@ -59,16 +91,9 @@ group { "efl/border"; data.item: "version" "123";
59 rel2.offset: -1 -1; 91 rel2.offset: -1 -1;
60 } 92 }
61 } 93 }
62 image { "shadow"; nomouse; 94 WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
63 desc { "default";
64 rel.to: "shadow_spacer";
65 WIN_SHADOW;
66 }
67 desc { "hidden"; inherit: "default"; hid; }
68 }
69 /* window background: solid color */ 95 /* window background: solid color */
70 rect { "bg_clip"; 96 rect { "bg_clip"; nomouse;
71 nomouse;
72 desc { "default"; 97 desc { "default";
73 rel1.to: "top_clip"; 98 rel1.to: "top_clip";
74 rel1.relative: 0.0 1.0; 99 rel1.relative: 0.0 1.0;
@@ -79,8 +104,10 @@ group { "efl/border"; data.item: "version" "123";
79 required; // @since 1.19 104 required; // @since 1.19
80 clip: "bg_clip"; 105 clip: "bg_clip";
81 desc { "default"; 106 desc { "default";
107// color: 64 64 64 255;
82 color: 255 255 255 255; 108 color: 255 255 255 255;
83 color_class: "elm/win/background"; // FIXME: color_class naming scheme 109 color_class: "elm/win/background"; // FIXME: color_class naming scheme
110 rel.to: "efl.spacer.content";
84 visible: 0; 111 visible: 0;
85 } 112 }
86 desc { "visible"; 113 desc { "visible";
@@ -92,21 +119,8 @@ group { "efl/border"; data.item: "version" "123";
92 swallow { "efl.background"; 119 swallow { "efl.background";
93 required; // @since 1.19 120 required; // @since 1.19
94 clip: "client_clip"; 121 clip: "client_clip";
95 }
96 image { "background_bevel";
97 desc { "default"; 122 desc { "default";
98 image {
99 normal: "bevel_dark_out.png";
100 border: 1 1 1 1;
101 middle: 0;
102 }
103 fill.smooth: 0;
104 rel.to: "efl.spacer.content"; 123 rel.to: "efl.spacer.content";
105 visible: 0;
106 }
107 desc { "visible";
108 inherit: "default";
109 visible: 1;
110 } 124 }
111 } 125 }
112 spacer { "indicator_spacer"; 126 spacer { "indicator_spacer";
@@ -127,18 +141,26 @@ group { "efl/border"; data.item: "version" "123";
127 color: 64 64 64 255; // FIXME: color_class 141 color: 64 64 64 255; // FIXME: color_class
128 align: 0.5 0.0; 142 align: 0.5 0.0;
129 rel.to: "efl.menu"; 143 rel.to: "efl.menu";
144 fixed: 1 1;
145 visible: 0;
130 } 146 }
131 } 147 }
132 swallow { "efl.menu"; required; 148 swallow { "efl.menu";
133 required: 1; // since 1.19 149 required: 1; // since 1.19
134 desc { "default"; 150 desc { "default";
135 rel.to: "indicator_spacer"; 151 rel.to: "top_clip";
136 rel1.relative: 0.0 1.0;
137 visible: 0; 152 visible: 0;
138 align: 0.5 0.0; 153 align: 0.5 1.0;
139 fixed: 1 1; 154 fixed: 1 1;
155 rel2.relative: 1.0 1.0;
156 rel1.offset: 0 -1;
157// debug...
158//min: 0 40;
140 } 159 }
141 desc { "visible"; inherit: "default"; 160 desc { "visible"; inherit: "default";
161 // GGGG
162 rel1.offset: 0 0;
163 align: 0.5 0.0;
142 visible: 1; 164 visible: 1;
143 fixed: 0 1; 165 fixed: 0 1;
144 } 166 }
@@ -165,6 +187,7 @@ group { "efl/border"; data.item: "version" "123";
165 clip: "client_clip"; 187 clip: "client_clip";
166 desc { "default"; 188 desc { "default";
167 rel.to: "client_spacer"; 189 rel.to: "client_spacer";
190 visible: 1;
168 } 191 }
169 } 192 }
170 193
@@ -189,16 +212,21 @@ group { "efl/border"; data.item: "version" "123";
189 212
190 /* top title bar - spacer and clipper */ 213 /* top title bar - spacer and clipper */
191 rect { "top_clip"; //nomouse; 214 rect { "top_clip"; //nomouse;
215 scale: 1;
192 desc { "default"; 216 desc { "default";
193 rel1.to: "shadow_spacer"; 217 rel1.to: "shadow_base";
194 rel2.to_y: "title2"; 218 rel2.to_x: "shadow_base";
195 rel2.to_x: "shadow_spacer"; 219 rel2.to_y: "efl.text.title";
220 rel2.offset: -1 2;
196 vis; 221 vis;
222 offscale;
197 } 223 }
198 desc { "hidden"; 224 desc { "hidden";
199 inherit: "default"; 225 inherit: "default";
226 rel.to: "";
200 rel1.relative: 0.0 0.0; 227 rel1.relative: 0.0 0.0;
201 rel2.to: "shadow_spacer"; 228 rel1.offset: 0 -1;
229 rel2.to: "shadow_base";
202 rel2.relative: 1.0 0.0; 230 rel2.relative: 1.0 0.0;
203 rel2.offset: -1 -1; 231 rel2.offset: -1 -1;
204 max: -1 0; 232 max: -1 0;
@@ -208,93 +236,48 @@ group { "efl/border"; data.item: "version" "123";
208 } 236 }
209 } 237 }
210 /* top title bar */ 238 /* top title bar */
211 image { "top"; nomouse; 239 part { name: "top"; type: RECT;
212 clip: "top_clip"; 240 clip: "top_clip";
213 desc { "default"; 241 description { state: "default" 0.0;
214 image.normal: "vgrad_med_lighter.png";
215 rel.to: "top_clip"; 242 rel.to: "top_clip";
216 fill.smooth: 0; 243 color: 64 64 64 255;
217 TILED_HORIZ(120)
218 color_class: "border_frame";
219 } 244 }
220 desc { "focused"; 245 description { state: "focused" 0.0;
221 inherit: "default"; 246 inherit: "default" 0.0;
222 image.normal: "vgrad_med_dark.png"; 247 color: 32 32 32 255;
223 color_class: "border_frame_active";
224 } 248 }
225 } 249 }
226 image { "bevel"; nomouse; 250 part { name: "efl.text.title"; type: TEXT; mouse_events: 0;
227 clip: "top_clip";
228 desc { "default";
229 image.normal: "bevel_out.png";
230 image.border: 1 1 1 1;
231 image.middle: 0;
232 rel.to: "top_clip";
233 fill.smooth: 0;
234 }
235 }
236 text { "efl.text.title"; nomouse;
237 scale: 1; 251 scale: 1;
238 effect: SHADOW BOTTOM;
239 clip: "top_clip"; 252 clip: "top_clip";
240 desc { "default"; 253 description { state: "default" 0.0;
241 rel1.relative: 1.0 0.0; 254 rel1.relative: 1.0 0.0;
242 rel1.offset: 1 3; 255 rel1.offset: 1 4;
243 rel1.to_x: "event.icon"; 256 rel1.to_x: "icon";
244 rel1.to_y: "shadow_spacer"; 257 rel1.to_y: "shadow_base";
245 rel2.relative: 0.0 0.0; 258 rel2.relative: 0.0 0.0;
246 rel2.offset: -2 3; 259 rel2.offset: -2 4;
247 rel2.to_x: "event.minimize"; 260 rel2.to_x: "event.minimize";
248 rel2.to_y: "shadow_spacer"; 261 rel2.to_y: "shadow_base";
249 align: 0.5 0.0; 262 align: 0.5 0.0;
250 color_class: "border_title"; 263 color: 160 160 160 255;
251 color3: 255 255 255 255; 264 min: 0 16;
252 text { font: FNBD; size: 10; 265 text { font: FNBD; size: 10;
253 text_class: "title_bar"; 266 text_class: "title_bar";
254 align: 0.5 0.0; 267 align: 0.5 0.0;
255 min: 0 1; 268 min: 0 1;
256 } 269 }
257 fixed: 0 1; 270 fixed: 0 1;
271 offscale;
258 } 272 }
259 desc { "focused"; 273 description { state: "focused" 0.0;
260 inherit: "default"; 274 inherit: "default" 0.0;
261 visible: 0; 275 color: 255 255 255 255;
262 }
263 }
264 text { "title2"; nomouse;
265 scale: 1;
266 effect: SOFT_SHADOW BOTTOM;
267 clip: "top_clip";
268 desc { "default";
269 rel1.relative: 1.0 0.0;
270 rel1.offset: 1 2;
271 rel1.to_x: "event.icon";
272 rel1.to_y: "shadow_spacer";
273 rel2.relative: 0.0 0.0;
274 rel2.offset: -1 2;
275 rel2.to_x: "event.minimize";
276 rel2.to_y: "shadow_spacer";
277 align: 0.5 0.0;
278 color_class: "border_title_active";
279 color3: 255 255 255 255;
280 text { font: FNBD; size: 10;
281 text_source: "efl.text.title";
282 text_class: "title_bar";
283 align: 0.5 0.0;
284 min: 0 1;
285 }
286 fixed: 0 1;
287 visible: 0;
288 }
289 desc { "focused";
290 inherit: "default";
291 visible: 1;
292 } 276 }
293 } 277 }
294 spacer { "icon"; 278 spacer { "icon";
295 desc { "default"; 279 desc { "default";
296 rel1.to: "event.icon"; 280 rel.to: "event.icon";
297 rel2.to: "event.icon";
298 } 281 }
299 desc { "bounce1"; 282 desc { "bounce1";
300 inherit: "default"; 283 inherit: "default";
@@ -307,7 +290,7 @@ group { "efl/border"; data.item: "version" "123";
307 rel2.relative: 1.2 1.2; 290 rel2.relative: 1.2 1.2;
308 } 291 }
309 } 292 }
310 swallow { "efl.icon"; nomouse; required; 293 swallow { "efl.icon"; nomouse;
311 clip_to: "top_clip"; 294 clip_to: "top_clip";
312 desc { "default"; 295 desc { "default";
313 rel1.to: "icon"; 296 rel1.to: "icon";
@@ -317,54 +300,9 @@ group { "efl/border"; data.item: "version" "123";
317 rel2.offset: 0 0; 300 rel2.offset: 0 0;
318 } 301 }
319 } 302 }
320 rect { "busy_clip"; nomouse;
321 desc { "default";
322 color: 255 255 255 0;
323 visible: 0;
324 }
325 desc { "hung";
326 inherit: "default";
327 color: 255 255 255 255;
328 visible: 1;
329 }
330 }
331 image { "knob"; nomouse;
332 clip: "busy_clip";
333 desc { "default";
334 fixed: 1 1;
335 image.normal: "knob_round_small_busy.png";
336 aspect: 1.0 1.0; aspect_preference: VERTICAL;
337 max: 20 20;
338 rel1.relative: 1.0 0.0;
339 rel1.offset: 2 -0;
340 rel1.to: "event.icon";
341 rel2.relative: 1.0 1.0;
342 rel2.offset: 2 -1;
343 rel2.to: "event.icon";
344 align: 0.0 0.5;
345 fixed: 1 1;
346 }
347 }
348 image { "knob_spinner"; nomouse;
349 clip: "busy_clip";
350 desc { "default";
351 fixed: 1 1;
352 rel1.to: "knob";
353 rel2.to: "knob";
354 image.normal: "glow_round_corners_small.png";
355 map.on: 1;
356 map.smooth: 1;
357 map.rotation.center: "knob";
358 }
359 desc { "spin";
360 inherit: "default";
361 map.rotation.z: 360;
362 }
363 }
364 rect { "clip1"; nomouse; 303 rect { "clip1"; nomouse;
365 desc { "default"; 304 desc { "default";
366 rel1.to: "top_clip"; 305 rel.to: "top_clip";
367 rel2.to: "top_clip";
368 } 306 }
369 desc { "focused"; 307 desc { "focused";
370 inherit: "default"; 308 inherit: "default";
@@ -373,8 +311,7 @@ group { "efl/border"; data.item: "version" "123";
373 } 311 }
374 rect { "clip2"; nomouse; 312 rect { "clip2"; nomouse;
375 desc { "default"; 313 desc { "default";
376 rel1.to: "top_clip"; 314 rel.to: "top_clip";
377 rel2.to: "top_clip";
378 visible: 0; 315 visible: 0;
379 } 316 }
380 desc { "focused"; 317 desc { "focused";
@@ -384,92 +321,92 @@ group { "efl/border"; data.item: "version" "123";
384 } 321 }
385 image { "close1"; nomouse; 322 image { "close1"; nomouse;
386 clip: "clip1"; 323 clip: "clip1";
324 scale: 1;
387 desc { "default"; 325 desc { "default";
388 image.normal: "sym_close_dark_normal.png"; 326 image.normal: "i-close";
389 rel1.to: "event.close"; 327 rel.to: "event.close";
390 rel2.to: "event.close"; 328 min: 15 15; max: 15 15;
391 min: 15 15;
392 max: 15 15;
393 fixed: 1 1; 329 fixed: 1 1;
330 color: 160 160 160 255;
394 } 331 }
395 desc { "selected"; 332 desc { "selected";
396 inherit: "default"; 333 inherit: "default";
397 image.normal: "sym_close_dark_selected.png"; 334 color: 255 255 255 255;
398 } 335 }
399 } 336 }
400 image { "max1"; nomouse; 337 image { "max1"; nomouse;
401 clip: "clip1"; 338 clip: "clip1";
339 scale: 1;
402 desc { "default"; 340 desc { "default";
403 image.normal: "sym_up_dark_normal.png"; 341 image.normal: "i-arrow-u";
404 rel1.to: "event.maximize"; 342 rel.to: "event.maximize";
405 rel2.to: "event.maximize"; 343 min: 15 15; max: 15 15;
406 min: 15 15;
407 max: 15 15;
408 fixed: 1 1; 344 fixed: 1 1;
345 color: 160 160 160 255;
409 } 346 }
410 desc { "selected"; 347 desc { "selected";
411 inherit: "default"; 348 inherit: "default";
412 image.normal: "sym_up_dark_selected.png"; 349 color: 255 255 255 255;
413 } 350 }
414 } 351 }
415 image { "min1"; nomouse; 352 image { "min1"; nomouse;
416 clip: "clip1"; 353 clip: "clip1";
354 scale: 1;
417 desc { "default"; 355 desc { "default";
418 image.normal: "sym_down_dark_normal.png"; 356 image.normal: "i-arrow-d";
419 rel1.to: "event.minimize"; 357 rel.to: "event.minimize";
420 rel2.to: "event.minimize"; 358 min: 15 15; max: 15 15;
421 min: 15 15;
422 max: 15 15;
423 fixed: 1 1; 359 fixed: 1 1;
360 color: 160 160 160 255;
424 } 361 }
425 desc { "selected"; 362 desc { "selected";
426 inherit: "default"; 363 inherit: "default";
427 image.normal: "sym_down_dark_selected.png"; 364 color: 255 255 255 255;
428 } 365 }
429 } 366 }
430 image { "close2"; nomouse; 367 image { "close2"; nomouse;
431 clip: "clip2"; 368 clip: "clip2";
369 scale: 1;
432 desc { "default"; 370 desc { "default";
433 image.normal: "sym_close_light_normal.png"; 371 image.normal: "i-close";
434 rel1.to: "event.close"; 372 rel.to: "event.close";
435 rel2.to: "event.close"; 373 min: 15 15; max: 15 15;
436 min: 15 15;
437 max: 15 15;
438 fixed: 1 1; 374 fixed: 1 1;
375 color: 255 255 255 255;
439 } 376 }
440 desc { "selected"; 377 desc { "selected";
441 inherit: "default"; 378 inherit: "default";
442 image.normal: "sym_close_light_selected.png"; 379 color: 220 220 220 255;
443 } 380 }
444 } 381 }
445 image { "max2"; nomouse; 382 image { "max2"; nomouse;
446 clip: "clip2"; 383 clip: "clip2";
384 scale: 1;
447 desc { "default"; 385 desc { "default";
448 image.normal: "sym_up_light_normal.png"; 386 image.normal: "i-arrow-u";
449 rel1.to: "event.maximize"; 387 rel.to: "event.maximize";
450 rel2.to: "event.maximize"; 388 min: 15 15; max: 15 15;
451 min: 15 15;
452 max: 15 15;
453 fixed: 1 1; 389 fixed: 1 1;
390 color: 255 255 255 255;
454 } 391 }
455 desc { "selected"; 392 desc { "selected";
456 inherit: "default"; 393 inherit: "default";
457 image.normal: "sym_up_light_selected.png"; 394 color: 220 220 220 255;
458 } 395 }
459 } 396 }
460 image { "min2"; nomouse; 397 image { "min2"; nomouse;
461 clip: "clip2"; 398 clip: "clip2";
399 scale: 1;
462 desc { "default"; 400 desc { "default";
463 image.normal: "sym_down_light_normal.png"; 401 image.normal: "i-arrow-d";
464 rel1.to: "event.minimize"; 402 rel.to: "event.minimize";
465 rel2.to: "event.minimize"; 403 min: 15 15; max: 15 15;
466 min: 15 15;
467 max: 15 15;
468 fixed: 1 1; 404 fixed: 1 1;
405 color: 255 255 255 255;
469 } 406 }
470 desc { "selected"; 407 desc { "selected";
471 inherit: "default"; 408 inherit: "default";
472 image.normal: "sym_down_light_selected.png"; 409 color: 220 220 220 255;
473 } 410 }
474 } 411 }
475 rect { "event.icon"; 412 rect { "event.icon";
@@ -545,11 +482,13 @@ group { "efl/border"; data.item: "version" "123";
545 } 482 }
546 rect { "efl.event.resize.tl"; 483 rect { "efl.event.resize.tl";
547 clip: "top_resize_clip"; 484 clip: "top_resize_clip";
485 scale: 1;
548 desc { "default"; 486 desc { "default";
549 rel.to: "top_clip"; 487 rel.to: "top_clip";
550 rel2.relative: 0.0 0.0; 488 rel2.relative: 0.0 0.0;
551 min: 32 4; 489 rel2.offset: 31 3;
552 align: 0.0 0.0; 490 min: 40 6;
491 align: 1.0 1.0;
553 color: 0 0 0 0; 492 color: 0 0 0 0;
554 fixed: 1 1; 493 fixed: 1 1;
555 } 494 }
@@ -557,15 +496,14 @@ group { "efl/border"; data.item: "version" "123";
557 } 496 }
558 rect { "efl.event.resize.t"; 497 rect { "efl.event.resize.t";
559 clip: "top_resize_clip"; 498 clip: "top_resize_clip";
499 scale: 1;
560 desc { "default"; 500 desc { "default";
501 rel1.to: "efl.event.resize.tl";
561 rel1.relative: 1.0 0.0; 502 rel1.relative: 1.0 0.0;
562 rel1.to_y: "top_clip"; 503 rel2.to: "efl.event.resize.tr";
563 rel1.to_x: "efl.event.resize.tl"; 504 rel2.relative: 0.0 1.0;
564 rel2.relative: 0.0 0.0; 505 min: 0 6;
565 rel2.to_x: "efl.event.resize.tr"; 506 align: 0.5 1.0;
566 rel2.to_y: "top_clip";
567 min: 0 4;
568 align: 0.5 0.0;
569 color: 0 0 0 0; 507 color: 0 0 0 0;
570 fixed: 1 1; 508 fixed: 1 1;
571 } 509 }
@@ -573,12 +511,15 @@ group { "efl/border"; data.item: "version" "123";
573 } 511 }
574 rect { "efl.event.resize.tr"; 512 rect { "efl.event.resize.tr";
575 clip: "top_resize_clip"; 513 clip: "top_resize_clip";
514 scale: 1;
576 desc { "default"; 515 desc { "default";
577 rel.to: "top_clip"; 516 rel.to: "top_clip";
578 rel1.relative: 1.0 0.0; 517 rel1.relative: 1.0 0.0;
518 rel1.offset: -32 0;
579 rel2.relative: 1.0 0.0; 519 rel2.relative: 1.0 0.0;
580 min: 32 4; 520 rel2.offset: -1 3;
581 align: 1.0 0.0; 521 min: 40 6;
522 align: 0.0 1.0;
582 color: 0 0 0 0; 523 color: 0 0 0 0;
583 fixed: 1 1; 524 fixed: 1 1;
584 } 525 }
@@ -594,94 +535,76 @@ group { "efl/border"; data.item: "version" "123";
594 } 535 }
595 } 536 }
596 rect { "bottom_clip"; 537 rect { "bottom_clip";
538 scale: 1;
597 desc { "default"; 539 desc { "default";
598 rel.to: "shadow_spacer"; 540 rel.to: "shadow_base";
599 rel1 { relative: 0.0 1.0; offset: 0 -5; } 541 rel1 { relative: 0.0 1.0; offset: 0 -1; }
542 align: 0.0 1.0;
600 min: 0 5; 543 min: 0 5;
601 fixed: 0 1; 544 fixed: 0 1;
602 } 545 }
603 desc { "hidden"; 546 desc { "hidden";
604 inherit: "default"; 547 inherit: "default";
605 rel1 { relative: 0.0 1.0; offset: 0 0; } 548 rel1 { relative: 0.0 1.0; offset: 0 0; }
549 rel2 { relative: 1.0 1.0; offset: 0 0; }
606 min: 0 0; 550 min: 0 0;
607 hid; 551 hid;
608 } 552 }
609 } 553 }
610 rect { "bottom"; 554 part { name: "bottom"; type: RECT; mouse_events: 0;
611 nomouse;
612 desc { "default";
613 color_class: "border_bottom";
614 color: 64 64 64 255; /* FIXME */
615 rel.to: "bottom_clip";
616 }
617 }
618 image { "bevel2"; nomouse;
619 clip: "bottom_clip"; 555 clip: "bottom_clip";
620 desc { "default"; 556 description { state: "default" 0.0;
621 image.normal: "bevel_dark_out.png"; 557 color: 64 64 64 255;
622 image.border: 1 1 1 1;
623 image.middle: 0;
624 rel.to: "bottom_clip"; 558 rel.to: "bottom_clip";
625 fill.smooth: 0;
626 } 559 }
627 } 560 }
561
628 rect { "efl.event.resize.bl"; 562 rect { "efl.event.resize.bl";
629 clip: "bottom_clip"; 563 clip: "bottom_clip";
564 scale: 1;
630 desc { "default"; 565 desc { "default";
631 rel1.relative: 0.0 1.0; 566 rel.to: "bottom_clip";
632 rel1.to: "bottom_clip";
633 rel2.relative: 0.0 1.0; 567 rel2.relative: 0.0 1.0;
634 rel2.to: "bottom_clip"; 568 rel2.offset: 31 -1;
635 min: 32 5; 569 min: 40 10;
636 align: 0.0 1.0; 570 align: 0.0 0.5;
637 color: 0 0 0 0; 571 color: 0 0 0 0;
638 fixed: 1 1; 572 fixed: 1 1;
573 offscale;
639 } 574 }
640 desc { "hidden"; inherit: "default"; hid; } 575 desc { "hidden"; inherit: "default"; hid; }
641 } 576 }
642 rect { "efl.event.resize.b"; 577 rect { "efl.event.resize.b";
643 clip: "bottom_clip"; 578 clip: "bottom_clip";
579 scale: 1;
644 desc { "default"; 580 desc { "default";
645 rel1.relative: 1.0 1.0; 581 rel1.to: "efl.event.resize.bl";
646 rel1.to_x: "efl.event.resize.tl"; 582 rel1.relative: 1.0 0.0;
647 rel1.to_y: "bottom_clip"; 583 rel2.to: "efl.event.resize.br";
648 rel1.offset: 0 -1;
649 rel2.relative: 0.0 1.0; 584 rel2.relative: 0.0 1.0;
650 rel2.to_x: "efl.event.resize.tr"; 585 min: 0 10;
651 rel2.to_y: "bottom_clip"; 586 align: 0.5 0.5;
652 min: 0 5;
653 align: 0.5 1.0;
654 color: 0 0 0 0; 587 color: 0 0 0 0;
655 fixed: 0 1; 588 fixed: 1 1;
589 offscale;
656 } 590 }
657 desc { "hidden"; inherit: "default"; hid; } 591 desc { "hidden"; inherit: "default"; hid; }
658 } 592 }
659 rect { "efl.event.resize.br"; 593 rect { "efl.event.resize.br";
660 clip: "bottom_clip"; 594 clip: "bottom_clip";
595 scale: 1;
661 desc { "default"; 596 desc { "default";
662 rel1.relative: 1.0 1.0; 597 rel.to: "bottom_clip";
663 rel1.to: "bottom_clip"; 598 rel1.relative: 1.0 0.0;
664 rel2.relative: 1.0 1.0; 599 rel1.offset: -32 0;
665 rel2.to: "bottom_clip"; 600 min: 40 10;
666 min: 32 5; 601 align: 0.0 0.5;
667 align: 1.0 1.0;
668 color: 0 0 0 0; 602 color: 0 0 0 0;
669 fixed: 1 1; 603 fixed: 1 1;
604 offscale;
670 } 605 }
671 desc { "hidden"; inherit: "default"; hid; } 606 desc { "hidden"; inherit: "default"; hid; }
672 } 607 }
673 /* top title bar decoration */
674 image { "shine"; nomouse;
675 clip: "top_clip";
676 desc { "default";
677 image.normal: "shine.png";
678 rel.to: "top_clip";
679 rel1.offset: 0 -2;
680 rel2.relative: 1.0 0.0;
681 rel2.offset: -1 2;
682 FIXED_SIZE(69, 5)
683 }
684 }
685 rect { "indicator_bg"; 608 rect { "indicator_bg";
686 clip: "bg_clip"; 609 clip: "bg_clip";
687 desc { "default"; 610 desc { "default";
@@ -693,7 +616,7 @@ group { "efl/border"; data.item: "version" "123";
693 color: 0 0 0 0; 616 color: 0 0 0 0;
694 } 617 }
695 } 618 }
696 swallow { "efl.indicator"; required; 619 swallow { "efl.indicator";
697 clip: "bg_clip"; 620 clip: "bg_clip";
698 desc { "default"; 621 desc { "default";
699 rel.to: "top_clip"; 622 rel.to: "top_clip";
@@ -712,41 +635,14 @@ group { "efl/border"; data.item: "version" "123";
712 } 635 }
713 } 636 }
714 637
715#define BORDERLESS 1
716#define MAXIMIZED 2
717#define UNRESIZABLE 4
718#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
719#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
720
721#define INDICATOR_TYPE_UNKNOWN 0
722#define INDICATOR_TYPE_BG_OPAQUE 1
723#define INDICATOR_TYPE_BG_TRANSPARENT 2
724#define INDICATOR_TYPE_HIDDEN 3
725
726 programs { 638 programs {
727 script { 639 program { signal: "efl,state,borderless,on"; source: "efl";
728 public border_mode;
729 public indicator_type = 0;
730 public indicator_enabled = 0;
731 public eval_mode(m) {
732 if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
733 set_state(PART:"bottom_clip", "hidden", 0.0);
734 set_state(PART:"top_resize_clip", "hidden", 0.0);
735 } else {
736 set_state(PART:"bottom_clip", "default", 0.0);
737 set_state(PART:"top_resize_clip", "default", 0.0);
738 }
739 }
740 }
741 program {
742 signal: "efl,state,borderless,on"; source: "efl";
743 action: STATE_SET "hidden"; 640 action: STATE_SET "hidden";
744 targets: "top_clip" "bottom_clip"; 641 targets: "top_clip" "bottom_clip";
745 after: "borderless,on"; 642 after: "borderless,on";
746 } 643 }
747 program { "borderless,on"; SET_MODE(BORDERLESS); } 644 program { "borderless,on"; SET_MODE(BORDERLESS); }
748 program { 645 program { signal: "efl,state,borderless,off"; source: "efl";
749 signal: "efl,state,borderless,off"; source: "efl";
750 action: STATE_SET "default"; 646 action: STATE_SET "default";
751 targets: "top_clip" "bottom_clip"; 647 targets: "top_clip" "bottom_clip";
752 after: "borderless,off"; 648 after: "borderless,off";
@@ -756,60 +652,75 @@ group { "efl/border"; data.item: "version" "123";
756 signal: "efl,state,unresizable,on"; source: "efl"; 652 signal: "efl,state,unresizable,on"; source: "efl";
757 SET_MODE(UNRESIZABLE); 653 SET_MODE(UNRESIZABLE);
758 } 654 }
759 program { 655 program { signal: "efl,state,unresizable,off"; source: "efl";
760 signal: "efl,state,unresizable,off"; source: "efl";
761 UNSET_MODE(UNRESIZABLE); 656 UNSET_MODE(UNRESIZABLE);
762 } 657 }
763 program { 658 program { signal: "efl,state,shadow,on"; source: "efl";
764 signal: "efl,state,shadow,on"; source: "efl"; 659 script {
765 action: STATE_SET "default"; 660 set_int(hide_shadow, 0);
766 targets: "shadow_spacer" "shadow"; 661 eval_shadow_menu();
662 }
663// action: STATE_SET "default";
664// target: "shadow_clip";
665// target: "shadow_base";
767 } 666 }
768 program { 667 program { signal: "efl,state,shadow,off"; source: "efl";
769 signal: "efl,state,shadow,off"; source: "efl"; 668 script {
770 action: STATE_SET "hidden"; 669 set_int(hide_shadow, 1);
771 targets: "shadow_spacer" "shadow"; 670 eval_shadow_menu();
671 }
672// action: STATE_SET "hidden";
673// target: "shadow_clip";
674// target: "shadow_base";
772 } 675 }
773 program { 676 /* application desktop menu */
774 signal: "efl,state,background,solid,on"; source: "efl"; 677 program { signal: "efl,action,show_menu"; source: "efl";
775 action: STATE_SET "visible"; 678 script {
776 target: "efl.rect.background"; 679 set_int(show_menu, 1);
680 eval_shadow_menu();
681 }
682// action: STATE_SET "visible";
683// target: "efl.menu";
777 } 684 }
778 program { 685 program { signal: "efl,action,hide"; source: "efl";
779 signal: "efl,state,background,solid,off"; source: "efl"; 686 script {
780 action: STATE_SET "default"; 687 set_int(show_menu, 0);
781 target: "efl.rect.background"; 688 eval_shadow_menu();
689 }
690// action: STATE_SET "default";
691// target: "efl.menu";
782 } 692 }
783 program { 693 program { signal: "efl,state,background,solid,on"; source: "efl";
784 signal: "efl,state,background,standard,on"; source: "efl";
785 action: STATE_SET "visible"; 694 action: STATE_SET "visible";
786 target: "background_bevel"; 695 target: "efl.rect.background";
787 } 696 }
788 program { 697 program { signal: "efl,state,background,solid,off"; source: "efl";
789 signal: "efl,state,background,standard,off"; source: "efl";
790 action: STATE_SET "default"; 698 action: STATE_SET "default";
791 target: "background_bevel"; 699 target: "efl.rect.background";
792 } 700 }
793 program { 701// program { signal: "efl,state,background,standard,on"; source: "efl";
794 signal: "efl,action,focus"; source: "efl"; 702// action: STATE_SET "visible";
703// target: "background_bevel";
704// }
705// program { signal: "efl,state,background,standard,off"; source: "efl";
706// action: STATE_SET "default";
707// target: "background_bevel";
708// }
709 program { signal: "efl,action,focus"; source: "efl";
795 action: STATE_SET "focused"; 710 action: STATE_SET "focused";
796 target: "top"; 711 target: "top";
797 target: "efl.text.title"; 712 target: "efl.text.title";
798 target: "title2";
799 target: "clip1"; 713 target: "clip1";
800 target: "clip2"; 714 target: "clip2";
801 } 715 }
802 program { 716 program { signal: "efl,action,unfocus"; source: "efl";
803 signal: "efl,action,unfocus"; source: "efl";
804 action: STATE_SET "default"; 717 action: STATE_SET "default";
805 target: "top"; 718 target: "top";
806 target: "efl.text.title"; 719 target: "efl.text.title";
807 target: "title2";
808 target: "clip1"; 720 target: "clip1";
809 target: "clip2"; 721 target: "clip2";
810 } 722 }
811 program { 723 program { signal: "efl,state,urgent"; source: "efl";
812 signal: "efl,state,urgent"; source: "efl";
813 action: STATE_SET "bounce1"; 724 action: STATE_SET "bounce1";
814 target: "icon"; 725 target: "icon";
815 after: "urg1"; 726 after: "urg1";
@@ -826,111 +737,64 @@ group { "efl/border"; data.item: "version" "123";
826 target: "icon"; 737 target: "icon";
827 after: "urg1"; 738 after: "urg1";
828 } 739 }
829 program { 740 program { signal: "efl,state,not_urgent"; source: "efl";
830 signal: "efl,state,not_urgent"; source: "efl";
831 action: STATE_SET "default"; 741 action: STATE_SET "default";
832 target: "icon"; 742 target: "icon";
833 } 743 }
834 program { name: "spin";
835 signal: "efl,state,hung"; source: "efl";
836 action: STATE_SET "spin";
837 transition: LINEAR 1.0;
838 target: "knob_spinner";
839 after: "spin2";
840 }
841 program { name: "spin2";
842 action: STATE_SET "default";
843 target: "knob_spinner";
844 after: "spin";
845 }
846 program {
847 signal: "efl,state,hung"; source: "efl";
848 action: STATE_SET "hung";
849 transition: SINUSOIDAL 0.25;
850 target: "busy_clip";
851 }
852 program {
853 signal: "efl,state,unhung"; source: "efl";
854 action: STATE_SET "default";
855 transition: SINUSOIDAL 1.0;
856 target: "busy_clip";
857 after: "spin3";
858 }
859 program { name: "spin3";
860 action: ACTION_STOP;
861 target: "spin";
862 target: "spin2";
863 after: "spin4";
864 }
865 program { name: "spin4";
866 action: STATE_SET "default";
867 target: "knob_spinner";
868 }
869 744
870 /* maximize & unmaximize */ 745 /* maximize & unmaximize */
871 program { 746 program { signal: "efl,state,maximize*"; source: "efl";
872 signal: "efl,state,maximize*"; source: "efl";
873 action: STATE_SET "max"; 747 action: STATE_SET "max";
874 target: "efl.spacer.opaque"; 748 target: "efl.spacer.opaque";
875 } 749 }
876 program { 750 program { signal: "efl,state,maximize*"; source: "efl";
877 signal: "efl,state,maximize*"; source: "efl";
878 SET_MODE(MAXIMIZED); 751 SET_MODE(MAXIMIZED);
879 } 752 }
880 program { 753 program { signal: "efl,state,unmaximize*"; source: "efl";
881 signal: "efl,state,unmaximize*"; source: "efl";
882 action: STATE_SET "default"; 754 action: STATE_SET "default";
883 target: "efl.spacer.opaque"; 755 target: "efl.spacer.opaque";
884 } 756 }
885 program { 757 program { signal: "efl,state,unmaximize*"; source: "efl";
886 signal: "efl,state,unmaximize*"; source: "efl";
887 UNSET_MODE(MAXIMIZED); 758 UNSET_MODE(MAXIMIZED);
888 } 759 }
889 760
890 /*indicator*/ 761 /*indicator*/
891 program { 762 program { signal: "efl,action,show_indicator"; source: "efl";
892 signal: "efl,action,show_indicator"; source: "efl";
893 script { 763 script {
894 set_int(indicator_enabled, 1); 764 set_int(indicator_enabled, 1);
895 } 765 }
896 after: "update_indicator"; 766 after: "update_indicator";
897 } 767 }
898 program { 768 program { signal: "efl,action,hide_indicator"; source: "efl";
899 signal: "efl,action,hide_indicator"; source: "efl";
900 script { 769 script {
901 set_int(indicator_enabled, 0); 770 set_int(indicator_enabled, 0);
902 } 771 }
903 after: "update_indicator"; 772 after: "update_indicator";
904 } 773 }
905 program { 774 program { signal: "efl,action,indicator,bg_opaque"; source: "efl";
906 signal: "efl,action,indicator,bg_opaque"; source: "efl";
907 script { 775 script {
908 set_int(indicator_type, INDICATOR_TYPE_BG_OPAQUE); 776 set_int(indicator_type, INDICATOR_TYPE_BG_OPAQUE);
909 } 777 }
910 after: "update_indicator"; 778 after: "update_indicator";
911 } 779 }
912 program { 780 program { signal: "efl,action,indicator,bg_transparent"; source: "efl";
913 signal: "efl,action,indicator,bg_transparent"; source: "efl";
914 script { 781 script {
915 set_int(indicator_type, INDICATOR_TYPE_BG_TRANSPARENT); 782 set_int(indicator_type, INDICATOR_TYPE_BG_TRANSPARENT);
916 } 783 }
917 after: "update_indicator"; 784 after: "update_indicator";
918 } 785 }
919 program { 786 program { signal: "efl,action,indicator,hidden"; source: "efl";
920 signal: "efl,action,indicator,hidden"; source: "efl";
921 script { 787 script {
922 set_int(indicator_type, INDICATOR_TYPE_HIDDEN); 788 set_int(indicator_type, INDICATOR_TYPE_HIDDEN);
923 } 789 }
924 after: "update_indicator"; 790 after: "update_indicator";
925 } 791 }
926 program { 792 program { signal: "efl,action,indicator,show_effect"; source: "efl";
927 signal: "efl,action,indicator,show_effect"; source: "efl";
928 action: STATE_SET "visible"; 793 action: STATE_SET "visible";
929 transition: DECELERATE 0.2; 794 transition: DECELERATE 0.2;
930 target: "efl.indicator"; 795 target: "efl.indicator";
931 } 796 }
932 program { 797 program { signal: "efl,action,indicator,hide_effect"; source: "efl";
933 signal: "efl,action,indicator,hide_effect"; source: "efl";
934 action: STATE_SET "hidden"; 798 action: STATE_SET "hidden";
935 transition: DECELERATE 0.2; 799 transition: DECELERATE 0.2;
936 target: "efl.indicator"; 800 target: "efl.indicator";
@@ -953,177 +817,132 @@ group { "efl/border"; data.item: "version" "123";
953 set_state(PART:"indicator_bg", "default", 0.0); 817 set_state(PART:"indicator_bg", "default", 0.0);
954 } 818 }
955 } else { 819 } else {
956 set_state(PART:"efl.indicator", "default", 0.0); 820 set_state(PART:"efl.indicator", "default", 0.0);
957 set_state(PART:"indicator_spacer", "default", 0.0); 821 set_state(PART:"indicator_spacer", "default", 0.0);
958 } 822 }
959 } 823 }
960 } 824 }
961 825
962 /* application desktop menu */
963 program { name: "show_menu";
964 signal: "efl,action,show_menu"; source: "efl";
965 action: STATE_SET "visible";
966 target: "efl.menu";
967 }
968 program { name: "hide_menu";
969 signal: "efl,action,hide"; source: "efl";
970 action: STATE_SET "default";
971 target: "efl.menu";
972 }
973
974 /* modal windows */ 826 /* modal windows */
975 program { name: "hide_blocker"; 827 program { signal: "efl,action,hide_blocker"; source: "efl";
976 signal: "efl,action,hide_blocker"; source: "efl";
977 action: STATE_SET "default" 0.0; 828 action: STATE_SET "default" 0.0;
978 target: "rect.blocker"; 829 target: "rect.blocker";
979 transition: DECELERATE 0.2; 830 transition: DECELERATE 0.2;
980 } 831 }
981 program { name: "show_blocker"; 832 program { signal: "efl,action,show_blocker"; source: "efl";
982 signal: "efl,action,show_blocker"; source: "efl";
983 action: STATE_SET "visible" 0.0; 833 action: STATE_SET "visible" 0.0;
984 target: "rect.blocker"; 834 target: "rect.blocker";
985 transition: DECELERATE 0.2; 835 transition: DECELERATE 0.2;
986 } 836 }
987 837
988 /* minimize, maximize & close buttons */ 838 /* minimize, maximize & close buttons */
989 program { 839 program { signal: "mouse,down,*"; source: "event.close";
990 signal: "mouse,down,*"; source: "event.close";
991 action: STATE_SET "selected"; 840 action: STATE_SET "selected";
992 target: "close1"; 841 target: "close1";
993 target: "close2"; 842 target: "close2";
994 } 843 }
995 program { 844 program { signal: "mouse,up,*"; source: "event.close";
996 signal: "mouse,up,*"; source: "event.close";
997 action: STATE_SET "default"; 845 action: STATE_SET "default";
998 target: "close1"; 846 target: "close1";
999 target: "close2"; 847 target: "close2";
1000 } 848 }
1001 program { 849 program { signal: "mouse,down,*"; source: "event.maximize";
1002 signal: "mouse,down,*"; source: "event.maximize";
1003 action: STATE_SET "selected"; 850 action: STATE_SET "selected";
1004 target: "max1"; 851 target: "max1";
1005 target: "max2"; 852 target: "max2";
1006 } 853 }
1007 program { 854 program { signal: "mouse,up,*"; source: "event.maximize";
1008 signal: "mouse,up,*"; source: "event.maximize";
1009 action: STATE_SET "default"; 855 action: STATE_SET "default";
1010 target: "max1"; 856 target: "max1";
1011 target: "max2"; 857 target: "max2";
1012 } 858 }
1013 program { 859 program { signal: "mouse,down,*"; source: "event.minimize";
1014 signal: "mouse,down,*"; source: "event.minimize";
1015 action: STATE_SET "selected"; 860 action: STATE_SET "selected";
1016 target: "min1"; 861 target: "min1";
1017 target: "min2"; 862 target: "min2";
1018 } 863 }
1019 program { 864 program { signal: "mouse,up,*"; source: "event.minimize";
1020 signal: "mouse,up,*"; source: "event.minimize";
1021 action: STATE_SET "default"; 865 action: STATE_SET "default";
1022 target: "min1"; 866 target: "min1";
1023 target: "min2"; 867 target: "min2";
1024 } 868 }
1025 program { 869 program { signal: "mouse,down,1"; source: "event.titlebar";
1026 signal: "mouse,down,1"; source: "event.titlebar";
1027 action: SIGNAL_EMIT "efl,action,move,start" "efl"; 870 action: SIGNAL_EMIT "efl,action,move,start" "efl";
1028 } 871 }
1029 program { 872 program { signal: "mouse,up,1"; source: "event.titlebar";
1030 signal: "mouse,up,1"; source: "event.titlebar";
1031 action: SIGNAL_EMIT "efl,action,move,stop" "efl"; 873 action: SIGNAL_EMIT "efl,action,move,stop" "efl";
1032 } 874 }
1033 program { 875 program { signal: "mouse,clicked,1"; source: "event.minimize";
1034 signal: "mouse,clicked,1"; source: "event.minimize";
1035 action: SIGNAL_EMIT "efl,action,minimize" "efl"; 876 action: SIGNAL_EMIT "efl,action,minimize" "efl";
1036 } 877 }
1037 program { 878 program { signal: "mouse,clicked,1"; source: "event.maximize";
1038 signal: "mouse,clicked,1"; source: "event.maximize";
1039 action: SIGNAL_EMIT "efl,action,maximize" "efl"; 879 action: SIGNAL_EMIT "efl,action,maximize" "efl";
1040 } 880 }
1041 program { 881 program { signal: "mouse,clicked,1"; source: "event.close";
1042 signal: "mouse,clicked,1"; source: "event.close";
1043 action: SIGNAL_EMIT "efl,action,close" "efl"; 882 action: SIGNAL_EMIT "efl,action,close" "efl";
1044 } 883 }
1045 program { 884 program { signal: "mouse,in"; source: "efl.event.resize.t";
1046 signal: "mouse,in"; source: "efl.event.resize.t";
1047 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.t"; 885 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.t";
1048 } 886 }
1049 program { 887 program { signal: "mouse,out"; source: "efl.event.resize.t";
1050 signal: "mouse,out"; source: "efl.event.resize.t";
1051 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.t"; 888 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.t";
1052 } 889 }
1053 program { 890 program { signal: "mouse,down,1"; source: "efl.event.resize.t";
1054 signal: "mouse,down,1"; source: "efl.event.resize.t";
1055 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.t"; 891 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.t";
1056 } 892 }
1057 program { 893 program { signal: "mouse,in"; source: "efl.event.resize.b";
1058 signal: "mouse,in"; source: "efl.event.resize.b";
1059 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.b"; 894 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.b";
1060 } 895 }
1061 program { 896 program { signal: "mouse,out"; source: "efl.event.resize.b";
1062 signal: "mouse,out"; source: "efl.event.resize.b";
1063 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.b"; 897 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.b";
1064 } 898 }
1065 program { 899 program { signal: "mouse,down,1"; source: "efl.event.resize.b";
1066 signal: "mouse,down,1"; source: "efl.event.resize.b";
1067 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.b"; 900 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.b";
1068 } 901 }
1069 program { 902 program { signal: "mouse,in"; source: "efl.event.resize.tl";
1070 signal: "mouse,in"; source: "efl.event.resize.tl";
1071 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tl"; 903 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tl";
1072 } 904 }
1073 program { 905 program { signal: "mouse,out"; source: "efl.event.resize.tl";
1074 signal: "mouse,out"; source: "efl.event.resize.tl";
1075 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tl"; 906 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tl";
1076 } 907 }
1077 program { 908 program { signal: "mouse,down,1"; source: "efl.event.resize.tl";
1078 signal: "mouse,down,1"; source: "efl.event.resize.tl";
1079 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tl"; 909 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tl";
1080 } 910 }
1081 program { 911 program { signal: "mouse,in"; source: "efl.event.resize.tr";
1082 signal: "mouse,in"; source: "efl.event.resize.tr";
1083 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tr"; 912 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tr";
1084 } 913 }
1085 program { 914 program { signal: "mouse,out"; source: "efl.event.resize.tr";
1086 signal: "mouse,out"; source: "efl.event.resize.tr";
1087 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tr"; 915 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tr";
1088 } 916 }
1089 program { 917 program { signal: "mouse,down,1"; source: "efl.event.resize.tr";
1090 signal: "mouse,down,1"; source: "efl.event.resize.tr";
1091 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tr"; 918 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tr";
1092 } 919 }
1093 program { 920 program { signal: "mouse,in"; source: "efl.event.resize.bl";
1094 signal: "mouse,in"; source: "efl.event.resize.bl";
1095 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.bl"; 921 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.bl";
1096 } 922 }
1097 program { 923 program { signal: "mouse,out"; source: "efl.event.resize.bl";
1098 signal: "mouse,out"; source: "efl.event.resize.bl";
1099 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.bl"; 924 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.bl";
1100 } 925 }
1101 program { 926 program { signal: "mouse,down,1"; source: "efl.event.resize.bl";
1102 signal: "mouse,down,1"; source: "efl.event.resize.bl";
1103 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.bl"; 927 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.bl";
1104 } 928 }
1105 program { 929 program { signal: "mouse,in"; source: "efl.event.resize.br";
1106 signal: "mouse,in"; source: "efl.event.resize.br";
1107 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.br"; 930 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.br";
1108 } 931 }
1109 program { 932 program { signal: "mouse,out"; source: "efl.event.resize.br";
1110 signal: "mouse,out"; source: "efl.event.resize.br";
1111 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.br"; 933 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.br";
1112 } 934 }
1113 program { 935 program { signal: "mouse,down,1"; source: "efl.event.resize.br";
1114 signal: "mouse,down,1"; source: "efl.event.resize.br";
1115 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.br"; 936 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.br";
1116 } 937 }
1117 program { 938 program { signal: "mouse,clicked,1"; source: "event.icon";
1118 signal: "mouse,clicked,1"; source: "event.icon";
1119 action: SIGNAL_EMIT "efl,action,menu" "efl"; 939 action: SIGNAL_EMIT "efl,action,menu" "efl";
1120 } 940 }
1121 } 941 }
1122} 942}
1123 943
1124group { "efl/border/dialog"; 944group { name: "efl/border/dialog";
1125 inherit: "efl/border"; 945 inherit: "efl/border";
1126 data.item: "version" "123";
1127 parts { 946 parts {
1128 text { "efl.text.title"; 947 text { "efl.text.title";
1129 clip: "top_clip"; 948 clip: "top_clip";
@@ -1176,12 +995,12 @@ group { "efl/border/dialog";
1176 visible: 0; 995 visible: 0;
1177 } 996 }
1178 } 997 }
1179 rect { "event.maximize"; 998 rect { "efl.event.maximize";
1180 desc { "default"; 999 desc { "default";
1181 visible: 0; 1000 visible: 0;
1182 } 1001 }
1183 } 1002 }
1184 rect { "event.minimize"; 1003 rect { "efl.event.minimize";
1185 desc { "default"; 1004 desc { "default";
1186 visible: 0; 1005 visible: 0;
1187 } 1006 }
@@ -1189,28 +1008,24 @@ group { "efl/border/dialog";
1189 } 1008 }
1190} 1009}
1191 1010
1192group { "efl/border/naviframe"; 1011group { name: "efl/border/naviframe";
1193 inherit: "efl/border"; 1012 inherit: "efl/border/dialog";
1194 data.item: "version" "123";
1195 images.image: "sym_left_dark_normal.png" COMP;
1196 images.image: "sym_left_glow_normal.png" COMP;
1197 images.image: "sym_left_light_normal.png" COMP;
1198 parts { 1013 parts {
1199 image { "close1"; 1014 image { "close1";
1200 desc { "default"; 1015 desc { "default";
1201 image.normal: "sym_left_dark_normal.png"; 1016 image.normal: "i-arrow-l";
1202 } 1017 }
1203 desc { "selected"; 1018 desc { "selected";
1204 image.normal: "sym_left_glow_normal.png"; 1019 image.normal: "i-arrow-l";
1205 } 1020 }
1206 } 1021 }
1207 image { "close2"; nomouse; 1022 image { "close2"; nomouse;
1208 clip: "clip2"; 1023 clip: "clip2";
1209 desc { "default"; 1024 desc { "default";
1210 image.normal: "sym_left_light_normal.png"; 1025 image.normal: "i-arrow-l";
1211 } 1026 }
1212 desc { "selected"; 1027 desc { "selected";
1213 image.normal: "sym_left_glow_normal.png"; 1028 image.normal: "i-arrow-l";
1214 } 1029 }
1215 } 1030 }
1216 } 1031 }
@@ -1221,3 +1036,4 @@ group { "efl/border/naviframe";
1221#undef MAXIMIZED 1036#undef MAXIMIZED
1222#undef SET_MODE 1037#undef SET_MODE
1223#undef UNSET_MODE 1038#undef UNSET_MODE
1039
diff --git a/data/elementary/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc
index b9c7f99956..092502d599 100644
--- a/data/elementary/themes/edc/elm/bg.edc
+++ b/data/elementary/themes/edc/elm/bg.edc
@@ -15,7 +15,6 @@ group { name: "elm/bg/base/default";
15 } 15 }
16 part { name: "base"; type: RECT; 16 part { name: "base"; type: RECT;
17 description { state: "default" 0.0; 17 description { state: "default" 0.0;
18 color_class: "dialog_base";
19 color: 64 64 64 255; 18 color: 64 64 64 255;
20 } 19 }
21 } 20 }
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index e5641b577a..e9977d018c 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -107,6 +107,7 @@ group { name: "elm/border/base/default";
107 desc { "default"; 107 desc { "default";
108 color: 64 64 64 255; 108 color: 64 64 64 255;
109 visible: 0; 109 visible: 0;
110 rel.to: "elm.spacer.content";
110 } 111 }
111 desc { "visible"; 112 desc { "visible";
112 inherit: "default"; 113 inherit: "default";
@@ -117,6 +118,9 @@ group { name: "elm/border/base/default";
117 swallow { "elm.swallow.background"; 118 swallow { "elm.swallow.background";
118 required; // @since 1.19 119 required; // @since 1.19
119 clip: "client_clip"; 120 clip: "client_clip";
121 desc { "default";
122 rel.to: "elm.spacer.content";
123 }
120 } 124 }
121 spacer { "indicator_spacer"; 125 spacer { "indicator_spacer";
122 desc { "default"; 126 desc { "default";