summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-19 20:40:52 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-19 20:40:52 +0900
commit92758d8f21438fdb100e6bd513bf7873f41e6be0 (patch)
treead833d4b72e671c8d2255a14686f5fa7985ff717
parent0e8f0355447cd99493b98d0d7baa73e156ef58b0 (diff)
-rw-r--r--data/elementary/themes/edc/efl/button.edc16
-rw-r--r--data/elementary/themes/edc/efl/check.edc44
-rw-r--r--data/elementary/themes/edc/efl/frame.edc36
-rw-r--r--data/elementary/themes/edc/efl/panes.edc72
-rw-r--r--data/elementary/themes/edc/efl/popup.edc16
-rw-r--r--data/elementary/themes/edc/efl/progress.edc70
-rw-r--r--data/elementary/themes/edc/efl/radio.edc8
-rw-r--r--data/elementary/themes/edc/efl/scroller.edc126
-rw-r--r--data/elementary/themes/edc/efl/tooltip.edc26
-rw-r--r--src/lib/elementary/efl_ui_button.c12
-rw-r--r--src/lib/elementary/efl_ui_check.c9
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c361
-rw-r--r--src/lib/elementary/efl_ui_layout.c26
-rw-r--r--src/lib/elementary/efl_ui_popup.c8
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c47
-rw-r--r--src/lib/elementary/efl_ui_radio.c9
-rw-r--r--src/lib/elementary/efl_ui_scroller.c62
-rw-r--r--src/lib/elementary/efl_ui_win.c32
-rw-r--r--src/lib/elementary/els_cursor.c35
19 files changed, 578 insertions, 437 deletions
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 0f55ceca22..ada8aa3870 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -336,7 +336,7 @@ group { name: "efl/button";
336 action: SIGNAL_EMIT "elm,action,click" "elm"; 336 action: SIGNAL_EMIT "elm,action,click" "elm";
337 } 337 }
338 program { name: "button_text_visible"; 338 program { name: "button_text_visible";
339 signal: "state,text,set"; source: "efl"; 339 signal: "elm,state,text,set"; source: "elm";
340 script { 340 script {
341 new m = get_int(btmode); 341 new m = get_int(btmode);
342 m |= LABEL; set_int(btmode, m); 342 m |= LABEL; set_int(btmode, m);
@@ -344,7 +344,7 @@ group { name: "efl/button";
344 } 344 }
345 } 345 }
346 program { name: "button_text_hidden"; 346 program { name: "button_text_hidden";
347 signal: "state,text,unset"; source: "efl"; 347 signal: "elm,state,text,unset"; source: "elm";
348 script { 348 script {
349 new m = get_int(btmode); 349 new m = get_int(btmode);
350 m &= ~LABEL; set_int(btmode, m); 350 m &= ~LABEL; set_int(btmode, m);
@@ -352,7 +352,7 @@ group { name: "efl/button";
352 } 352 }
353 } 353 }
354 program { name: "button_icon_visible"; 354 program { name: "button_icon_visible";
355 signal: "state,content,set"; source: "efl"; 355 signal: "elm,state,content,set"; source: "elm";
356 script { 356 script {
357 new m = get_int(btmode); 357 new m = get_int(btmode);
358 m |= ICON; set_int(btmode, m); 358 m |= ICON; set_int(btmode, m);
@@ -360,7 +360,7 @@ group { name: "efl/button";
360 } 360 }
361 } 361 }
362 program { name: "button_icon_hidden"; 362 program { name: "button_icon_hidden";
363 signal: "state,content,unset"; source: "efl"; 363 signal: "elm,state,content,unset"; source: "elm";
364 script { 364 script {
365 new m = get_int(btmode); 365 new m = get_int(btmode);
366 m &= ~ICON; set_int(btmode, m); 366 m &= ~ICON; set_int(btmode, m);
@@ -718,7 +718,7 @@ group { name: "efl/button:anchor";
718 action: SIGNAL_EMIT "elm,action,click" "elm"; 718 action: SIGNAL_EMIT "elm,action,click" "elm";
719 } 719 }
720 program { name: "button_text_visible"; 720 program { name: "button_text_visible";
721 signal: "state,text,set"; source: "efl"; 721 signal: "elm,state,text,set"; source: "elm";
722 script { 722 script {
723 new m = get_int(btmode); 723 new m = get_int(btmode);
724 m |= LABEL; set_int(btmode, m); 724 m |= LABEL; set_int(btmode, m);
@@ -726,7 +726,7 @@ group { name: "efl/button:anchor";
726 } 726 }
727 } 727 }
728 program { name: "button_text_hidden"; 728 program { name: "button_text_hidden";
729 signal: "state,text,unset"; source: "efl"; 729 signal: "elm,state,text,unset"; source: "elm";
730 script { 730 script {
731 new m = get_int(btmode); 731 new m = get_int(btmode);
732 m &= ~LABEL; set_int(btmode, m); 732 m &= ~LABEL; set_int(btmode, m);
@@ -734,7 +734,7 @@ group { name: "efl/button:anchor";
734 } 734 }
735 } 735 }
736 program { name: "button_icon_visible"; 736 program { name: "button_icon_visible";
737 signal: "state,content,set"; source: "efl"; 737 signal: "elm,state,content,set"; source: "elm";
738 script { 738 script {
739 new m = get_int(btmode); 739 new m = get_int(btmode);
740 m |= ICON; set_int(btmode, m); 740 m |= ICON; set_int(btmode, m);
@@ -742,7 +742,7 @@ group { name: "efl/button:anchor";
742 } 742 }
743 } 743 }
744 program { name: "button_icon_hidden"; 744 program { name: "button_icon_hidden";
745 signal: "state,content,unset"; source: "efl"; 745 signal: "elm,state,content,unset"; source: "elm";
746 script { 746 script {
747 new m = get_int(btmode); 747 new m = get_int(btmode);
748 m &= ~ICON; set_int(btmode, m); 748 m &= ~ICON; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index 4a8c1302a6..9d7e3b59e6 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -354,8 +354,8 @@ group { "efl/check:toggle";
354 set_state(PART:"clip", "default", 0.0); 354 set_state(PART:"clip", "default", 0.0);
355 set_state(PART:"event", "default", 0.0); 355 set_state(PART:"event", "default", 0.0);
356 set_state(PART:"event2", "default", 0.0); 356 set_state(PART:"event2", "default", 0.0);
357 set_state(PART:"elm.ontext", "default", 0.0); 357 set_state(PART:"on", "default", 0.0);
358 set_state(PART:"elm.offtext", "default", 0.0); 358 set_state(PART:"off", "default", 0.0);
359 set_state(PART:"onrect", "default", 0.0); 359 set_state(PART:"onrect", "default", 0.0);
360 set_state(PART:"offrect", "default", 0.0); 360 set_state(PART:"offrect", "default", 0.0);
361 } else { 361 } else {
@@ -366,8 +366,8 @@ group { "efl/check:toggle";
366 set_state(PART:"clip", "disabled", 0.0); 366 set_state(PART:"clip", "disabled", 0.0);
367 set_state(PART:"event", "disabled", 0.0); 367 set_state(PART:"event", "disabled", 0.0);
368 set_state(PART:"event2", "disabled", 0.0); 368 set_state(PART:"event2", "disabled", 0.0);
369 set_state(PART:"elm.ontext", "disabled", 0.0); 369 set_state(PART:"on", "disabled", 0.0);
370 set_state(PART:"elm.offtext", "disabled", 0.0); 370 set_state(PART:"off", "disabled", 0.0);
371 set_state(PART:"onrect", "disabled", 0.0); 371 set_state(PART:"onrect", "disabled", 0.0);
372 set_state(PART:"offrect", "disabled", 0.0); 372 set_state(PART:"offrect", "disabled", 0.0);
373 } 373 }
@@ -380,8 +380,8 @@ group { "efl/check:toggle";
380 set_state(PART:"clip", "default", 0.0); 380 set_state(PART:"clip", "default", 0.0);
381 set_state(PART:"event", "default", 0.0); 381 set_state(PART:"event", "default", 0.0);
382 set_state(PART:"event2", "default", 0.0); 382 set_state(PART:"event2", "default", 0.0);
383 set_state(PART:"elm.ontext", "default", 0.0); 383 set_state(PART:"on", "default", 0.0);
384 set_state(PART:"elm.offtext", "default", 0.0); 384 set_state(PART:"off", "default", 0.0);
385 set_state(PART:"onrect", "default", 0.0); 385 set_state(PART:"onrect", "default", 0.0);
386 set_state(PART:"offrect", "default", 0.0); 386 set_state(PART:"offrect", "default", 0.0);
387 } else { 387 } else {
@@ -392,8 +392,8 @@ group { "efl/check:toggle";
392 set_state(PART:"clip", "disabled", 0.0); 392 set_state(PART:"clip", "disabled", 0.0);
393 set_state(PART:"event", "disabled", 0.0); 393 set_state(PART:"event", "disabled", 0.0);
394 set_state(PART:"event2", "disabled", 0.0); 394 set_state(PART:"event2", "disabled", 0.0);
395 set_state(PART:"elm.ontext", "disabled", 0.0); 395 set_state(PART:"on", "disabled", 0.0);
396 set_state(PART:"elm.offtext", "disabled", 0.0); 396 set_state(PART:"off", "disabled", 0.0);
397 set_state(PART:"onrect", "disabled", 0.0); 397 set_state(PART:"onrect", "disabled", 0.0);
398 set_state(PART:"offrect", "disabled", 0.0); 398 set_state(PART:"offrect", "disabled", 0.0);
399 } 399 }
@@ -406,8 +406,8 @@ group { "efl/check:toggle";
406 set_state(PART:"clip", "default", 0.0); 406 set_state(PART:"clip", "default", 0.0);
407 set_state(PART:"event", "default", 0.0); 407 set_state(PART:"event", "default", 0.0);
408 set_state(PART:"event2", "default", 0.0); 408 set_state(PART:"event2", "default", 0.0);
409 set_state(PART:"elm.ontext", "default", 0.0); 409 set_state(PART:"on", "default", 0.0);
410 set_state(PART:"elm.offtext", "default", 0.0); 410 set_state(PART:"off", "default", 0.0);
411 set_state(PART:"onrect", "default", 0.0); 411 set_state(PART:"onrect", "default", 0.0);
412 set_state(PART:"offrect", "default", 0.0); 412 set_state(PART:"offrect", "default", 0.0);
413 } else { 413 } else {
@@ -418,8 +418,8 @@ group { "efl/check:toggle";
418 set_state(PART:"clip", "disabled", 0.0); 418 set_state(PART:"clip", "disabled", 0.0);
419 set_state(PART:"event", "disabled", 0.0); 419 set_state(PART:"event", "disabled", 0.0);
420 set_state(PART:"event2", "disabled", 0.0); 420 set_state(PART:"event2", "disabled", 0.0);
421 set_state(PART:"elm.ontext", "disabled", 0.0); 421 set_state(PART:"on", "disabled", 0.0);
422 set_state(PART:"elm.offtext", "disabled", 0.0); 422 set_state(PART:"off", "disabled", 0.0);
423 set_state(PART:"onrect", "disabled", 0.0); 423 set_state(PART:"onrect", "disabled", 0.0);
424 set_state(PART:"offrect", "disabled", 0.0); 424 set_state(PART:"offrect", "disabled", 0.0);
425 } 425 }
@@ -432,8 +432,8 @@ group { "efl/check:toggle";
432 set_state(PART:"clip", "default", 0.0); 432 set_state(PART:"clip", "default", 0.0);
433 set_state(PART:"event", "default", 0.0); 433 set_state(PART:"event", "default", 0.0);
434 set_state(PART:"event2", "default", 0.0); 434 set_state(PART:"event2", "default", 0.0);
435 set_state(PART:"elm.ontext", "default", 0.0); 435 set_state(PART:"on", "default", 0.0);
436 set_state(PART:"elm.offtext", "default", 0.0); 436 set_state(PART:"off", "default", 0.0);
437 set_state(PART:"onrect", "default", 0.0); 437 set_state(PART:"onrect", "default", 0.0);
438 set_state(PART:"offrect", "default", 0.0); 438 set_state(PART:"offrect", "default", 0.0);
439 } else { 439 } else {
@@ -444,8 +444,8 @@ group { "efl/check:toggle";
444 set_state(PART:"clip", "disabled", 0.0); 444 set_state(PART:"clip", "disabled", 0.0);
445 set_state(PART:"event", "disabled", 0.0); 445 set_state(PART:"event", "disabled", 0.0);
446 set_state(PART:"event2", "disabled", 0.0); 446 set_state(PART:"event2", "disabled", 0.0);
447 set_state(PART:"elm.ontext", "disabled", 0.0); 447 set_state(PART:"on", "disabled", 0.0);
448 set_state(PART:"elm.offtext", "disabled", 0.0); 448 set_state(PART:"off", "disabled", 0.0);
449 set_state(PART:"onrect", "disabled", 0.0); 449 set_state(PART:"onrect", "disabled", 0.0);
450 set_state(PART:"offrect", "disabled", 0.0); 450 set_state(PART:"offrect", "disabled", 0.0);
451 } 451 }
@@ -495,7 +495,7 @@ group { "efl/check:toggle";
495 color: 64 64 64 255; 495 color: 64 64 64 255;
496 } 496 }
497 } 497 }
498 part { name: "elm.offtext"; type: TEXT; mouse_events: 0; 498 part { name: "off"; type: TEXT; mouse_events: 0;
499 effect: SHADOW BOTTOM; 499 effect: SHADOW BOTTOM;
500 scale: 1; 500 scale: 1;
501 clip_to: "tog_clip"; 501 clip_to: "tog_clip";
@@ -519,7 +519,7 @@ group { "efl/check:toggle";
519 color3: 255 255 255 255; 519 color3: 255 255 255 255;
520 } 520 }
521 } 521 }
522 part { name: "elm.ontext"; type: TEXT; mouse_events: 0; 522 part { name: "on"; type: TEXT; mouse_events: 0;
523 effect: GLOW; 523 effect: GLOW;
524 scale: 1; 524 scale: 1;
525 clip_to: "tog_clip"; 525 clip_to: "tog_clip";
@@ -870,7 +870,7 @@ group { "efl/check:toggle";
870 target: "glow_but"; 870 target: "glow_but";
871 } 871 }
872 program { 872 program {
873 signal: "state,text,set"; source: "efl"; 873 signal: "elm,state,text,set"; source: "elm";
874 script { 874 script {
875 new m = get_int(btmode); 875 new m = get_int(btmode);
876 m |= LABEL; set_int(btmode, m); 876 m |= LABEL; set_int(btmode, m);
@@ -878,7 +878,7 @@ group { "efl/check:toggle";
878 } 878 }
879 } 879 }
880 program { 880 program {
881 signal: "state,text,unset"; source: "efl"; 881 signal: "elm,state,text,unset"; source: "elm";
882 script { 882 script {
883 new m = get_int(btmode); 883 new m = get_int(btmode);
884 m &= ~LABEL; set_int(btmode, m); 884 m &= ~LABEL; set_int(btmode, m);
@@ -886,7 +886,7 @@ group { "efl/check:toggle";
886 } 886 }
887 } 887 }
888 program { 888 program {
889 signal: "state,content,set"; source: "efl"; 889 signal: "elm,state,content,set"; source: "elm";
890 script { 890 script {
891 new m = get_int(btmode); 891 new m = get_int(btmode);
892 m |= ICON; set_int(btmode, m); 892 m |= ICON; set_int(btmode, m);
@@ -894,7 +894,7 @@ group { "efl/check:toggle";
894 } 894 }
895 } 895 }
896 program { 896 program {
897 signal: "state,content,unset"; source: "efl"; 897 signal: "elm,state,content,unset"; source: "elm";
898 script { 898 script {
899 new m = get_int(btmode); 899 new m = get_int(btmode);
900 m &= ~ICON; set_int(btmode, m); 900 m &= ~ICON; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc
index 729177ad98..f05e8d2424 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -26,7 +26,7 @@ group { name: "efl/frame";
26 description { state: "default" 0.0; 26 description { state: "default" 0.0;
27 image.normal: "vgrad_med_curved.png"; 27 image.normal: "vgrad_med_curved.png";
28 rel1.offset: 2 2; 28 rel1.offset: 2 2;
29 rel2.to_y: "elm.text"; 29 rel2.to_y: "text";
30 rel2.offset: -3 -1; 30 rel2.offset: -3 -1;
31 fill.smooth: 0; 31 fill.smooth: 0;
32 TILED_HORIZ(120) 32 TILED_HORIZ(120)
@@ -36,10 +36,10 @@ group { name: "efl/frame";
36 description { state: "default" 0.0; 36 description { state: "default" 0.0;
37 image.normal: "holes_tiny_vert.png"; 37 image.normal: "holes_tiny_vert.png";
38 rel1.offset: 4 0; 38 rel1.offset: 4 0;
39 rel1.to_y: "elm.text"; 39 rel1.to_y: "text";
40 rel2.offset: 4 -1; 40 rel2.offset: 4 -1;
41 rel2.relative: 0.0 1.0; 41 rel2.relative: 0.0 1.0;
42 rel2.to_y: "elm.text"; 42 rel2.to_y: "text";
43 align: 0.0 0.5; 43 align: 0.0 0.5;
44 FIXED_SIZE(3, 11) 44 FIXED_SIZE(3, 11)
45 } 45 }
@@ -48,16 +48,16 @@ group { name: "efl/frame";
48 description { state: "default" 0.0; 48 description { state: "default" 0.0;
49 image.normal: "holes_tiny_vert.png"; 49 image.normal: "holes_tiny_vert.png";
50 rel1.offset: -5 0; 50 rel1.offset: -5 0;
51 rel1.to_y: "elm.text"; 51 rel1.to_y: "text";
52 rel1.relative: 1.0 0.0; 52 rel1.relative: 1.0 0.0;
53 rel2.offset: -5 -1; 53 rel2.offset: -5 -1;
54 rel2.relative: 1.0 1.0; 54 rel2.relative: 1.0 1.0;
55 rel2.to_y: "elm.text"; 55 rel2.to_y: "text";
56 align: 1.0 0.5; 56 align: 1.0 0.5;
57 FIXED_SIZE(3, 11) 57 FIXED_SIZE(3, 11)
58 } 58 }
59 } 59 }
60 part { name: "elm.text"; type: TEXT; 60 part { name: "text"; type: TEXT;
61 scale: 1; 61 scale: 1;
62 effect: SHADOW BOTTOM; 62 effect: SHADOW BOTTOM;
63 description { state: "default" 0.0; 63 description { state: "default" 0.0;
@@ -82,17 +82,17 @@ group { name: "efl/frame";
82 description { state: "default" 0.0; 82 description { state: "default" 0.0;
83 rel1.relative: 0.0 1.0; 83 rel1.relative: 0.0 1.0;
84 rel1.offset: 5 0; 84 rel1.offset: 5 0;
85 rel1.to_y: "elm.text"; 85 rel1.to_y: "text";
86 rel2.offset: -7 -7; 86 rel2.offset: -7 -7;
87 } 87 }
88 } 88 }
89 part { name: "elm.swallow.content"; type: SWALLOW; 89 part { name: "content"; type: SWALLOW;
90 clip_to: "clip"; 90 clip_to: "clip";
91 description { state: "default" 0.0; 91 description { state: "default" 0.0;
92 align: 0.0 1.0; 92 align: 0.0 1.0;
93 rel1.relative: 0.0 1.0; 93 rel1.relative: 0.0 1.0;
94 rel1.offset: 5 0; 94 rel1.offset: 5 0;
95 rel1.to_y: "elm.text"; 95 rel1.to_y: "text";
96 rel2.offset: -7 -7; 96 rel2.offset: -7 -7;
97 } 97 }
98 description { state: "collapsed" 0.0; 98 description { state: "collapsed" 0.0;
@@ -113,21 +113,21 @@ group { name: "efl/frame";
113 part { name: "event"; type: RECT; ignore_flags: ON_HOLD; 113 part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
114 description { state: "default" 0.0; 114 description { state: "default" 0.0;
115 color: 0 0 0 0; 115 color: 0 0 0 0;
116 rel1.to_y: "elm.text"; 116 rel1.to_y: "text";
117 rel2.to_y: "elm.text"; 117 rel2.to_y: "text";
118 } 118 }
119 } 119 }
120 } 120 }
121 programs { 121 programs {
122 program { name: "collapse"; 122 program { name: "collapse";
123 action: STATE_SET "collapsed" 0.0; 123 action: STATE_SET "collapsed" 0.0;
124 target: "elm.swallow.content"; 124 target: "content";
125 transition: ACCELERATE 0.3; 125 transition: ACCELERATE 0.3;
126 after: "signal"; 126 after: "signal";
127 } 127 }
128 program { name: "expand"; 128 program { name: "expand";
129 action: STATE_SET "default" 0.0; 129 action: STATE_SET "default" 0.0;
130 target: "elm.swallow.content"; 130 target: "content";
131 transition: DECELERATE 0.3; 131 transition: DECELERATE 0.3;
132 after: "signal"; 132 after: "signal";
133 } 133 }
@@ -140,7 +140,7 @@ group { name: "efl/frame";
140 script { 140 script {
141 new st[31]; 141 new st[31];
142 new Float:vl; 142 new Float:vl;
143 get_state(PART:"elm.swallow.content", st, 30, vl); 143 get_state(PART:"content", st, 30, vl);
144 if (!strcmp(st, "default")) 144 if (!strcmp(st, "default"))
145 run_program(PROGRAM:"collapse"); 145 run_program(PROGRAM:"collapse");
146 else 146 else
@@ -152,15 +152,15 @@ group { name: "efl/frame";
152 script { 152 script {
153 new st[31]; 153 new st[31];
154 new Float:vl; 154 new Float:vl;
155 get_state(PART:"elm.swallow.content", st, 30, vl); 155 get_state(PART:"content", st, 30, vl);
156 if (!strcmp(st, "default")) 156 if (!strcmp(st, "default"))
157 set_state(PART:"elm.swallow.content", "collapsed", 0.0); 157 set_state(PART:"content", "collapsed", 0.0);
158 else 158 else
159 set_state(PART:"elm.swallow.content", "default", 0.0); 159 set_state(PART:"content", "default", 0.0);
160 } 160 }
161 } 161 }
162 program { name: "signal"; 162 program { name: "signal";
163 action: SIGNAL_EMIT "elm,anim,done" "elm"; 163 action: SIGNAL_EMIT "elm,anim,done" "elm";
164 } 164 }
165 } 165 }
166} \ No newline at end of file 166}
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 10f0a46664..c16c133bfb 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -112,7 +112,7 @@ group { name: "efl/panes/vertical";
112 rel2.to: "bar"; 112 rel2.to: "bar";
113 } 113 }
114 } 114 }
115 part { name: "rect.bar"; type: RECT; 115 part { name: "rect_bar"; type: RECT;
116 dragable.events: "bar"; 116 dragable.events: "bar";
117 description { state: "default" 0.0; 117 description { state: "default" 0.0;
118 min: PANEMIN PANEWID; 118 min: PANEMIN PANEWID;
@@ -129,27 +129,27 @@ group { name: "efl/panes/vertical";
129 } 129 }
130 } 130 }
131 programs { 131 programs {
132 program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback 132 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
133 action: SIGNAL_EMIT "elm,action,press" "elm"; 133 action: SIGNAL_EMIT "elm,action,press" "elm";
134 } 134 }
135 program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback 135 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
136 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 136 action: SIGNAL_EMIT "elm,action,unpress" "elm";
137 } 137 }
138 program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback 138 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
139 action: SIGNAL_EMIT "elm,action,click" "elm"; 139 action: SIGNAL_EMIT "elm,action,click" "elm";
140 } 140 }
141 program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback 141 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
142 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 142 action: SIGNAL_EMIT "elm,action,click,double" "elm";
143 } 143 }
144 program { // for elm_panes_fixed_set() 144 program { // for elm_panes_fixed_set()
145 signal: "elm,panes,fixed"; source: "elm"; 145 signal: "elm,panes,fixed"; source: "elm";
146 action: STATE_SET "disabled" 0.0; 146 action: STATE_SET "disabled" 0.0;
147 target: "rect.bar"; 147 target: "rect_bar";
148 } 148 }
149 program { // for elm_panes_fixed_set() 149 program { // for elm_panes_fixed_set()
150 signal: "elm,panes,unfixed"; source: "elm"; 150 signal: "elm,panes,unfixed"; source: "elm";
151 action: STATE_SET "default" 0.0; 151 action: STATE_SET "default" 0.0;
152 target: "rect.bar"; 152 target: "rect_bar";
153 } 153 }
154 } 154 }
155} 155}
@@ -251,7 +251,7 @@ group { name: "efl/panes/horizontal";
251 rel2.to: "bar"; 251 rel2.to: "bar";
252 } 252 }
253 } 253 }
254 part { name: "rect.bar"; type: RECT; 254 part { name: "rect_bar"; type: RECT;
255 dragable.events: "bar"; 255 dragable.events: "bar";
256 description { state: "default" 0.0; 256 description { state: "default" 0.0;
257 min: PANEWID PANEMIN; 257 min: PANEWID PANEMIN;
@@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal";
268 } 268 }
269 } 269 }
270 programs { 270 programs {
271 program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback 271 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
272 action: SIGNAL_EMIT "elm,action,press" "elm"; 272 action: SIGNAL_EMIT "elm,action,press" "elm";
273 } 273 }
274 program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback 274 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
275 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 275 action: SIGNAL_EMIT "elm,action,unpress" "elm";
276 } 276 }
277 program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback 277 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
278 action: SIGNAL_EMIT "elm,action,click" "elm"; 278 action: SIGNAL_EMIT "elm,action,click" "elm";
279 } 279 }
280 program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback 280 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
281 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 281 action: SIGNAL_EMIT "elm,action,click,double" "elm";
282 } 282 }
283 program { // for elm_panes_fixed_set() 283 program { // for elm_panes_fixed_set()
284 signal: "elm,panes,fixed"; source: "elm"; 284 signal: "elm,panes,fixed"; source: "elm";
285 action: STATE_SET "disabled" 0.0; 285 action: STATE_SET "disabled" 0.0;
286 target: "rect.bar"; 286 target: "rect_bar";
287 } 287 }
288 program { // for elm_panes_fixed_set() 288 program { // for elm_panes_fixed_set()
289 signal: "elm,panes,unfixed"; source: "elm"; 289 signal: "elm,panes,unfixed"; source: "elm";
290 action: STATE_SET "default" 0.0; 290 action: STATE_SET "default" 0.0;
291 target: "rect.bar"; 291 target: "rect_bar";
292 } 292 }
293 } 293 }
294} 294}
@@ -377,7 +377,7 @@ group { name: "efl/panes/vertical:flush";
377 rel2.to: "bar"; 377 rel2.to: "bar";
378 } 378 }
379 } 379 }
380 part { name: "rect.bar"; type: RECT; 380 part { name: "rect_bar"; type: RECT;
381 dragable.events: "bar"; 381 dragable.events: "bar";
382 description { state: "default" 0.0; 382 description { state: "default" 0.0;
383 min: PANEMIN PANEWID; 383 min: PANEMIN PANEWID;
@@ -451,8 +451,8 @@ group { name: "efl/panes/vertical:flush";
451 part { name: "bar1"; type: RECT; repeat_events: 1; 451 part { name: "bar1"; type: RECT; repeat_events: 1;
452 description { state: "default" 0.0; 452 description { state: "default" 0.0;
453 fixed: 1 1; 453 fixed: 1 1;
454 rel1.to: "rect.bar"; 454 rel1.to: "rect_bar";
455 rel2.to: "rect.bar"; 455 rel2.to: "rect_bar";
456 rel2.relative: 0.5 1.0; 456 rel2.relative: 0.5 1.0;
457 color: 0 0 0 0; 457 color: 0 0 0 0;
458 } 458 }
@@ -460,35 +460,35 @@ group { name: "efl/panes/vertical:flush";
460 part { name: "bar2"; type: RECT; repeat_events: 1; 460 part { name: "bar2"; type: RECT; repeat_events: 1;
461 description { state: "default" 0.0; 461 description { state: "default" 0.0;
462 fixed: 1 1; 462 fixed: 1 1;
463 rel1.to: "rect.bar"; 463 rel1.to: "rect_bar";
464 rel1.relative: 0.5 0.0; 464 rel1.relative: 0.5 0.0;
465 rel2.to: "rect.bar"; 465 rel2.to: "rect_bar";
466 color: 0 0 0 0; 466 color: 0 0 0 0;
467 } 467 }
468 } 468 }
469 } 469 }
470 programs { 470 programs {
471 program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback 471 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
472 action: SIGNAL_EMIT "elm,action,press" "elm"; 472 action: SIGNAL_EMIT "elm,action,press" "elm";
473 } 473 }
474 program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback 474 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
475 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 475 action: SIGNAL_EMIT "elm,action,unpress" "elm";
476 } 476 }
477 program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback 477 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
478 action: SIGNAL_EMIT "elm,action,click" "elm"; 478 action: SIGNAL_EMIT "elm,action,click" "elm";
479 } 479 }
480 program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback 480 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
481 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 481 action: SIGNAL_EMIT "elm,action,click,double" "elm";
482 } 482 }
483 program { // for elm_panes_fixed_set() 483 program { // for elm_panes_fixed_set()
484 signal: "elm,panes,fixed"; source: "elm"; 484 signal: "elm,panes,fixed"; source: "elm";
485 action: STATE_SET "disabled" 0.0; 485 action: STATE_SET "disabled" 0.0;
486 target: "rect.bar"; 486 target: "rect_bar";
487 } 487 }
488 program { // for elm_panes_fixed_set() 488 program { // for elm_panes_fixed_set()
489 signal: "elm,panes,unfixed"; source: "elm"; 489 signal: "elm,panes,unfixed"; source: "elm";
490 action: STATE_SET "default" 0.0; 490 action: STATE_SET "default" 0.0;
491 target: "rect.bar"; 491 target: "rect_bar";
492 } 492 }
493 program { 493 program {
494 signal: "mouse,in"; source: "bar1"; 494 signal: "mouse,in"; source: "bar1";
@@ -605,7 +605,7 @@ group { name: "efl/panes/horizontal:flush";
605 rel2.to: "bar"; 605 rel2.to: "bar";
606 } 606 }
607 } 607 }
608 part { name: "rect.bar"; type: RECT; 608 part { name: "rect_bar"; type: RECT;
609 dragable.events: "bar"; 609 dragable.events: "bar";
610 description { state: "default" 0.0; 610 description { state: "default" 0.0;
611 min: PANEWID PANEMIN; 611 min: PANEWID PANEMIN;
@@ -679,8 +679,8 @@ group { name: "efl/panes/horizontal:flush";
679 part { name: "bar1"; type: RECT; repeat_events: 1; 679 part { name: "bar1"; type: RECT; repeat_events: 1;
680 description { state: "default" 0.0; 680 description { state: "default" 0.0;
681 fixed: 1 1; 681 fixed: 1 1;
682 rel1.to: "rect.bar"; 682 rel1.to: "rect_bar";
683 rel2.to: "rect.bar"; 683 rel2.to: "rect_bar";
684 rel2.relative: 1.0 0.5; 684 rel2.relative: 1.0 0.5;
685 color: 0 0 0 0; 685 color: 0 0 0 0;
686 } 686 }
@@ -688,9 +688,9 @@ group { name: "efl/panes/horizontal:flush";
688 part { name: "bar2"; type: RECT; repeat_events: 1; 688 part { name: "bar2"; type: RECT; repeat_events: 1;
689 description { state: "default" 0.0; 689 description { state: "default" 0.0;
690 fixed: 1 1; 690 fixed: 1 1;
691 rel1.to: "rect.bar"; 691 rel1.to: "rect_bar";
692 rel1.relative: 0.0 0.5; 692 rel1.relative: 0.0 0.5;
693 rel2.to: "rect.bar"; 693 rel2.to: "rect_bar";
694 color: 0 0 0 0; 694 color: 0 0 0 0;
695 } 695 }
696 } 696 }
@@ -724,27 +724,27 @@ group { name: "efl/panes/horizontal:flush";
724 target: "glow2a"; 724 target: "glow2a";
725 target: "glow2b"; 725 target: "glow2b";
726 } 726 }
727 program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback 727 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
728 action: SIGNAL_EMIT "elm,action,press" "elm"; 728 action: SIGNAL_EMIT "elm,action,press" "elm";
729 } 729 }
730 program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback 730 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
731 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 731 action: SIGNAL_EMIT "elm,action,unpress" "elm";
732 } 732 }
733 program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback 733 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
734 action: SIGNAL_EMIT "elm,action,click" "elm"; 734 action: SIGNAL_EMIT "elm,action,click" "elm";
735 } 735 }
736 program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback 736 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
737 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 737 action: SIGNAL_EMIT "elm,action,click,double" "elm";
738 } 738 }
739 program { // for elm_panes_fixed_set() 739 program { // for elm_panes_fixed_set()
740 signal: "elm,panes,fixed"; source: "elm"; 740 signal: "elm,panes,fixed"; source: "elm";
741 action: STATE_SET "disabled" 0.0; 741 action: STATE_SET "disabled" 0.0;
742 target: "rect.bar"; 742 target: "rect_bar";
743 } 743 }
744 program { // for elm_panes_fixed_set() 744 program { // for elm_panes_fixed_set()
745 signal: "elm,panes,unfixed"; source: "elm"; 745 signal: "elm,panes,unfixed"; source: "elm";
746 action: STATE_SET "default" 0.0; 746 action: STATE_SET "default" 0.0;
747 target: "rect.bar"; 747 target: "rect_bar";
748 } 748 }
749 } 749 }
750} 750}
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 0708f2a8ff..4f30292c37 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -125,17 +125,17 @@ group { "efl/popup/backwall";
125 desc { "default"; 125 desc { "default";
126 color: 0 0 0 64; 126 color: 0 0 0 64;
127 } 127 }
128 desc { "show_image"; 128 desc { "content_visible";
129 inherit: "default"; 129 inherit: "default";
130 hid; 130 hid;
131 } 131 }
132 } 132 }
133 swallow { "image"; 133 swallow { "content";
134 desc { "default"; 134 desc { "default";
135 rel.to: "base"; 135 rel.to: "base";
136 hid; 136 hid;
137 } 137 }
138 desc { "show_image"; 138 desc { "content_visible";
139 inherit: "default"; 139 inherit: "default";
140 vis; 140 vis;
141 } 141 }
@@ -150,16 +150,16 @@ group { "efl/popup/backwall";
150 150
151 programs { 151 programs {
152 program { 152 program {
153 signal: "elm,state,image,visible"; source: "elm"; 153 signal: "elm,state,content,set"; source: "elm";
154 action: STATE_SET "show_image" 0.0; 154 action: STATE_SET "content_visible" 0.0;
155 target: "base"; 155 target: "base";
156 target: "image"; 156 target: "content";
157 } 157 }
158 program { 158 program {
159 signal: "elm,state,image,hidden"; source: "elm"; 159 signal: "elm,state,content,unset"; source: "elm";
160 action: STATE_SET "default" 0.0; 160 action: STATE_SET "default" 0.0;
161 target: "base"; 161 target: "base";
162 target: "image"; 162 target: "content";
163 } 163 }
164 program { 164 program {
165 signal: "mouse,clicked,1"; source: "block"; 165 signal: "mouse,clicked,1"; source: "block";
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index 82beadaead..7a55352147 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -222,7 +222,7 @@ group { "efl/progressbar/horizontal";
222 image.border_scale_by: 0.25; image.border_scale: 1; 222 image.border_scale_by: 0.25; image.border_scale: 1;
223 } 223 }
224 } 224 }
225 part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0; 225 part { name: "bar"; type: SWALLOW; mouse_events: 0;
226 description { state: "default" 0.0; 226 description { state: "default" 0.0;
227 rel1.to: "inside"; 227 rel1.to: "inside";
228 rel2.to: "inside"; 228 rel2.to: "inside";
@@ -259,7 +259,7 @@ group { "efl/progressbar/horizontal";
259 align: 1.0 0.5; 259 align: 1.0 0.5;
260 } 260 }
261 } 261 }
262 part { name: "bar_internal"; 262 part { name: "image_bar";
263 clip_to: "fract_clip"; 263 clip_to: "fract_clip";
264 scale: 1; 264 scale: 1;
265 description { state: "default" 0.0; 265 description { state: "default" 0.0;
@@ -315,10 +315,10 @@ group { "efl/progressbar/horizontal";
315 min: 64 24; 315 min: 64 24;
316 max: 64 24; 316 max: 64 24;
317 rel1.to_x: "insidep0"; 317 rel1.to_x: "insidep0";
318 rel1.to_y: "bar_internal"; 318 rel1.to_y: "image_bar";
319 rel1.relative: 0.0 0.0; 319 rel1.relative: 0.0 0.0;
320 rel2.to_x: "insidep1"; 320 rel2.to_x: "insidep1";
321 rel2.to_y: "bar_internal"; 321 rel2.to_y: "image_bar";
322 rel2.relative: 1.0 1.0; 322 rel2.relative: 1.0 1.0;
323 image.normal: "inset_bar_horiz_glow_mid_base.png"; 323 image.normal: "inset_bar_horiz_glow_mid_base.png";
324 align: 0.0 0.5; 324 align: 0.0 0.5;
@@ -372,11 +372,11 @@ group { "efl/progressbar/horizontal";
372 scale: 1; 372 scale: 1;
373 description { state: "default" 0.0; 373 description { state: "default" 0.0;
374 max: 36 11; 374 max: 36 11;
375 rel1.to_x: "bar_internal"; 375 rel1.to_x: "image_bar";
376 rel1.to_y: "bar_internal"; 376 rel1.to_y: "image_bar";
377 rel1.relative: 0.0 (26/96); 377 rel1.relative: 0.0 (26/96);
378 rel2.to_x: "barend"; 378 rel2.to_x: "barend";
379 rel2.to_y: "bar_internal"; 379 rel2.to_y: "image_bar";
380 rel2.relative: 0.2 ((26+44)/96); 380 rel2.relative: 0.2 ((26+44)/96);
381 align: 1.0 0.0; 381 align: 1.0 0.0;
382 image.normal: "inset_bar_horiz_glow_light.png"; 382 image.normal: "inset_bar_horiz_glow_light.png";
@@ -387,10 +387,10 @@ group { "efl/progressbar/horizontal";
387 description { state: "inv" 0.0; 387 description { state: "inv" 0.0;
388 inherit: "default" 0.0; 388 inherit: "default" 0.0;
389 rel1.to_x: "barend"; 389 rel1.to_x: "barend";
390 rel1.to_y: "bar_internal"; 390 rel1.to_y: "image_bar";
391 rel1.relative: 0.8 (26/96); 391 rel1.relative: 0.8 (26/96);
392 rel2.to_x: "bar_internal"; 392 rel2.to_x: "image_bar";
393 rel2.to_y: "bar_internal"; 393 rel2.to_y: "image_bar";
394 rel2.relative: 1.0 ((26+44)/96); 394 rel2.relative: 1.0 ((26+44)/96);
395 align: 0.0 0.0; 395 align: 0.0 0.0;
396 image.normal: "inset_bar_horiz_glow_inv_light.png"; 396 image.normal: "inset_bar_horiz_glow_inv_light.png";
@@ -402,14 +402,14 @@ group { "efl/progressbar/horizontal";
402 program { name: "inverted-on"; 402 program { name: "inverted-on";
403 signal: "elm,state,inverted,on"; source: "elm"; 403 signal: "elm,state,inverted,on"; source: "elm";
404 action: STATE_SET "inv" 0.0; 404 action: STATE_SET "inv" 0.0;
405 target: "bar_internal"; 405 target: "image_bar";
406 target: "barend"; 406 target: "barend";
407 target: "light"; 407 target: "light";
408 } 408 }
409 program { name: "inverted-off"; 409 program { name: "inverted-off";
410 signal: "elm,state,inverted,off"; source: "elm"; 410 signal: "elm,state,inverted,off"; source: "elm";
411 action: STATE_SET "default" 0.0; 411 action: STATE_SET "default" 0.0;
412 target: "bar_internal"; 412 target: "image_bar";
413 target: "barend"; 413 target: "barend";
414 target: "light"; 414 target: "light";
415 } 415 }
@@ -419,7 +419,7 @@ group { "efl/progressbar/horizontal";
419 new a, Float:dx, Float:dy, Float:vl, st[20]; 419 new a, Float:dx, Float:dy, Float:vl, st[20];
420 420
421 get_drag(PART:"cur.progressbar", dx, dy); 421 get_drag(PART:"cur.progressbar", dx, dy);
422 get_state(PART:"bar_internal", st, 19, vl); 422 get_state(PART:"image_bar", st, 19, vl);
423 if (!strcmp(st, "inv")) { 423 if (!strcmp(st, "inv")) {
424 a = round(((1.0 - dx) * 255) / 0.2); 424 a = round(((1.0 - dx) * 255) / 0.2);
425 custom_state(PART:"light", "inv", 0.0); 425 custom_state(PART:"light", "inv", 0.0);
@@ -504,7 +504,7 @@ group { "efl/progressbar/horizontal";
504 target: "text.status"; 504 target: "text.status";
505 } 505 }
506 program { name: "text-visible"; 506 program { name: "text-visible";
507 signal: "elm,state,elm.text,set"; source: "elm"; 507 signal: "elm,state,text,set"; source: "elm";
508 script { 508 script {
509 new m = get_int(slmode); 509 new m = get_int(slmode);
510 m |= LABEL; set_int(slmode, m); 510 m |= LABEL; set_int(slmode, m);
@@ -512,7 +512,7 @@ group { "efl/progressbar/horizontal";
512 } 512 }
513 } 513 }
514 program { name: "text-hidden"; 514 program { name: "text-hidden";
515 signal: "elm,state,elm.text,unset"; source: "elm"; 515 signal: "elm,state,text,unset"; source: "elm";
516 script { 516 script {
517 new m = get_int(slmode); 517 new m = get_int(slmode);
518 m &= ~LABEL; set_int(slmode, m); 518 m &= ~LABEL; set_int(slmode, m);
@@ -782,7 +782,7 @@ group { "efl/progressbar/vertical";
782 image.border_scale_by: 0.25; image.border_scale: 1; 782 image.border_scale_by: 0.25; image.border_scale: 1;
783 } 783 }
784 } 784 }
785 part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0; 785 part { name: "bar"; type: SWALLOW; mouse_events: 0;
786 description { state: "default" 0.0; 786 description { state: "default" 0.0;
787 rel1.to: "inside"; 787 rel1.to: "inside";
788 rel2.to: "inside"; 788 rel2.to: "inside";
@@ -819,7 +819,7 @@ group { "efl/progressbar/vertical";
819 align: 0.5 1.0; 819 align: 0.5 1.0;
820 } 820 }
821 } 821 }
822 part { name: "bar_internal"; 822 part { name: "image_bar";
823 clip_to: "fract_clip"; 823 clip_to: "fract_clip";
824 scale: 1; 824 scale: 1;
825 description { state: "default" 0.0; 825 description { state: "default" 0.0;
@@ -875,10 +875,10 @@ group { "efl/progressbar/vertical";
875 min: 24 64; 875 min: 24 64;
876 max: 24 64; 876 max: 24 64;
877 rel1.to_y: "insidep0"; 877 rel1.to_y: "insidep0";
878 rel1.to_x: "bar_internal"; 878 rel1.to_x: "image_bar";
879 rel1.relative: 0.0 0.0; 879 rel1.relative: 0.0 0.0;
880 rel2.to_y: "insidep1"; 880 rel2.to_y: "insidep1";
881 rel2.to_x: "bar_internal"; 881 rel2.to_x: "image_bar";
882 rel2.relative: 1.0 1.0; 882 rel2.relative: 1.0 1.0;
883 image.normal: "inset_bar_vert_glow_mid_base.png"; 883 image.normal: "inset_bar_vert_glow_mid_base.png";
884 align: 0.5 0.0; 884 align: 0.5 0.0;
@@ -945,11 +945,11 @@ group { "efl/progressbar/vertical";
945 scale: 1; 945 scale: 1;
946 description { state: "default" 0.0; 946 description { state: "default" 0.0;
947 max: 11 36; 947 max: 11 36;
948 rel1.to_y: "bar_internal"; 948 rel1.to_y: "image_bar";
949 rel1.to_x: "bar_internal"; 949 rel1.to_x: "image_bar";
950 rel1.relative: (26/96) 0.0; 950 rel1.relative: (26/96) 0.0;
951 rel2.to_y: "barend"; 951 rel2.to_y: "barend";
952 rel2.to_x: "bar_internal"; 952 rel2.to_x: "image_bar";
953 rel2.relative: ((26+44)/96) 0.2; 953 rel2.relative: ((26+44)/96) 0.2;
954 align: 0.0 1.0; 954 align: 0.0 1.0;
955 image.normal: "inset_bar_vert_glow_light.png"; 955 image.normal: "inset_bar_vert_glow_light.png";
@@ -960,10 +960,10 @@ group { "efl/progressbar/vertical";
960 description { state: "inv" 0.0; 960 description { state: "inv" 0.0;
961 inherit: "default" 0.0; 961 inherit: "default" 0.0;
962 rel1.to_y: "barend"; 962 rel1.to_y: "barend";
963 rel1.to_x: "bar_internal"; 963 rel1.to_x: "image_bar";
964 rel1.relative: (26/96) 0.8; 964 rel1.relative: (26/96) 0.8;
965 rel2.to_y: "bar_internal"; 965 rel2.to_y: "image_bar";
966 rel2.to_x: "bar_internal"; 966 rel2.to_x: "image_bar";
967 rel2.relative: ((26+44)/96) 1.0; 967 rel2.relative: ((26+44)/96) 1.0;
968 align: 0.0 0.0; 968 align: 0.0 0.0;
969 image.normal: "inset_bar_vert_glow_inv_light.png"; 969 image.normal: "inset_bar_vert_glow_inv_light.png";
@@ -975,14 +975,14 @@ group { "efl/progressbar/vertical";
975 program { name: "inverted-on"; 975 program { name: "inverted-on";
976 signal: "elm,state,inverted,on"; source: "elm"; 976 signal: "elm,state,inverted,on"; source: "elm";
977 action: STATE_SET "inv" 0.0; 977 action: STATE_SET "inv" 0.0;
978 target: "bar_internal"; 978 target: "image_bar";
979 target: "barend"; 979 target: "barend";
980 target: "light"; 980 target: "light";
981 } 981 }
982 program { name: "inverted-off"; 982 program { name: "inverted-off";
983 signal: "elm,state,inverted,off"; source: "elm"; 983 signal: "elm,state,inverted,off"; source: "elm";
984 action: STATE_SET "default" 0.0; 984 action: STATE_SET "default" 0.0;
985 target: "bar_internal"; 985 target: "image_bar";
986 target: "barend"; 986 target: "barend";
987 target: "light"; 987 target: "light";
988 } 988 }
@@ -992,7 +992,7 @@ group { "efl/progressbar/vertical";
992 new a, Float:dx, Float:dy, Float:vl, st[20]; 992 new a, Float:dx, Float:dy, Float:vl, st[20];
993 993
994 get_drag(PART:"cur.progressbar", dx, dy); 994 get_drag(PART:"cur.progressbar", dx, dy);
995 get_state(PART:"bar_internal", st, 19, vl); 995 get_state(PART:"image_bar", st, 19, vl);
996 if (!strcmp(st, "inv")) { 996 if (!strcmp(st, "inv")) {
997 a = round(((1.0 - dy) * 255) / 0.2); 997 a = round(((1.0 - dy) * 255) / 0.2);
998 custom_state(PART:"light", "inv", 0.0); 998 custom_state(PART:"light", "inv", 0.0);
@@ -1077,7 +1077,7 @@ group { "efl/progressbar/vertical";
1077 target: "text.status"; 1077 target: "text.status";
1078 } 1078 }
1079 program { name: "text-visible"; 1079 program { name: "text-visible";
1080 signal: "elm,state,elm.text,set"; source: "elm"; 1080 signal: "elm,state,text,set"; source: "elm";
1081 script { 1081 script {
1082 new m = get_int(slmode); 1082 new m = get_int(slmode);
1083 m |= LABEL; set_int(slmode, m); 1083 m |= LABEL; set_int(slmode, m);
@@ -1085,7 +1085,7 @@ group { "efl/progressbar/vertical";
1085 } 1085 }
1086 } 1086 }
1087 program { name: "text-hidden"; 1087 program { name: "text-hidden";
1088 signal: "elm,state,elm.text,unset"; source: "elm"; 1088 signal: "elm,state,text,unset"; source: "elm";
1089 script { 1089 script {
1090 new m = get_int(slmode); 1090 new m = get_int(slmode);
1091 m &= ~LABEL; set_int(slmode, m); 1091 m &= ~LABEL; set_int(slmode, m);
@@ -1136,7 +1136,7 @@ group { "efl/progressbar/horizontal:wheel";
1136 images.image: "knob_round_busy.png" COMP; 1136 images.image: "knob_round_busy.png" COMP;
1137 images.image: "glow_round_corners.png" COMP; 1137 images.image: "glow_round_corners.png" COMP;
1138 parts { 1138 parts {
1139 part { name: "elm.swallow.bar" ; type: SWALLOW; mouse_events: 0; 1139 part { name: "bar" ; type: SWALLOW; mouse_events: 0;
1140 description { state: "default" 0.0; 1140 description { state: "default" 0.0;
1141 min: 0 0; 1141 min: 0 0;
1142 max: 0 0; 1142 max: 0 0;
@@ -1294,7 +1294,7 @@ group { "efl/progressbar/horizontal:double";
1294 program { name: "inverted-on"; 1294 program { name: "inverted-on";
1295 signal: "elm,state,inverted,on"; source: "elm"; 1295 signal: "elm,state,inverted,on"; source: "elm";
1296 action: STATE_SET "inv" 0.0; 1296 action: STATE_SET "inv" 0.0;
1297 target: "bar_internal"; 1297 target: "image_bar";
1298 target: "bar1"; 1298 target: "bar1";
1299 target: "barend"; 1299 target: "barend";
1300 target: "barend1"; 1300 target: "barend1";
@@ -1304,7 +1304,7 @@ group { "efl/progressbar/horizontal:double";
1304 { name: "inverted-off"; 1304 { name: "inverted-off";
1305 signal: "elm,state,inverted,off"; source: "elm"; 1305 signal: "elm,state,inverted,off"; source: "elm";
1306 action: STATE_SET "default" 0.0; 1306 action: STATE_SET "default" 0.0;
1307 target: "bar_internal"; 1307 target: "image_bar";
1308 target: "bar1"; 1308 target: "bar1";
1309 target: "barend"; 1309 target: "barend";
1310 target: "barend1"; 1310 target: "barend1";
@@ -1383,7 +1383,7 @@ group { "efl/progressbar/vertical:double";
1383 program { name: "inverted-on"; 1383 program { name: "inverted-on";
1384 signal: "elm,state,inverted,on"; source: "elm"; 1384 signal: "elm,state,inverted,on"; source: "elm";
1385 action: STATE_SET "inv" 0.0; 1385 action: STATE_SET "inv" 0.0;
1386 target: "bar_internal"; 1386 target: "image_bar";
1387 target: "barend"; 1387 target: "barend";
1388 target: "light"; 1388 target: "light";
1389 target: "bar1"; 1389 target: "bar1";
@@ -1392,7 +1392,7 @@ group { "efl/progressbar/vertical:double";
1392 program { name: "inverted-off"; 1392 program { name: "inverted-off";
1393 signal: "elm,state,inverted,off"; source: "elm"; 1393 signal: "elm,state,inverted,off"; source: "elm";
1394 action: STATE_SET "default" 0.0; 1394 action: STATE_SET "default" 0.0;
1395 target: "bar_internal"; 1395 target: "image_bar";
1396 target: "barend"; 1396 target: "barend";
1397 target: "light"; 1397 target: "light";
1398 target: "bar1"; 1398 target: "bar1";
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index 19aed9c268..b1846315b5 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -237,7 +237,7 @@ group { "efl/radio";
237 target: "indicator"; 237 target: "indicator";
238 } 238 }
239 program { 239 program {
240 signal: "state,text,set"; source: "efl"; 240 signal: "elm,state,text,set"; source: "elm";
241 script { 241 script {
242 new m = get_int(btmode); 242 new m = get_int(btmode);
243 m |= LABEL; set_int(btmode, m); 243 m |= LABEL; set_int(btmode, m);
@@ -245,7 +245,7 @@ group { "efl/radio";
245 } 245 }
246 } 246 }
247 program { 247 program {
248 signal: "state,text,unset"; source: "efl"; 248 signal: "elm,state,text,unset"; source: "elm";
249 script { 249 script {
250 new m = get_int(btmode); 250 new m = get_int(btmode);
251 m &= ~LABEL; set_int(btmode, m); 251 m &= ~LABEL; set_int(btmode, m);
@@ -253,7 +253,7 @@ group { "efl/radio";
253 } 253 }
254 } 254 }
255 program { 255 program {
256 signal: "state,content,set"; source: "efl"; 256 signal: "elm,state,content,set"; source: "elm";
257 script { 257 script {
258 new m = get_int(btmode); 258 new m = get_int(btmode);
259 m |= ICON; set_int(btmode, m); 259 m |= ICON; set_int(btmode, m);
@@ -261,7 +261,7 @@ group { "efl/radio";
261 } 261 }
262 } 262 }
263 program { 263 program {
264 signal: "state,content,unset"; source: "efl"; 264 signal: "elm,state,content,unset"; source: "elm";
265 script { 265 script {
266 new m = get_int(btmode); 266 new m = get_int(btmode);
267 m &= ~ICON; set_int(btmode, m); 267 m &= ~ICON; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc
index 032972b084..59b0797b71 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -155,7 +155,7 @@ group { name: "efl/scroller";
155 rel1.relative: 0.0 1.0; 155 rel1.relative: 0.0 1.0;
156 rel1.to: "sb_vbar_a1"; 156 rel1.to: "sb_vbar_a1";
157 rel2.relative: 1.0 0.0; 157 rel2.relative: 1.0 0.0;
158 rel2.to: "elm.dragable.vbar"; 158 rel2.to: "dragable.vbar";
159 fixed: 1 1; 159 fixed: 1 1;
160 } 160 }
161 } 161 }
@@ -164,13 +164,13 @@ group { name: "efl/scroller";
164 description { state: "default" 0.0; 164 description { state: "default" 0.0;
165 color: 0 0 0 0; 165 color: 0 0 0 0;
166 rel1.relative: 0.0 1.0; 166 rel1.relative: 0.0 1.0;
167 rel1.to: "elm.dragable.vbar"; 167 rel1.to: "dragable.vbar";
168 rel2.relative: 1.0 0.0; 168 rel2.relative: 1.0 0.0;
169 rel2.to: "sb_vbar_a2"; 169 rel2.to: "sb_vbar_a2";
170 fixed: 1 1; 170 fixed: 1 1;
171 } 171 }
172 } 172 }
173 part { name: "elm.dragable.vbar"; type: RECT; 173 part { name: "dragable.vbar"; type: RECT;
174 clip_to: "sb_vbar"; 174 clip_to: "sb_vbar";
175 scale: 1; 175 scale: 1;
176 dragable.x: 0 0 0; 176 dragable.x: 0 0 0;
@@ -218,8 +218,8 @@ group { name: "efl/scroller";
218 max: 4 2; 218 max: 4 2;
219 fixed: 1 1; 219 fixed: 1 1;
220 align: 0.0 0.0; 220 align: 0.0 0.0;
221 rel1.to: "elm.dragable.vbar"; 221 rel1.to: "dragable.vbar";
222 rel2.to: "elm.dragable.vbar"; 222 rel2.to: "dragable.vbar";
223 } 223 }
224 description { state: "hidden" 0.0; 224 description { state: "hidden" 0.0;
225 inherit: "default" 0.0; 225 inherit: "default" 0.0;
@@ -252,8 +252,8 @@ group { name: "efl/scroller";
252 max: 4 2; 252 max: 4 2;
253 fixed: 1 1; 253 fixed: 1 1;
254 align: 0.0 1.0; 254 align: 0.0 1.0;
255 rel1.to: "elm.dragable.vbar"; 255 rel1.to: "dragable.vbar";
256 rel2.to: "elm.dragable.vbar"; 256 rel2.to: "dragable.vbar";
257 } 257 }
258 description { state: "hidden" 0.0; 258 description { state: "hidden" 0.0;
259 inherit: "default" 0.0; 259 inherit: "default" 0.0;
@@ -304,7 +304,7 @@ group { name: "efl/scroller";
304 action: STATE_SET "default" 0.0; 304 action: STATE_SET "default" 0.0;
305 target: "sb_vbar"; 305 target: "sb_vbar";
306 target: "sb_vbar_show"; 306 target: "sb_vbar_show";
307 target: "elm.dragable.vbar"; 307 target: "dragable.vbar";
308 target: "sb_vbar_a1"; 308 target: "sb_vbar_a1";
309 target: "sb_vbar_a2"; 309 target: "sb_vbar_a2";
310 target: "y_vbar_up_mapper"; 310 target: "y_vbar_up_mapper";
@@ -320,7 +320,7 @@ group { name: "efl/scroller";
320 action: STATE_SET "hidden" 0.0; 320 action: STATE_SET "hidden" 0.0;
321 target: "sb_vbar"; 321 target: "sb_vbar";
322 target: "sb_vbar_show"; 322 target: "sb_vbar_show";
323 target: "elm.dragable.vbar"; 323 target: "dragable.vbar";
324 target: "sb_vbar_a1"; 324 target: "sb_vbar_a1";
325 target: "sb_vbar_a2"; 325 target: "sb_vbar_a2";
326 target: "y_vbar_up_mapper"; 326 target: "y_vbar_up_mapper";
@@ -344,7 +344,7 @@ group { name: "efl/scroller";
344 } 344 }
345 program { name: "drag_up"; 345 program { name: "drag_up";
346 action: DRAG_VAL_STEP 0.0 -1.0; 346 action: DRAG_VAL_STEP 0.0 -1.0;
347 target: "elm.dragable.vbar"; 347 target: "dragable.vbar";
348 } 348 }
349 program { 349 program {
350 signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok 350 signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
@@ -360,17 +360,17 @@ group { name: "efl/scroller";
360 } 360 }
361 program { name: "drag_down"; 361 program { name: "drag_down";
362 action: DRAG_VAL_STEP 0.0 1.0; 362 action: DRAG_VAL_STEP 0.0 1.0;
363 target: "elm.dragable.vbar"; 363 target: "dragable.vbar";
364 } 364 }
365 program { 365 program {
366 signal: "mouse,down,1*"; source: "sb_vbar_p1"; 366 signal: "mouse,down,1*"; source: "sb_vbar_p1";
367 action: DRAG_VAL_PAGE 0.0 -1.0; 367 action: DRAG_VAL_PAGE 0.0 -1.0;
368 target: "elm.dragable.vbar"; 368 target: "dragable.vbar";
369 } 369 }
370 program { 370 program {
371 signal: "mouse,down,1*"; source: "sb_vbar_p2"; 371 signal: "mouse,down,1*"; source: "sb_vbar_p2";
372 action: DRAG_VAL_PAGE 0.0 1.0; 372 action: DRAG_VAL_PAGE 0.0 1.0;
373 target: "elm.dragable.vbar"; 373 target: "dragable.vbar";
374 } 374 }
375 program { 375 program {
376 signal: "elm,action,scroll"; source: "elm"; 376 signal: "elm,action,scroll"; source: "elm";
@@ -442,7 +442,7 @@ group { name: "efl/scroller";
442 rel1.relative: 1.0 0.0; 442 rel1.relative: 1.0 0.0;
443 rel1.to: "sb_hbar_a1"; 443 rel1.to: "sb_hbar_a1";
444 rel2.relative: 0.0 1.0; 444 rel2.relative: 0.0 1.0;
445 rel2.to: "elm.dragable.hbar"; 445 rel2.to: "dragable.hbar";
446 fixed: 1 1; 446 fixed: 1 1;
447 } 447 }
448 } 448 }
@@ -451,13 +451,13 @@ group { name: "efl/scroller";
451 description { state: "default" 0.0; 451 description { state: "default" 0.0;
452 color: 0 0 0 0; 452 color: 0 0 0 0;
453 rel1.relative: 1.0 0.0; 453 rel1.relative: 1.0 0.0;
454 rel1.to: "elm.dragable.hbar"; 454 rel1.to: "dragable.hbar";
455 rel2.relative: 0.0 1.0; 455 rel2.relative: 0.0 1.0;
456 rel2.to: "sb_hbar_a2"; 456 rel2.to: "sb_hbar_a2";
457 fixed: 1 1; 457 fixed: 1 1;
458 } 458 }
459 } 459 }
460 part { name: "elm.dragable.hbar"; type: RECT; 460 part { name: "dragable.hbar"; type: RECT;
461 clip_to: "sb_hbar"; 461 clip_to: "sb_hbar";
462 scale: 1; 462 scale: 1;
463 dragable.x: 1 1 0; 463 dragable.x: 1 1 0;
@@ -505,8 +505,8 @@ group { name: "efl/scroller";
505 max: 2 4; 505 max: 2 4;
506 fixed: 1 1; 506 fixed: 1 1;
507 align: 0.0 1.0; 507 align: 0.0 1.0;
508 rel1.to: "elm.dragable.hbar"; 508 rel1.to: "dragable.hbar";
509 rel2.to: "elm.dragable.hbar"; 509 rel2.to: "dragable.hbar";
510 } 510 }
511 description { state: "hidden" 0.0; 511 description { state: "hidden" 0.0;
512 inherit: "default" 0.0; 512 inherit: "default" 0.0;
@@ -539,8 +539,8 @@ group { name: "efl/scroller";
539 max: 2 4; 539 max: 2 4;
540 fixed: 1 1; 540 fixed: 1 1;
541 align: 1.0 1.0; 541 align: 1.0 1.0;
542 rel1.to: "elm.dragable.hbar"; 542 rel1.to: "dragable.hbar";
543 rel2.to: "elm.dragable.hbar"; 543 rel2.to: "dragable.hbar";
544 } 544 }
545 description { state: "hidden" 0.0; 545 description { state: "hidden" 0.0;
546 inherit: "default" 0.0; 546 inherit: "default" 0.0;
@@ -591,7 +591,7 @@ group { name: "efl/scroller";
591 action: STATE_SET "default" 0.0; 591 action: STATE_SET "default" 0.0;
592 target: "sb_hbar"; 592 target: "sb_hbar";
593 target: "sb_hbar_show"; 593 target: "sb_hbar_show";
594 target: "elm.dragable.hbar"; 594 target: "dragable.hbar";
595 target: "sb_hbar_a1"; 595 target: "sb_hbar_a1";
596 target: "sb_hbar_a2"; 596 target: "sb_hbar_a2";
597 target: "x_hbar_left_mapper"; 597 target: "x_hbar_left_mapper";
@@ -607,7 +607,7 @@ group { name: "efl/scroller";
607 action: STATE_SET "hidden" 0.0; 607 action: STATE_SET "hidden" 0.0;
608 target: "sb_hbar"; 608 target: "sb_hbar";
609 target: "sb_hbar_show"; 609 target: "sb_hbar_show";
610 target: "elm.dragable.hbar"; 610 target: "dragable.hbar";
611 target: "sb_hbar_a1"; 611 target: "sb_hbar_a1";
612 target: "sb_hbar_a2"; 612 target: "sb_hbar_a2";
613 target: "x_hbar_left_mapper"; 613 target: "x_hbar_left_mapper";
@@ -631,7 +631,7 @@ group { name: "efl/scroller";
631 } 631 }
632 program { name: "drag_left"; 632 program { name: "drag_left";
633 action: DRAG_VAL_STEP -1.0 0.0; 633 action: DRAG_VAL_STEP -1.0 0.0;
634 target: "elm.dragable.hbar"; 634 target: "dragable.hbar";
635 } 635 }
636 program { 636 program {
637 signal: "mouse,down,1*"; source: "sb_hbar_a2"; 637 signal: "mouse,down,1*"; source: "sb_hbar_a2";
@@ -647,18 +647,18 @@ group { name: "efl/scroller";
647 } 647 }
648 program { name: "drag_right"; 648 program { name: "drag_right";
649 action: DRAG_VAL_STEP 1.0 0.0; 649 action: DRAG_VAL_STEP 1.0 0.0;
650 target: "elm.dragable.hbar"; 650 target: "dragable.hbar";
651 } 651 }
652 program { 652 program {
653 signal: "mouse,down,1*"; source: "sb_hbar_p1"; 653 signal: "mouse,down,1*"; source: "sb_hbar_p1";
654 action: DRAG_VAL_PAGE -1.0 0.0; 654 action: DRAG_VAL_PAGE -1.0 0.0;
655 target: "elm.dragable.hbar"; 655 target: "dragable.hbar";
656 after: "check_pos_hbar"; 656 after: "check_pos_hbar";
657 } 657 }
658 program { 658 program {
659 signal: "mouse,down,1*"; source: "sb_hbar_p2"; 659 signal: "mouse,down,1*"; source: "sb_hbar_p2";
660 action: DRAG_VAL_PAGE 1.0 0.0; 660 action: DRAG_VAL_PAGE 1.0 0.0;
661 target: "elm.dragable.hbar"; 661 target: "dragable.hbar";
662 after: "check_pos_hbar"; 662 after: "check_pos_hbar";
663 } 663 }
664 program { 664 program {
@@ -688,8 +688,8 @@ group { name: "efl/scroller";
688 } 688 }
689 part { name: "bg"; type: RECT; 689 part { name: "bg"; type: RECT;
690 description { state: "default" 0.0; 690 description { state: "default" 0.0;
691 rel1.to: "elm.swallow.background"; 691 rel1.to: "background";
692 rel2.to: "elm.swallow.background"; 692 rel2.to: "background";
693// color: 64 64 64 200; 693// color: 64 64 64 200;
694 color: 0 0 0 0; 694 color: 0 0 0 0;
695 color_class: "scroller_bg"; 695 color_class: "scroller_bg";
@@ -697,11 +697,11 @@ group { name: "efl/scroller";
697 } 697 }
698 part { name: "clipper"; type: RECT; 698 part { name: "clipper"; type: RECT;
699 description { state: "default" 0.0; 699 description { state: "default" 0.0;
700 rel1.to: "elm.swallow.background"; 700 rel1.to: "background";
701 rel2.to: "elm.swallow.background"; 701 rel2.to: "background";
702 } 702 }
703 } 703 }
704 part { name: "elm.swallow.background"; type: SWALLOW; 704 part { name: "background"; type: SWALLOW;
705 clip_to: "clipper"; 705 clip_to: "clipper";
706 description { state: "default" 0.0; 706 description { state: "default" 0.0;
707 rel1.offset: 1 1; 707 rel1.offset: 1 1;
@@ -711,7 +711,7 @@ group { name: "efl/scroller";
711 rel2.to_y: "sb_hbar"; 711 rel2.to_y: "sb_hbar";
712 } 712 }
713 } 713 }
714 part { name: "elm.swallow.content"; type: SWALLOW; 714 part { name: "content"; type: SWALLOW;
715 clip_to: "clipper"; 715 clip_to: "clipper";
716 description { state: "default" 0.0; 716 description { state: "default" 0.0;
717 rel1.offset: 1 1; 717 rel1.offset: 1 1;
@@ -744,11 +744,11 @@ group { name: "efl/scroller";
744 color: 255 255 255 128; 744 color: 255 255 255 128;
745 } 745 }
746 } 746 }
747 part { name: "elm.swallow.overlay"; type: SWALLOW; 747 part { name: "overlay"; type: SWALLOW;
748 clip_to: "clipper"; 748 clip_to: "clipper";
749 description { state: "default" 0.0; 749 description { state: "default" 0.0;
750 rel1.to: "elm.swallow.content"; 750 rel1.to: "content";
751 rel2.to: "elm.swallow.content"; 751 rel2.to: "content";
752 } 752 }
753 } 753 }
754 part { name: "runner_vbar"; mouse_events: 0; 754 part { name: "runner_vbar"; mouse_events: 0;
@@ -915,9 +915,9 @@ group { name: "efl/scroller";
915 description { state: "default" 0.0; 915 description { state: "default" 0.0;
916 fixed: 1 1; 916 fixed: 1 1;
917 rel1.offset: 2 0; 917 rel1.offset: 2 0;
918 rel1.to: "elm.dragable.vbar"; 918 rel1.to: "dragable.vbar";
919 rel2.offset: -3 -1; 919 rel2.offset: -3 -1;
920 rel2.to: "elm.dragable.vbar"; 920 rel2.to: "dragable.vbar";
921 image.normal: "vgrad_med_lighter.png"; 921 image.normal: "vgrad_med_lighter.png";
922 fill.smooth: 0; 922 fill.smooth: 0;
923 min: 3 13; 923 min: 3 13;
@@ -1076,9 +1076,9 @@ group { name: "efl/scroller";
1076 description { state: "default" 0.0; 1076 description { state: "default" 0.0;
1077 fixed: 1 1; 1077 fixed: 1 1;
1078 rel1.offset: 0 2; 1078 rel1.offset: 0 2;
1079 rel1.to: "elm.dragable.hbar"; 1079 rel1.to: "dragable.hbar";
1080 rel2.offset: -1 -3; 1080 rel2.offset: -1 -3;
1081 rel2.to: "elm.dragable.hbar"; 1081 rel2.to: "dragable.hbar";
1082 image.normal: "vgrad_med_lighter.png"; 1082 image.normal: "vgrad_med_lighter.png";
1083 fill.smooth: 0; 1083 fill.smooth: 0;
1084 min: 13 3; 1084 min: 13 3;
@@ -1133,51 +1133,51 @@ group { name: "efl/scroller";
1133 } 1133 }
1134 programs { 1134 programs {
1135 program { 1135 program {
1136 signal: "mouse,down,1*"; source: "elm.dragable.vbar"; 1136 signal: "mouse,down,1*"; source: "dragable.vbar";
1137 action: STATE_SET "clicked" 0.0; 1137 action: STATE_SET "clicked" 0.0;
1138 target: "elm.dragable.vbar"; 1138 target: "dragable.vbar";
1139 target: "shadow_vbar"; 1139 target: "shadow_vbar";
1140 target: "glow_vbar"; 1140 target: "glow_vbar";
1141 target: "center_glow_vbar"; 1141 target: "center_glow_vbar";
1142 } 1142 }
1143 program { 1143 program {
1144 signal: "mouse,down,*"; source: "elm.dragable.vbar"; 1144 signal: "mouse,down,*"; source: "dragable.vbar";
1145 action: SIGNAL_EMIT "elm,vbar,press" "elm"; 1145 action: SIGNAL_EMIT "elm,vbar,press" "elm";
1146 } 1146 }
1147 program { 1147 program {
1148 signal: "mouse,up,1"; source: "elm.dragable.vbar"; 1148 signal: "mouse,up,1"; source: "dragable.vbar";
1149 action: STATE_SET "default" 0.0; 1149 action: STATE_SET "default" 0.0;
1150 target: "elm.dragable.vbar"; 1150 target: "dragable.vbar";
1151 target: "shadow_vbar"; 1151 target: "shadow_vbar";
1152 target: "glow_vbar"; 1152 target: "glow_vbar";
1153 target: "center_glow_vbar"; 1153 target: "center_glow_vbar";
1154 } 1154 }
1155 program { 1155 program {
1156 signal: "mouse,up,*"; source: "elm.dragable.vbar"; 1156 signal: "mouse,up,*"; source: "dragable.vbar";
1157 action: SIGNAL_EMIT "elm,vbar,unpress" "elm"; 1157 action: SIGNAL_EMIT "elm,vbar,unpress" "elm";
1158 } 1158 }
1159 program { 1159 program {
1160 signal: "mouse,down,1*"; source: "elm.dragable.hbar"; 1160 signal: "mouse,down,1*"; source: "dragable.hbar";
1161 action: STATE_SET "clicked" 0.0; 1161 action: STATE_SET "clicked" 0.0;
1162 target: "elm.dragable.hbar"; 1162 target: "dragable.hbar";
1163 target: "shadow_hbar"; 1163 target: "shadow_hbar";
1164 target: "glow_hbar"; 1164 target: "glow_hbar";
1165 target: "center_glow_hbar"; 1165 target: "center_glow_hbar";
1166 } 1166 }
1167 program { 1167 program {
1168 signal: "mouse,down,*"; source: "elm.dragable.hbar"; 1168 signal: "mouse,down,*"; source: "dragable.hbar";
1169 action: SIGNAL_EMIT "elm,hbar,press" "elm"; 1169 action: SIGNAL_EMIT "elm,hbar,press" "elm";
1170 } 1170 }
1171 program { 1171 program {
1172 signal: "mouse,up,1"; source: "elm.dragable.hbar"; 1172 signal: "mouse,up,1"; source: "dragable.hbar";
1173 action: STATE_SET "default" 0.0; 1173 action: STATE_SET "default" 0.0;
1174 target: "elm.dragable.hbar"; 1174 target: "dragable.hbar";
1175 target: "shadow_hbar"; 1175 target: "shadow_hbar";
1176 target: "glow_hbar"; 1176 target: "glow_hbar";
1177 target: "center_glow_hbar"; 1177 target: "center_glow_hbar";
1178 } 1178 }
1179 program { 1179 program {
1180 signal: "mouse,up,*"; source: "elm.dragable.hbar"; 1180 signal: "mouse,up,*"; source: "dragable.hbar";
1181 action: SIGNAL_EMIT "elm,hbar,unpress" "elm"; 1181 action: SIGNAL_EMIT "elm,hbar,unpress" "elm";
1182 } 1182 }
1183 program { 1183 program {
@@ -1256,13 +1256,13 @@ group { name: "efl/scroller:noclip";
1256 rel2.offset: 999999 999999; 1256 rel2.offset: 999999 999999;
1257 } 1257 }
1258 } 1258 }
1259 part { name: "elm.swallow.background"; 1259 part { name: "background";
1260 description { state: "default" 0.0; 1260 description { state: "default" 0.0;
1261 rel1.offset: 0 0; 1261 rel1.offset: 0 0;
1262 rel2.offset: -1 -1; 1262 rel2.offset: -1 -1;
1263 } 1263 }
1264 } 1264 }
1265 part { name: "elm.swallow.content"; 1265 part { name: "content";
1266 description { state: "default" 0.0; 1266 description { state: "default" 0.0;
1267 rel1.offset: 0 1; 1267 rel1.offset: 0 1;
1268 rel2.offset: -1 -1; 1268 rel2.offset: -1 -1;
@@ -1283,50 +1283,50 @@ group { name: "efl/scroller:noclip";
1283 1283
1284group { name: "efl/scroller/contents"; 1284group { name: "efl/scroller/contents";
1285 parts { 1285 parts {
1286 part { name: "elm.swallow.content"; 1286 part { name: "content";
1287 type: SWALLOW; 1287 type: SWALLOW;
1288 description { state: "default" 0.0; 1288 description { state: "default" 0.0;
1289 } 1289 }
1290 } 1290 }
1291 part { name: "elm.swallow.content_r"; 1291 part { name: "content_r";
1292 type: SWALLOW; 1292 type: SWALLOW;
1293 description { state: "default" 0.0; 1293 description { state: "default" 0.0;
1294 fixed: 1 1; 1294 fixed: 1 1;
1295 rel1 { 1295 rel1 {
1296 relative: 1.0 0.0; 1296 relative: 1.0 0.0;
1297 to: "elm.swallow.content"; 1297 to: "content";
1298 } 1298 }
1299 rel2 { 1299 rel2 {
1300 relative: 2.0 1.0; 1300 relative: 2.0 1.0;
1301 to: "elm.swallow.content"; 1301 to: "content";
1302 } 1302 }
1303 } 1303 }
1304 } 1304 }
1305 part { name: "elm.swallow.content_b"; 1305 part { name: "content_b";
1306 type: SWALLOW; 1306 type: SWALLOW;
1307 description { state: "default" 0.0; 1307 description { state: "default" 0.0;
1308 fixed: 1 1; 1308 fixed: 1 1;
1309 rel1 { 1309 rel1 {
1310 relative: 0.0 1.0; 1310 relative: 0.0 1.0;
1311 to: "elm.swallow.content"; 1311 to: "content";
1312 } 1312 }
1313 rel2 { 1313 rel2 {
1314 relative: 1.0 2.0; 1314 relative: 1.0 2.0;
1315 to: "elm.swallow.content"; 1315 to: "content";
1316 } 1316 }
1317 } 1317 }
1318 } 1318 }
1319 part { name: "elm.swallow.content_rb"; 1319 part { name: "content_rb";
1320 type: SWALLOW; 1320 type: SWALLOW;
1321 description { state: "default" 0.0; 1321 description { state: "default" 0.0;
1322 fixed: 1 1; 1322 fixed: 1 1;
1323 rel1 { 1323 rel1 {
1324 relative: 1.0 1.0; 1324 relative: 1.0 1.0;
1325 to: "elm.swallow.content"; 1325 to: "content";
1326 } 1326 }
1327 rel2 { 1327 rel2 {
1328 relative: 2.0 2.0; 1328 relative: 2.0 2.0;
1329 to: "elm.swallow.content"; 1329 to: "content";
1330 } 1330 }
1331 } 1331 }
1332 } 1332 }
diff --git a/data/elementary/themes/edc/efl/tooltip.edc b/data/elementary/themes/edc/efl/tooltip.edc
index 389d3894e6..cbe4ca222c 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -11,7 +11,7 @@ group { name: "efl/label/tooltip";
11 } 11 }
12 } 12 }
13 parts { 13 parts {
14 part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; 14 part { name: "text"; type: TEXTBLOCK; mouse_events: 0;
15 scale: 1; 15 scale: 1;
16 description { state: "default" 0.0; 16 description { state: "default" 0.0;
17 text { 17 text {
@@ -161,11 +161,11 @@ group { name: "efl/tooltip";
161 description { state: "default" 0.0; 161 description { state: "default" 0.0;
162 min: 30 30; 162 min: 30 30;
163 rel1 { 163 rel1 {
164 to: "elm.swallow.content"; 164 to: "content";
165 offset: -5 -4; 165 offset: -5 -4;
166 } 166 }
167 rel2 { 167 rel2 {
168 to: "elm.swallow.content"; 168 to: "content";
169 offset: 4 5; 169 offset: 4 5;
170 } 170 }
171 image { 171 image {
@@ -217,12 +217,12 @@ group { name: "efl/tooltip";
217 rel1 { \ 217 rel1 { \
218 relative: rx 0.0; \ 218 relative: rx 0.0; \
219 offset: ox 0; \ 219 offset: ox 0; \
220 to: "elm.swallow.content"; \ 220 to: "content"; \
221 } \ 221 } \
222 rel2 { \ 222 rel2 { \
223 relative: rx 1.0; \ 223 relative: rx 1.0; \
224 offset: ox 0; \ 224 offset: ox 0; \
225 to: "elm.swallow.content"; \ 225 to: "content"; \
226 } \ 226 } \
227 } \ 227 } \
228 description { state: "visible" 0.0; \ 228 description { state: "visible" 0.0; \
@@ -241,12 +241,12 @@ group { name: "efl/tooltip";
241 rel1 { \ 241 rel1 { \
242 relative: rx 0.0; \ 242 relative: rx 0.0; \
243 offset: ox 0; \ 243 offset: ox 0; \
244 to: "elm.swallow.content"; \ 244 to: "content"; \
245 } \ 245 } \
246 rel2 { \ 246 rel2 { \
247 relative: rx 1.0; \ 247 relative: rx 1.0; \
248 offset: ox 0; \ 248 offset: ox 0; \
249 to: "elm.swallow.content"; \ 249 to: "content"; \
250 } \ 250 } \
251 } \ 251 } \
252 } \ 252 } \
@@ -291,12 +291,12 @@ group { name: "efl/tooltip";
291 rel1 { \ 291 rel1 { \
292 relative: 0.0 ry; \ 292 relative: 0.0 ry; \
293 offset: 0 oy; \ 293 offset: 0 oy; \
294 to: "elm.swallow.content"; \ 294 to: "content"; \
295 } \ 295 } \
296 rel2 { \ 296 rel2 { \
297 relative: 1.0 ry; \ 297 relative: 1.0 ry; \
298 offset: 0 oy; \ 298 offset: 0 oy; \
299 to: "elm.swallow.content"; \ 299 to: "content"; \
300 } \ 300 } \
301 } \ 301 } \
302 description { state: "visible" 0.0; \ 302 description { state: "visible" 0.0; \
@@ -348,15 +348,15 @@ group { name: "efl/tooltip";
348 part { name: "clipper_content"; type: RECT; 348 part { name: "clipper_content"; type: RECT;
349 description { state: "default" 0.0; 349 description { state: "default" 0.0;
350 color: 255 255 255 0; 350 color: 255 255 255 0;
351 rel1.to: "elm.swallow.content"; 351 rel1.to: "content";
352 rel2.to: "elm.swallow.content"; 352 rel2.to: "content";
353 } 353 }
354 description { state: "visible" 0.0; 354 description { state: "visible" 0.0;
355 inherit: "default" 0.0; 355 inherit: "default" 0.0;
356 color: 255 255 255 255; 356 color: 255 255 255 255;
357 } 357 }
358 } 358 }
359 part { name: "elm.swallow.content"; type: SWALLOW; 359 part { name: "content"; type: SWALLOW;
360 clip_to: "clipper_content"; 360 clip_to: "clipper_content";
361 description { state: "default" 0.0; 361 description { state: "default" 0.0;
362 rel1.offset: 10 10; 362 rel1.offset: 10 10;
@@ -421,7 +421,7 @@ group { name: "efl/tooltip:transparent";
421 data.item: "pad_y" "10"; 421 data.item: "pad_y" "10";
422 data.item: "transparent" "enabled"; 422 data.item: "transparent" "enabled";
423 parts { 423 parts {
424 part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0; 424 part { name: "content"; type: SWALLOW; mouse_events: 0;
425 scale: 1; 425 scale: 1;
426 description { state: "default" 0.0; } 426 description { state: "default" 0.0; }
427 } 427 }
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 931372ae00..ecfb4e48c8 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -335,14 +335,8 @@ _efl_ui_button_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSE
335/* Standard widget overrides */ 335/* Standard widget overrides */
336 336
337ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) 337ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
338static const char * _efl_ui_button_default_text_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
339{
340 if (elm_widget_is_legacy(obj))
341 return "elm.text";
342 else
343 return "text";
344}
345ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) 338ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
339
346static const char * _efl_ui_button_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED) 340static const char * _efl_ui_button_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
347{ 341{
348 if (elm_widget_is_legacy(obj)) 342 if (elm_widget_is_legacy(obj))
@@ -350,6 +344,7 @@ static const char * _efl_ui_button_default_content_part_get(const Eo *obj EINA_U
350 else 344 else
351 return "content"; 345 return "content";
352} 346}
347
353ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) 348ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
354 349
355EAPI void 350EAPI void
@@ -391,14 +386,11 @@ elm_button_autorepeat_get(const Evas_Object *obj)
391/* Internal EO APIs and hidden overrides */ 386/* Internal EO APIs and hidden overrides */
392 387
393ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 388ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
394ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
395 389
396#define EFL_UI_BUTTON_EXTRA_OPS \ 390#define EFL_UI_BUTTON_EXTRA_OPS \
397 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 391 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
398 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
399 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \ 392 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
400 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \ 393 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \
401 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_button), \
402 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button) 394 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button)
403 395
404#include "efl_ui_button.eo.c" 396#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 4614419705..dcde1a6830 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -402,13 +402,8 @@ _icon_signal_emit(Evas_Object *obj)
402 char buf[64]; 402 char buf[64];
403 403
404 if (!elm_widget_resize_object_get(obj)) return; 404 if (!elm_widget_resize_object_get(obj)) return;
405 405 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
406 if (elm_widget_is_legacy(obj)) 406 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
407 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
408 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
409 else
410 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
411 elm_layout_content_get(obj, "content") ? "visible" : "hidden");
412 407
413 elm_layout_signal_emit(obj, buf, "elm"); 408 elm_layout_signal_emit(obj, buf, "elm");
414 edje_object_message_signal_process(wd->resize_obj); 409 edje_object_message_signal_process(wd->resize_obj);
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index a2bb38ffb3..8a6c36182b 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1366,10 +1366,20 @@ _efl_ui_image_zoomable_bar_read_and_update(Eo *obj)
1366 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1366 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1367 double vx, vy; 1367 double vx, vy;
1368 1368
1369 edje_object_part_drag_value_get 1369 if (elm_widget_is_legacy(obj))
1370 (wd->resize_obj, "elm.dragable.vbar", NULL, &vy); 1370 {
1371 edje_object_part_drag_value_get 1371 edje_object_part_drag_value_get
1372 (wd->resize_obj, "elm.dragable.hbar", &vx, NULL); 1372 (wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
1373 edje_object_part_drag_value_get
1374 (wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
1375 }
1376 else
1377 {
1378 edje_object_part_drag_value_get
1379 (wd->resize_obj, "dragable.vbar", NULL, &vy);
1380 edje_object_part_drag_value_get
1381 (wd->resize_obj, "dragable.hbar", &vx, NULL);
1382 }
1373 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy); 1383 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
1374} 1384}
1375 1385
@@ -1496,8 +1506,17 @@ _efl_ui_image_zoomable_bar_size_changed_cb(void *data, const Efl_Event *event EI
1496 double width = 0.0, height = 0.0; 1506 double width = 0.0, height = 0.0;
1497 1507
1498 efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height); 1508 efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
1499 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0); 1509
1500 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height); 1510 if (elm_widget_is_legacy(obj))
1511 {
1512 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
1513 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
1514 }
1515 else
1516 {
1517 edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0);
1518 edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height);
1519 }
1501} 1520}
1502 1521
1503static void 1522static void
@@ -1510,8 +1529,17 @@ _efl_ui_image_zoomable_bar_pos_changed_cb(void *data, const Efl_Event *event EIN
1510 double posx = 0.0, posy = 0.0; 1529 double posx = 0.0, posy = 0.0;
1511 1530
1512 efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy); 1531 efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
1513 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0); 1532
1514 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy); 1533 if (elm_widget_is_legacy(obj))
1534 {
1535 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
1536 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
1537 }
1538 else
1539 {
1540 edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0);
1541 edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy);
1542 }
1515} 1543}
1516 1544
1517static void 1545static void
@@ -1543,111 +1571,223 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
1543static void 1571static void
1544_efl_ui_image_zoomable_edje_object_attach(Eo *obj) 1572_efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1545{ 1573{
1546 efl_layout_signal_callback_add 1574 if (elm_widget_is_legacy(obj))
1547 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj); 1575 {
1548 efl_layout_signal_callback_add 1576 efl_layout_signal_callback_add
1549 (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, 1577 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
1550 obj); 1578 efl_layout_signal_callback_add
1551 efl_layout_signal_callback_add 1579 (obj, "drag", "elm.dragable.vbar",
1552 (obj, "drag,set", "elm.dragable.vbar", 1580 _efl_ui_image_zoomable_vbar_drag_cb, obj);
1553 _efl_ui_image_zoomable_edje_drag_cb, obj); 1581 efl_layout_signal_callback_add
1554 efl_layout_signal_callback_add 1582 (obj, "drag,set", "elm.dragable.vbar",
1555 (obj, "drag,start", "elm.dragable.vbar", 1583 _efl_ui_image_zoomable_edje_drag_cb, obj);
1556 _efl_ui_image_zoomable_edje_drag_start_cb, obj); 1584 efl_layout_signal_callback_add
1557 efl_layout_signal_callback_add 1585 (obj, "drag,start", "elm.dragable.vbar",
1558 (obj, "drag,stop", "elm.dragable.vbar", 1586 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1559 _efl_ui_image_zoomable_edje_drag_stop_cb, obj); 1587 efl_layout_signal_callback_add
1560 efl_layout_signal_callback_add 1588 (obj, "drag,stop", "elm.dragable.vbar",
1561 (obj, "drag,step", "elm.dragable.vbar", 1589 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1562 _efl_ui_image_zoomable_edje_drag_cb, obj); 1590 efl_layout_signal_callback_add
1563 efl_layout_signal_callback_add 1591 (obj, "drag,step", "elm.dragable.vbar",
1564 (obj, "drag,page", "elm.dragable.vbar", 1592 _efl_ui_image_zoomable_edje_drag_cb, obj);
1565 _efl_ui_image_zoomable_edje_drag_cb, obj); 1593 efl_layout_signal_callback_add
1566 efl_layout_signal_callback_add 1594 (obj, "drag,page", "elm.dragable.vbar",
1567 (obj, "elm,vbar,press", "elm", 1595 _efl_ui_image_zoomable_edje_drag_cb, obj);
1568 _efl_ui_image_zoomable_vbar_press_cb, obj); 1596 efl_layout_signal_callback_add
1569 efl_layout_signal_callback_add 1597 (obj, "elm,vbar,press", "elm",
1570 (obj, "elm,vbar,unpress", "elm", 1598 _efl_ui_image_zoomable_vbar_press_cb, obj);
1571 _efl_ui_image_zoomable_vbar_unpress_cb, obj); 1599 efl_layout_signal_callback_add
1572 efl_layout_signal_callback_add 1600 (obj, "elm,vbar,unpress", "elm",
1573 (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, 1601 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1574 obj); 1602 efl_layout_signal_callback_add
1575 efl_layout_signal_callback_add 1603 (obj, "drag", "elm.dragable.hbar",
1576 (obj, "drag,set", "elm.dragable.hbar", 1604 _efl_ui_image_zoomable_hbar_drag_cb, obj);
1577 _efl_ui_image_zoomable_edje_drag_cb, obj); 1605 efl_layout_signal_callback_add
1578 efl_layout_signal_callback_add 1606 (obj, "drag,set", "elm.dragable.hbar",
1579 (obj, "drag,start", "elm.dragable.hbar", 1607 _efl_ui_image_zoomable_edje_drag_cb, obj);
1580 _efl_ui_image_zoomable_edje_drag_start_cb, obj); 1608 efl_layout_signal_callback_add
1581 efl_layout_signal_callback_add 1609 (obj, "drag,start", "elm.dragable.hbar",
1582 (obj, "drag,stop", "elm.dragable.hbar", 1610 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1583 _efl_ui_image_zoomable_edje_drag_stop_cb, obj); 1611 efl_layout_signal_callback_add
1584 efl_layout_signal_callback_add 1612 (obj, "drag,stop", "elm.dragable.hbar",
1585 (obj, "drag,step", "elm.dragable.hbar", 1613 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1586 _efl_ui_image_zoomable_edje_drag_cb, obj); 1614 efl_layout_signal_callback_add
1587 efl_layout_signal_callback_add 1615 (obj, "drag,step", "elm.dragable.hbar",
1588 (obj, "drag,page", "elm.dragable.hbar", 1616 _efl_ui_image_zoomable_edje_drag_cb, obj);
1589 _efl_ui_image_zoomable_edje_drag_cb, obj); 1617 efl_layout_signal_callback_add
1590 efl_layout_signal_callback_add 1618 (obj, "drag,page", "elm.dragable.hbar",
1591 (obj, "elm,hbar,press", "elm", 1619 _efl_ui_image_zoomable_edje_drag_cb, obj);
1592 _efl_ui_image_zoomable_hbar_press_cb, obj); 1620 efl_layout_signal_callback_add
1593 efl_layout_signal_callback_add 1621 (obj, "elm,hbar,press", "elm",
1594 (obj, "elm,hbar,unpress", "elm", 1622 _efl_ui_image_zoomable_hbar_press_cb, obj);
1595 _efl_ui_image_zoomable_hbar_unpress_cb, obj); 1623 efl_layout_signal_callback_add
1624 (obj, "elm,hbar,unpress", "elm",
1625 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1626 }
1627 else
1628 {
1629 efl_layout_signal_callback_add
1630 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
1631 efl_layout_signal_callback_add
1632 (obj, "drag", "dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
1633 obj);
1634 efl_layout_signal_callback_add
1635 (obj, "drag,set", "dragable.vbar",
1636 _efl_ui_image_zoomable_edje_drag_cb, obj);
1637 efl_layout_signal_callback_add
1638 (obj, "drag,start", "dragable.vbar",
1639 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1640 efl_layout_signal_callback_add
1641 (obj, "drag,stop", "dragable.vbar",
1642 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1643 efl_layout_signal_callback_add
1644 (obj, "drag,step", "dragable.vbar",
1645 _efl_ui_image_zoomable_edje_drag_cb, obj);
1646 efl_layout_signal_callback_add
1647 (obj, "drag,page", "dragable.vbar",
1648 _efl_ui_image_zoomable_edje_drag_cb, obj);
1649 efl_layout_signal_callback_add
1650 (obj, "elm,vbar,press", "elm",
1651 _efl_ui_image_zoomable_vbar_press_cb, obj);
1652 efl_layout_signal_callback_add
1653 (obj, "elm,vbar,unpress", "elm",
1654 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1655 efl_layout_signal_callback_add
1656 (obj, "drag", "dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
1657 obj);
1658 efl_layout_signal_callback_add
1659 (obj, "drag,set", "dragable.hbar",
1660 _efl_ui_image_zoomable_edje_drag_cb, obj);
1661 efl_layout_signal_callback_add
1662 (obj, "drag,start", "dragable.hbar",
1663 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1664 efl_layout_signal_callback_add
1665 (obj, "drag,stop", "dragable.hbar",
1666 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1667 efl_layout_signal_callback_add
1668 (obj, "drag,step", "dragable.hbar",
1669 _efl_ui_image_zoomable_edje_drag_cb, obj);
1670 efl_layout_signal_callback_add
1671 (obj, "drag,page", "dragable.hbar",
1672 _efl_ui_image_zoomable_edje_drag_cb, obj);
1673 efl_layout_signal_callback_add
1674 (obj, "elm,hbar,press", "elm",
1675 _efl_ui_image_zoomable_hbar_press_cb, obj);
1676 efl_layout_signal_callback_add
1677 (obj, "elm,hbar,unpress", "elm",
1678 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1679 }
1596} 1680}
1597 1681
1598static void 1682static void
1599_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) 1683_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1600{ 1684{
1601 efl_layout_signal_callback_del 1685 if (elm_widget_is_legacy(obj))
1602 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj); 1686 {
1603 efl_layout_signal_callback_del 1687 efl_layout_signal_callback_del
1604 (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, 1688 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
1605 obj); 1689 efl_layout_signal_callback_del
1606 efl_layout_signal_callback_del 1690 (obj, "drag", "elm.dragable.vbar",
1607 (obj, "drag,set", "elm.dragable.vbar", 1691 _efl_ui_image_zoomable_vbar_drag_cb, obj);
1608 _efl_ui_image_zoomable_edje_drag_cb, obj); 1692 efl_layout_signal_callback_del
1609 efl_layout_signal_callback_del 1693 (obj, "drag,set", "elm.dragable.vbar",
1610 (obj, "drag,start", "elm.dragable.vbar", 1694 _efl_ui_image_zoomable_edje_drag_cb, obj);
1611 _efl_ui_image_zoomable_edje_drag_start_cb, obj); 1695 efl_layout_signal_callback_del
1612 efl_layout_signal_callback_del 1696 (obj, "drag,start", "elm.dragable.vbar",
1613 (obj, "drag,stop", "elm.dragable.vbar", 1697 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1614 _efl_ui_image_zoomable_edje_drag_stop_cb, obj); 1698 efl_layout_signal_callback_del
1615 efl_layout_signal_callback_del 1699 (obj, "drag,stop", "elm.dragable.vbar",
1616 (obj, "drag,step", "elm.dragable.vbar", 1700 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1617 _efl_ui_image_zoomable_edje_drag_cb, obj); 1701 efl_layout_signal_callback_del
1618 efl_layout_signal_callback_del 1702 (obj, "drag,step", "elm.dragable.vbar",
1619 (obj, "drag,page", "elm.dragable.vbar", 1703 _efl_ui_image_zoomable_edje_drag_cb, obj);
1620 _efl_ui_image_zoomable_edje_drag_cb, obj); 1704 efl_layout_signal_callback_del
1621 efl_layout_signal_callback_del 1705 (obj, "drag,page", "elm.dragable.vbar",
1622 (obj, "elm,vbar,press", "elm", 1706 _efl_ui_image_zoomable_edje_drag_cb, obj);
1623 _efl_ui_image_zoomable_vbar_press_cb, obj); 1707 efl_layout_signal_callback_del
1624 efl_layout_signal_callback_del 1708 (obj, "elm,vbar,press", "elm",
1625 (obj, "elm,vbar,unpress", "elm", 1709 _efl_ui_image_zoomable_vbar_press_cb, obj);
1626 _efl_ui_image_zoomable_vbar_unpress_cb, obj); 1710 efl_layout_signal_callback_del
1627 efl_layout_signal_callback_del 1711 (obj, "elm,vbar,unpress", "elm",
1628 (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, 1712 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1629 obj); 1713 efl_layout_signal_callback_del
1630 efl_layout_signal_callback_del 1714 (obj, "drag", "elm.dragable.hbar",
1631 (obj, "drag,set", "elm.dragable.hbar", 1715 _efl_ui_image_zoomable_hbar_drag_cb, obj);
1632 _efl_ui_image_zoomable_edje_drag_cb, obj); 1716 efl_layout_signal_callback_del
1633 efl_layout_signal_callback_del 1717 (obj, "drag,set", "elm.dragable.hbar",
1634 (obj, "drag,start", "elm.dragable.hbar", 1718 _efl_ui_image_zoomable_edje_drag_cb, obj);
1635 _efl_ui_image_zoomable_edje_drag_start_cb, obj); 1719 efl_layout_signal_callback_del
1636 efl_layout_signal_callback_del 1720 (obj, "drag,start", "elm.dragable.hbar",
1637 (obj, "drag,stop", "elm.dragable.hbar", 1721 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1638 _efl_ui_image_zoomable_edje_drag_stop_cb, obj); 1722 efl_layout_signal_callback_del
1639 efl_layout_signal_callback_del 1723 (obj, "drag,stop", "elm.dragable.hbar",
1640 (obj, "drag,step", "elm.dragable.hbar", 1724 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1641 _efl_ui_image_zoomable_edje_drag_cb, obj); 1725 efl_layout_signal_callback_del
1642 efl_layout_signal_callback_del 1726 (obj, "drag,step", "elm.dragable.hbar",
1643 (obj, "drag,page", "elm.dragable.hbar", 1727 _efl_ui_image_zoomable_edje_drag_cb, obj);
1644 _efl_ui_image_zoomable_edje_drag_cb, obj); 1728 efl_layout_signal_callback_del
1645 efl_layout_signal_callback_del 1729 (obj, "drag,page", "elm.dragable.hbar",
1646 (obj, "elm,hbar,press", "elm", 1730 _efl_ui_image_zoomable_edje_drag_cb, obj);
1647 _efl_ui_image_zoomable_hbar_press_cb, obj); 1731 efl_layout_signal_callback_del
1648 efl_layout_signal_callback_del 1732 (obj, "elm,hbar,press", "elm",
1649 (obj, "elm,hbar,unpress", "elm", 1733 _efl_ui_image_zoomable_hbar_press_cb, obj);
1650 _efl_ui_image_zoomable_hbar_unpress_cb, obj); 1734 efl_layout_signal_callback_del
1735 (obj, "elm,hbar,unpress", "elm",
1736 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1737 }
1738 else
1739 {
1740 efl_layout_signal_callback_del
1741 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
1742 efl_layout_signal_callback_del
1743 (obj, "drag", "dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
1744 obj);
1745 efl_layout_signal_callback_del
1746 (obj, "drag,set", "dragable.vbar",
1747 _efl_ui_image_zoomable_edje_drag_cb, obj);
1748 efl_layout_signal_callback_del
1749 (obj, "drag,start", "dragable.vbar",
1750 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1751 efl_layout_signal_callback_del
1752 (obj, "drag,stop", "dragable.vbar",
1753 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1754 efl_layout_signal_callback_del
1755 (obj, "drag,step", "dragable.vbar",
1756 _efl_ui_image_zoomable_edje_drag_cb, obj);
1757 efl_layout_signal_callback_del
1758 (obj, "drag,page", "dragable.vbar",
1759 _efl_ui_image_zoomable_edje_drag_cb, obj);
1760 efl_layout_signal_callback_del
1761 (obj, "elm,vbar,press", "elm",
1762 _efl_ui_image_zoomable_vbar_press_cb, obj);
1763 efl_layout_signal_callback_del
1764 (obj, "elm,vbar,unpress", "elm",
1765 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1766 efl_layout_signal_callback_del
1767 (obj, "drag", "dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
1768 obj);
1769 efl_layout_signal_callback_del
1770 (obj, "drag,set", "dragable.hbar",
1771 _efl_ui_image_zoomable_edje_drag_cb, obj);
1772 efl_layout_signal_callback_del
1773 (obj, "drag,start", "dragable.hbar",
1774 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1775 efl_layout_signal_callback_del
1776 (obj, "drag,stop", "dragable.hbar",
1777 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1778 efl_layout_signal_callback_del
1779 (obj, "drag,step", "dragable.hbar",
1780 _efl_ui_image_zoomable_edje_drag_cb, obj);
1781 efl_layout_signal_callback_del
1782 (obj, "drag,page", "dragable.hbar",
1783 _efl_ui_image_zoomable_edje_drag_cb, obj);
1784 efl_layout_signal_callback_del
1785 (obj, "elm,hbar,press", "elm",
1786 _efl_ui_image_zoomable_hbar_press_cb, obj);
1787 efl_layout_signal_callback_del
1788 (obj, "elm,hbar,unpress", "elm",
1789 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1790 }
1651} 1791}
1652 1792
1653EOLIAN static void 1793EOLIAN static void
@@ -1678,7 +1818,10 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable
1678 priv->pan_obj = efl_add(MY_PAN_CLASS, obj); 1818 priv->pan_obj = efl_add(MY_PAN_CLASS, obj);
1679 1819
1680 efl_ui_scroll_manager_pan_set(priv->smanager, priv->pan_obj); 1820 efl_ui_scroll_manager_pan_set(priv->smanager, priv->pan_obj);
1681 edje_object_part_swallow(edje, "elm.swallow.content", priv->pan_obj); 1821 if (elm_widget_is_legacy(obj))
1822 edje_object_part_swallow(edje, "elm.swallow.content", priv->pan_obj);
1823 else
1824 edje_object_part_swallow(edje, "content", priv->pan_obj);
1682 1825
1683 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS); 1826 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
1684 efl_data_ref(obj, MY_CLASS); 1827 efl_data_ref(obj, MY_CLASS);
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index eaf0a4f2aa..15567d0ce0 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -171,14 +171,13 @@ _signals_emit(Eo *obj,
171 { 171 {
172 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type, 172 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
173 set ? "visible" : "hidden"); 173 set ? "visible" : "hidden");
174 efl_layout_signal_emit(obj, buf, "elm");
175 } 174 }
176 else 175 else
177 { 176 {
178 snprintf(buf, sizeof(buf), "state,%s,%s", type, 177 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
179 set ? "set" : "unset"); 178 set ? "set" : "unset");
180 efl_layout_signal_emit(obj, buf, "efl");
181 } 179 }
180 efl_layout_signal_emit(obj, buf, "elm");
182} 181}
183 182
184static inline void 183static inline void
@@ -205,7 +204,8 @@ _icon_signal_emit(Efl_Ui_Layout_Data *sd,
205 } 204 }
206 } 205 }
207 206
208 if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow."))) 207 if (elm_widget_is_legacy(sd->obj) &&
208 !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
209 type = sub_d->part + strlen("elm.swallow."); 209 type = sub_d->part + strlen("elm.swallow.");
210 else 210 else
211 type = sub_d->part; 211 type = sub_d->part;
@@ -231,12 +231,7 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd,
231 { 231 {
232 if (elm_widget_is_legacy(sd->obj) && 232 if (elm_widget_is_legacy(sd->obj) &&
233 !((!strcmp("elm.text", sub_d->part)) || 233 !((!strcmp("elm.text", sub_d->part)) ||
234 (!strncmp("elm.text.", sub_d->part, 9)))) 234 (!strncmp("elm.text.", sub_d->part, 9))))
235 {
236 return;
237 }
238 else if(!((!strcmp("text", sub_d->part)) ||
239 (!strncmp("text.", sub_d->part, 5))))
240 { 235 {
241 return; 236 return;
242 } 237 }
@@ -526,10 +521,13 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj,
526 521
527 if (!elm_widget_is_legacy(obj)) 522 if (!elm_widget_is_legacy(obj))
528 { 523 {
529 if (is_text) 524 if (!*part)
530 *part = efl_ui_default_text; 525 {
531 else 526 if (is_text)
532 *part = efl_ui_default_content; 527 *part = efl_ui_default_text;
528 else
529 *part = efl_ui_default_content;
530 }
533 return EINA_TRUE; 531 return EINA_TRUE;
534 } 532 }
535 533
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index e28f81dabe..421f78197b 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -364,9 +364,10 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
364 364
365 if (eina_streq(pd->part, "backwall")) 365 if (eina_streq(pd->part, "backwall"))
366 { 366 {
367 Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "image"); 367 Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "content");
368 if (prev_obj) 368 if (prev_obj)
369 { 369 {
370 edje_object_signal_emit(sd->backwall, "elm,state,content,unset", "elm");
370 edje_object_part_unswallow(sd->backwall, prev_obj); 371 edje_object_part_unswallow(sd->backwall, prev_obj);
371 efl_del(prev_obj); 372 efl_del(prev_obj);
372 } 373 }
@@ -375,12 +376,11 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
375 Eina_Bool ret = elm_image_file_set(image, file, group); 376 Eina_Bool ret = elm_image_file_set(image, file, group);
376 if (!ret) 377 if (!ret)
377 { 378 {
378 edje_object_signal_emit(sd->backwall, "elm,state,image,hidden", "elm");
379 efl_del(image); 379 efl_del(image);
380 return EINA_FALSE; 380 return EINA_FALSE;
381 } 381 }
382 edje_object_part_swallow(sd->backwall, "image", image); 382 edje_object_part_swallow(sd->backwall, "content", image);
383 edje_object_signal_emit(sd->backwall, "elm,state,image,visible", "elm"); 383 edje_object_signal_emit(sd->backwall, "elm,state,content,set", "elm");
384 384
385 return EINA_TRUE; 385 return EINA_TRUE;
386 } 386 }
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index b335702de4..c63d6135a8 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -42,12 +42,6 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
42 {NULL, NULL} 42 {NULL, NULL}
43}; 43};
44 44
45static const Elm_Layout_Part_Alias_Description _text_aliases[] =
46{
47 {"default", "elm.text"},
48 {NULL, NULL}
49};
50
51static Efl_Ui_Progress_Status * 45static Efl_Ui_Progress_Status *
52_progress_status_new(const char *part_name, double val) 46_progress_status_new(const char *part_name, double val)
53{ 47{
@@ -477,10 +471,21 @@ _progress_part_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *par
477 WRN("min is greater than max."); 471 WRN("min is greater than max.");
478 } 472 }
479 473
480 if (!strcmp(part_name, "elm.cur.progressbar") || !strcmp(part_name, "cur.progressbar")) 474 if (elm_widget_is_legacy(obj))
475 {
476 if (!strcmp(part_name, "elm.cur.progressbar"))
477 {
478 sd->val_min = min;
479 sd->val_max = max;
480 }
481 }
482 else
481 { 483 {
482 sd->val_min = min; 484 if (!strcmp(part_name, "cur.progressbar"))
483 sd->val_max = max; 485 {
486 sd->val_min = min;
487 sd->val_max = max;
488 }
484 } 489 }
485 490
486 EINA_LIST_FOREACH(sd->progress_status, l, ps) 491 EINA_LIST_FOREACH(sd->progress_status, l, ps)
@@ -516,8 +521,16 @@ _progressbar_part_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *pa
516 if (val < min) val = min; 521 if (val < min) val = min;
517 if (val > max) val = max; 522 if (val > max) val = max;
518 523
519 if (!strcmp(part_name, "elm.cur.progressbar") || !strcmp(part_name, "cur.progressbar")) 524 if (elm_widget_is_legacy(obj))
520 sd->val = val; 525 {
526 if (!strcmp(part_name, "elm.cur.progressbar"))
527 sd->val = val;
528 }
529 else
530 {
531 if (!strcmp(part_name, "cur.progressbar"))
532 sd->val = val;
533 }
521 534
522 EINA_LIST_FOREACH(sd->progress_status, l, ps) 535 EINA_LIST_FOREACH(sd->progress_status, l, ps)
523 { 536 {
@@ -711,15 +724,9 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_get(const Eo *obj, void *_pd
711/* Efl.Part end */ 724/* Efl.Part end */
712 725
713/* Internal EO APIs and hidden overrides */ 726/* Internal EO APIs and hidden overrides */
714static const char * _efl_ui_progressbar_default_text_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
715{
716 if (elm_widget_is_legacy(obj))
717 return "elm.text";
718 else
719 return "text";
720}
721ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) 727ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
722ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) 728ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
729
723static const char * _efl_ui_progressbar_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED) 730static const char * _efl_ui_progressbar_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
724{ 731{
725 if (elm_widget_is_legacy(obj)) 732 if (elm_widget_is_legacy(obj))
@@ -727,17 +734,15 @@ static const char * _efl_ui_progressbar_default_content_part_get(const Eo *obj E
727 else 734 else
728 return "content"; 735 return "content";
729} 736}
737
730ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) 738ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
731 739
732ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar) 740ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
733ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_progressbar)
734 741
735#define EFL_UI_PROGRESSBAR_EXTRA_OPS \ 742#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
736 ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \ 743 ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
737 ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_progressbar), \
738 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \ 744 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
739 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \ 745 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \
740 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_progressbar), \
741 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar) 746 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar)
742 747
743#include "efl_ui_progressbar.eo.c" 748#include "efl_ui_progressbar.eo.c"
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 2aec1bc7c2..78afc19c60 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -375,13 +375,8 @@ _icon_signal_emit(Evas_Object *obj)
375 375
376 edje = elm_widget_resize_object_get(obj); 376 edje = elm_widget_resize_object_get(obj);
377 if (!edje) return; 377 if (!edje) return;
378 378 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
379 if (elm_widget_is_legacy(obj)) 379 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
380 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
381 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
382 else
383 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
384 elm_layout_content_get(obj, "content") ? "visible" : "hidden");
385 380
386 elm_layout_signal_emit(obj, buf, "elm"); 381 elm_layout_signal_emit(obj, buf, "elm");
387 edje_object_message_signal_process(edje); 382 edje_object_message_signal_process(edje);
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index b5eeb0d0f9..d6f100f4bb 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -72,9 +72,9 @@ _efl_ui_scroller_bar_read_and_update(Eo *obj)
72 double vx, vy; 72 double vx, vy;
73 73
74 edje_object_part_drag_value_get 74 edje_object_part_drag_value_get
75 (wd->resize_obj, "elm.dragable.vbar", NULL, &vy); 75 (wd->resize_obj, "dragable.vbar", NULL, &vy);
76 edje_object_part_drag_value_get 76 edje_object_part_drag_value_get
77 (wd->resize_obj, "elm.dragable.hbar", &vx, NULL); 77 (wd->resize_obj, "dragable.hbar", &vx, NULL);
78 78
79 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy); 79 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
80} 80}
@@ -206,8 +206,8 @@ _efl_ui_scroller_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UNU
206 206
207 edje_object_calc_force(wd->resize_obj); 207 edje_object_calc_force(wd->resize_obj);
208 efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height); 208 efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
209 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0); 209 edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0);
210 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height); 210 edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height);
211} 211}
212 212
213static void 213static void
@@ -220,8 +220,8 @@ _efl_ui_scroller_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNUS
220 double posx = 0.0, posy = 0.0; 220 double posx = 0.0, posy = 0.0;
221 221
222 efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy); 222 efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
223 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0); 223 edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0);
224 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy); 224 edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy);
225} 225}
226 226
227static void 227static void
@@ -260,22 +260,22 @@ _scroll_edje_object_attach(Eo *obj)
260 efl_layout_signal_callback_add 260 efl_layout_signal_callback_add
261 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj); 261 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
262 efl_layout_signal_callback_add 262 efl_layout_signal_callback_add
263 (obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb, 263 (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
264 obj); 264 obj);
265 efl_layout_signal_callback_add 265 efl_layout_signal_callback_add
266 (obj, "drag,set", "elm.dragable.vbar", 266 (obj, "drag,set", "dragable.vbar",
267 _efl_ui_scroller_edje_drag_cb, obj); 267 _efl_ui_scroller_edje_drag_cb, obj);
268 efl_layout_signal_callback_add 268 efl_layout_signal_callback_add
269 (obj, "drag,start", "elm.dragable.vbar", 269 (obj, "drag,start", "dragable.vbar",
270 _efl_ui_scroller_edje_drag_start_cb, obj); 270 _efl_ui_scroller_edje_drag_start_cb, obj);
271 efl_layout_signal_callback_add 271 efl_layout_signal_callback_add
272 (obj, "drag,stop", "elm.dragable.vbar", 272 (obj, "drag,stop", "dragable.vbar",
273 _efl_ui_scroller_edje_drag_stop_cb, obj); 273 _efl_ui_scroller_edje_drag_stop_cb, obj);
274 efl_layout_signal_callback_add 274 efl_layout_signal_callback_add
275 (obj, "drag,step", "elm.dragable.vbar", 275 (obj, "drag,step", "dragable.vbar",
276 _efl_ui_scroller_edje_drag_cb, obj); 276 _efl_ui_scroller_edje_drag_cb, obj);
277 efl_layout_signal_callback_add 277 efl_layout_signal_callback_add
278 (obj, "drag,page", "elm.dragable.vbar", 278 (obj, "drag,page", "dragable.vbar",
279 _efl_ui_scroller_edje_drag_cb, obj); 279 _efl_ui_scroller_edje_drag_cb, obj);
280 efl_layout_signal_callback_add 280 efl_layout_signal_callback_add
281 (obj, "elm,vbar,press", "elm", 281 (obj, "elm,vbar,press", "elm",
@@ -284,22 +284,22 @@ _scroll_edje_object_attach(Eo *obj)
284 (obj, "elm,vbar,unpress", "elm", 284 (obj, "elm,vbar,unpress", "elm",
285 _efl_ui_scroller_vbar_unpress_cb, obj); 285 _efl_ui_scroller_vbar_unpress_cb, obj);
286 efl_layout_signal_callback_add 286 efl_layout_signal_callback_add
287 (obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb, 287 (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
288 obj); 288 obj);
289 efl_layout_signal_callback_add 289 efl_layout_signal_callback_add
290 (obj, "drag,set", "elm.dragable.hbar", 290 (obj, "drag,set", "dragable.hbar",
291 _efl_ui_scroller_edje_drag_cb, obj); 291 _efl_ui_scroller_edje_drag_cb, obj);
292 efl_layout_signal_callback_add 292 efl_layout_signal_callback_add
293 (obj, "drag,start", "elm.dragable.hbar", 293 (obj, "drag,start", "dragable.hbar",
294 _efl_ui_scroller_edje_drag_start_cb, obj); 294 _efl_ui_scroller_edje_drag_start_cb, obj);
295 efl_layout_signal_callback_add 295 efl_layout_signal_callback_add
296 (obj, "drag,stop", "elm.dragable.hbar", 296 (obj, "drag,stop", "dragable.hbar",
297 _efl_ui_scroller_edje_drag_stop_cb, obj); 297 _efl_ui_scroller_edje_drag_stop_cb, obj);
298 efl_layout_signal_callback_add 298 efl_layout_signal_callback_add
299 (obj, "drag,step", "elm.dragable.hbar", 299 (obj, "drag,step", "dragable.hbar",
300 _efl_ui_scroller_edje_drag_cb, obj); 300 _efl_ui_scroller_edje_drag_cb, obj);
301 efl_layout_signal_callback_add 301 efl_layout_signal_callback_add
302 (obj, "drag,page", "elm.dragable.hbar", 302 (obj, "drag,page", "dragable.hbar",
303 _efl_ui_scroller_edje_drag_cb, obj); 303 _efl_ui_scroller_edje_drag_cb, obj);
304 efl_layout_signal_callback_add 304 efl_layout_signal_callback_add
305 (obj, "elm,hbar,press", "elm", 305 (obj, "elm,hbar,press", "elm",
@@ -317,22 +317,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
317 efl_layout_signal_callback_del 317 efl_layout_signal_callback_del
318 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj); 318 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
319 efl_layout_signal_callback_del 319 efl_layout_signal_callback_del
320 (obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb, 320 (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
321 obj); 321 obj);
322 efl_layout_signal_callback_del 322 efl_layout_signal_callback_del
323 (obj, "drag,set", "elm.dragable.vbar", 323 (obj, "drag,set", "dragable.vbar",
324 _efl_ui_scroller_edje_drag_cb, obj); 324 _efl_ui_scroller_edje_drag_cb, obj);
325 efl_layout_signal_callback_del 325 efl_layout_signal_callback_del
326 (obj, "drag,start", "elm.dragable.vbar", 326 (obj, "drag,start", "dragable.vbar",
327 _efl_ui_scroller_edje_drag_start_cb, obj); 327 _efl_ui_scroller_edje_drag_start_cb, obj);
328 efl_layout_signal_callback_del 328 efl_layout_signal_callback_del
329 (obj, "drag,stop", "elm.dragable.vbar", 329 (obj, "drag,stop", "dragable.vbar",
330 _efl_ui_scroller_edje_drag_stop_cb, obj); 330 _efl_ui_scroller_edje_drag_stop_cb, obj);
331 efl_layout_signal_callback_del 331 efl_layout_signal_callback_del
332 (obj, "drag,step", "elm.dragable.vbar", 332 (obj, "drag,step", "dragable.vbar",
333 _efl_ui_scroller_edje_drag_cb, obj); 333 _efl_ui_scroller_edje_drag_cb, obj);
334 efl_layout_signal_callback_del 334 efl_layout_signal_callback_del
335 (obj, "drag,page", "elm.dragable.vbar", 335 (obj, "drag,page", "dragable.vbar",
336 _efl_ui_scroller_edje_drag_cb, obj); 336 _efl_ui_scroller_edje_drag_cb, obj);
337 efl_layout_signal_callback_del 337 efl_layout_signal_callback_del
338 (obj, "elm,vbar,press", "elm", 338 (obj, "elm,vbar,press", "elm",
@@ -341,22 +341,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
341 (obj, "elm,vbar,unpress", "elm", 341 (obj, "elm,vbar,unpress", "elm",
342 _efl_ui_scroller_vbar_unpress_cb, obj); 342 _efl_ui_scroller_vbar_unpress_cb, obj);
343 efl_layout_signal_callback_del 343 efl_layout_signal_callback_del
344 (obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb, 344 (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
345 obj); 345 obj);
346 efl_layout_signal_callback_del 346 efl_layout_signal_callback_del
347 (obj, "drag,set", "elm.dragable.hbar", 347 (obj, "drag,set", "dragable.hbar",
348 _efl_ui_scroller_edje_drag_cb, obj); 348 _efl_ui_scroller_edje_drag_cb, obj);
349 efl_layout_signal_callback_del 349 efl_layout_signal_callback_del
350 (obj, "drag,start", "elm.dragable.hbar", 350 (obj, "drag,start", "dragable.hbar",
351 _efl_ui_scroller_edje_drag_start_cb, obj); 351 _efl_ui_scroller_edje_drag_start_cb, obj);
352 efl_layout_signal_callback_del 352 efl_layout_signal_callback_del
353 (obj, "drag,stop", "elm.dragable.hbar", 353 (obj, "drag,stop", "dragable.hbar",
354 _efl_ui_scroller_edje_drag_stop_cb, obj); 354 _efl_ui_scroller_edje_drag_stop_cb, obj);
355 efl_layout_signal_callback_del 355 efl_layout_signal_callback_del
356 (obj, "drag,step", "elm.dragable.hbar", 356 (obj, "drag,step", "dragable.hbar",
357 _efl_ui_scroller_edje_drag_cb, obj); 357 _efl_ui_scroller_edje_drag_cb, obj);
358 efl_layout_signal_callback_del 358 efl_layout_signal_callback_del
359 (obj, "drag,page", "elm.dragable.hbar", 359 (obj, "drag,page", "dragable.hbar",
360 _efl_ui_scroller_edje_drag_cb, obj); 360 _efl_ui_scroller_edje_drag_cb, obj);
361 efl_layout_signal_callback_del 361 efl_layout_signal_callback_del
362 (obj, "elm,hbar,press", "elm", 362 (obj, "elm,hbar,press", "elm",
@@ -409,7 +409,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
409 sd->pan_obj = efl_add(EFL_UI_PAN_CLASS, obj); 409 sd->pan_obj = efl_add(EFL_UI_PAN_CLASS, obj);
410 410
411 efl_ui_scroll_manager_pan_set(sd->smanager, sd->pan_obj); 411 efl_ui_scroll_manager_pan_set(sd->smanager, sd->pan_obj);
412 edje_object_part_swallow(wd->resize_obj, "elm.swallow.content", sd->pan_obj); 412 edje_object_part_swallow(wd->resize_obj, "content", sd->pan_obj);
413 413
414 _scroll_edje_object_attach(obj); 414 _scroll_edje_object_attach(obj);
415 415
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 318ca78878..fb899ec793 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1480,19 +1480,19 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha)
1480 1480
1481 if (elm_widget_is_legacy(sd->obj)) 1481 if (elm_widget_is_legacy(sd->obj))
1482 { 1482 {
1483 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", 1483 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque",
1484 &ox, &oy, &ow, &oh); 1484 &ox, &oy, &ow, &oh);
1485 edje_object_part_geometry_get(sd->frame_obj, "elm.swallow.client", 1485 edje_object_part_geometry_get(sd->frame_obj, "elm.swallow.client",
1486 &wdata->content.x, &wdata->content.y, 1486 &wdata->content.x, &wdata->content.y,
1487 &wdata->content.w, &wdata->content.h); 1487 &wdata->content.w, &wdata->content.h);
1488 } 1488 }
1489 else 1489 else
1490 { 1490 {
1491 edje_object_part_geometry_get(sd->frame_obj, "spacer.opaque", 1491 edje_object_part_geometry_get(sd->frame_obj, "spacer.opaque",
1492 &ox, &oy, &ow, &oh); 1492 &ox, &oy, &ow, &oh);
1493 edje_object_part_geometry_get(sd->frame_obj, "client", 1493 edje_object_part_geometry_get(sd->frame_obj, "client",
1494 &wdata->content.x, &wdata->content.y, 1494 &wdata->content.x, &wdata->content.y,
1495 &wdata->content.w, &wdata->content.h); 1495 &wdata->content.w, &wdata->content.h);
1496 } 1496 }
1497 1497
1498 if (!alpha) 1498 if (!alpha)
@@ -3995,19 +3995,19 @@ _resize_info_get(Evas_Object *obj, int rotation, Efl_Ui_Win_Move_Resize_Mode mod
3995 3995
3996 if (elm_widget_is_legacy(obj)) 3996 if (elm_widget_is_legacy(obj))
3997 { 3997 {
3998 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos_legacy); k++) 3998 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos_legacy); k++)
3999 { 3999 {
4000 if (_resize_infos_legacy[k].mode == mode) 4000 if (_resize_infos_legacy[k].mode == mode)
4001 return &_resize_infos_legacy[k]; 4001 return &_resize_infos_legacy[k];
4002 } 4002 }
4003 } 4003 }
4004 else 4004 else
4005 { 4005 {
4006 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++) 4006 for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++)
4007 { 4007 {
4008 if (_resize_infos[k].mode == mode) 4008 if (_resize_infos[k].mode == mode)
4009 return &_resize_infos[k]; 4009 return &_resize_infos[k];
4010 } 4010 }
4011 } 4011 }
4012 4012
4013 return NULL; 4013 return NULL;
diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 680d3df0aa..f3fe2839b9 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -289,19 +289,32 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur)
289 _elm_cursor_hot_change, cur); 289 _elm_cursor_hot_change, cur);
290 evas_object_event_callback_add(cur->hotobj, EVAS_CALLBACK_RESIZE, 290 evas_object_event_callback_add(cur->hotobj, EVAS_CALLBACK_RESIZE,
291 _elm_cursor_hot_change, cur); 291 _elm_cursor_hot_change, cur);
292 if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot")) 292
293 edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj); 293 if (elm_widget_is_legacy(obj))
294 else if (edje_object_part_exists(cur->obj, "elm.content.hotspot")) 294 {
295 edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj); 295 if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot"))
296 else if (edje_object_part_exists(cur->obj, "hotspot")) 296 edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
297 edje_object_part_swallow(cur->obj, "hotspot", cur->hotobj); 297 else if (edje_object_part_exists(cur->obj, "elm.content.hotspot"))
298 else if (edje_object_part_exists(cur->obj, "content.hotspot")) 298 edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj);
299 edje_object_part_swallow(cur->obj, "content.hotspot", cur->hotobj); 299 else
300 {
301 ELM_SAFE_FREE(cur->hotobj, evas_object_del);
302 ELM_SAFE_FREE(cur->obj, evas_object_del);
303 return EINA_FALSE;
304 }
305 }
300 else 306 else
301 { 307 {
302 ELM_SAFE_FREE(cur->hotobj, evas_object_del); 308 if (edje_object_part_exists(cur->obj, "hotspot"))
303 ELM_SAFE_FREE(cur->obj, evas_object_del); 309 edje_object_part_swallow(cur->obj, "hotspot", cur->hotobj);
304 return EINA_FALSE; 310 else if (edje_object_part_exists(cur->obj, "content.hotspot"))
311 edje_object_part_swallow(cur->obj, "content.hotspot", cur->hotobj);
312 else
313 {
314 ELM_SAFE_FREE(cur->hotobj, evas_object_del);
315 ELM_SAFE_FREE(cur->obj, evas_object_del);
316 return EINA_FALSE;
317 }
305 } 318 }
306 319
307 evas_object_event_callback_add(cur->obj, EVAS_CALLBACK_DEL, 320 evas_object_event_callback_add(cur->obj, EVAS_CALLBACK_DEL,