aboutsummaryrefslogtreecommitdiffstats
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
parentefl_part: remove the elm legacy name of efl ui theme (diff)
downloadefl-devs/jaehyun/efl_part_legacy_remove.tar.gz
-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";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "button_text_visible";
- signal: "state,text,set"; source: "efl";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -344,7 +344,7 @@ group { name: "efl/button";
}
}
program { name: "button_text_hidden";
- signal: "state,text,unset"; source: "efl";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -352,7 +352,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_visible";
- signal: "state,content,set"; source: "efl";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -360,7 +360,7 @@ group { name: "efl/button";
}
}
program { name: "button_icon_hidden";
- signal: "state,content,unset"; source: "efl";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
@@ -718,7 +718,7 @@ group { name: "efl/button:anchor";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "button_text_visible";
- signal: "state,text,set"; source: "efl";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -726,7 +726,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_text_hidden";
- signal: "state,text,unset"; source: "efl";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -734,7 +734,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_visible";
- signal: "state,content,set"; source: "efl";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -742,7 +742,7 @@ group { name: "efl/button:anchor";
}
}
program { name: "button_icon_hidden";
- signal: "state,content,unset"; source: "efl";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
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";
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
+ set_state(PART:"on", "default", 0.0);
+ set_state(PART:"off", "default", 0.0);
set_state(PART:"onrect", "default", 0.0);
set_state(PART:"offrect", "default", 0.0);
} else {
@@ -366,8 +366,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
+ set_state(PART:"on", "disabled", 0.0);
+ set_state(PART:"off", "disabled", 0.0);
set_state(PART:"onrect", "disabled", 0.0);
set_state(PART:"offrect", "disabled", 0.0);
}
@@ -380,8 +380,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
+ set_state(PART:"on", "default", 0.0);
+ set_state(PART:"off", "default", 0.0);
set_state(PART:"onrect", "default", 0.0);
set_state(PART:"offrect", "default", 0.0);
} else {
@@ -392,8 +392,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
+ set_state(PART:"on", "disabled", 0.0);
+ set_state(PART:"off", "disabled", 0.0);
set_state(PART:"onrect", "disabled", 0.0);
set_state(PART:"offrect", "disabled", 0.0);
}
@@ -406,8 +406,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
+ set_state(PART:"on", "default", 0.0);
+ set_state(PART:"off", "default", 0.0);
set_state(PART:"onrect", "default", 0.0);
set_state(PART:"offrect", "default", 0.0);
} else {
@@ -418,8 +418,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
+ set_state(PART:"on", "disabled", 0.0);
+ set_state(PART:"off", "disabled", 0.0);
set_state(PART:"onrect", "disabled", 0.0);
set_state(PART:"offrect", "disabled", 0.0);
}
@@ -432,8 +432,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
+ set_state(PART:"on", "default", 0.0);
+ set_state(PART:"off", "default", 0.0);
set_state(PART:"onrect", "default", 0.0);
set_state(PART:"offrect", "default", 0.0);
} else {
@@ -444,8 +444,8 @@ group { "efl/check:toggle";
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
+ set_state(PART:"on", "disabled", 0.0);
+ set_state(PART:"off", "disabled", 0.0);
set_state(PART:"onrect", "disabled", 0.0);
set_state(PART:"offrect", "disabled", 0.0);
}
@@ -495,7 +495,7 @@ group { "efl/check:toggle";
color: 64 64 64 255;
}
}
- part { name: "elm.offtext"; type: TEXT; mouse_events: 0;
+ part { name: "off"; type: TEXT; mouse_events: 0;
effect: SHADOW BOTTOM;
scale: 1;
clip_to: "tog_clip";
@@ -519,7 +519,7 @@ group { "efl/check:toggle";
color3: 255 255 255 255;
}
}
- part { name: "elm.ontext"; type: TEXT; mouse_events: 0;
+ part { name: "on"; type: TEXT; mouse_events: 0;
effect: GLOW;
scale: 1;
clip_to: "tog_clip";
@@ -870,7 +870,7 @@ group { "efl/check:toggle";
target: "glow_but";
}
program {
- signal: "state,text,set"; source: "efl";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -878,7 +878,7 @@ group { "efl/check:toggle";
}
}
program {
- signal: "state,text,unset"; source: "efl";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -886,7 +886,7 @@ group { "efl/check:toggle";
}
}
program {
- signal: "state,content,set"; source: "efl";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -894,7 +894,7 @@ group { "efl/check:toggle";
}
}
program {
- signal: "state,content,unset"; source: "efl";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
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";
description { state: "default" 0.0;
image.normal: "vgrad_med_curved.png";
rel1.offset: 2 2;
- rel2.to_y: "elm.text";
+ rel2.to_y: "text";
rel2.offset: -3 -1;
fill.smooth: 0;
TILED_HORIZ(120)
@@ -36,10 +36,10 @@ group { name: "efl/frame";
description { state: "default" 0.0;
image.normal: "holes_tiny_vert.png";
rel1.offset: 4 0;
- rel1.to_y: "elm.text";
+ rel1.to_y: "text";
rel2.offset: 4 -1;
rel2.relative: 0.0 1.0;
- rel2.to_y: "elm.text";
+ rel2.to_y: "text";
align: 0.0 0.5;
FIXED_SIZE(3, 11)
}
@@ -48,16 +48,16 @@ group { name: "efl/frame";
description { state: "default" 0.0;
image.normal: "holes_tiny_vert.png";
rel1.offset: -5 0;
- rel1.to_y: "elm.text";
+ rel1.to_y: "text";
rel1.relative: 1.0 0.0;
rel2.offset: -5 -1;
rel2.relative: 1.0 1.0;
- rel2.to_y: "elm.text";
+ rel2.to_y: "text";
align: 1.0 0.5;
FIXED_SIZE(3, 11)
}
}
- part { name: "elm.text"; type: TEXT;
+ part { name: "text"; type: TEXT;
scale: 1;
effect: SHADOW BOTTOM;
description { state: "default" 0.0;
@@ -82,17 +82,17 @@ group { name: "efl/frame";
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
rel1.offset: 5 0;
- rel1.to_y: "elm.text";
+ rel1.to_y: "text";
rel2.offset: -7 -7;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW;
+ part { name: "content"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
align: 0.0 1.0;
rel1.relative: 0.0 1.0;
rel1.offset: 5 0;
- rel1.to_y: "elm.text";
+ rel1.to_y: "text";
rel2.offset: -7 -7;
}
description { state: "collapsed" 0.0;
@@ -113,21 +113,21 @@ group { name: "efl/frame";
part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
description { state: "default" 0.0;
color: 0 0 0 0;
- rel1.to_y: "elm.text";
- rel2.to_y: "elm.text";
+ rel1.to_y: "text";
+ rel2.to_y: "text";
}
}
}
programs {
program { name: "collapse";
action: STATE_SET "collapsed" 0.0;
- target: "elm.swallow.content";
+ target: "content";
transition: ACCELERATE 0.3;
after: "signal";
}
program { name: "expand";
action: STATE_SET "default" 0.0;
- target: "elm.swallow.content";
+ target: "content";
transition: DECELERATE 0.3;
after: "signal";
}
@@ -140,7 +140,7 @@ group { name: "efl/frame";
script {
new st[31];
new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
+ get_state(PART:"content", st, 30, vl);
if (!strcmp(st, "default"))
run_program(PROGRAM:"collapse");
else
@@ -152,15 +152,15 @@ group { name: "efl/frame";
script {
new st[31];
new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
+ get_state(PART:"content", st, 30, vl);
if (!strcmp(st, "default"))
- set_state(PART:"elm.swallow.content", "collapsed", 0.0);
+ set_state(PART:"content", "collapsed", 0.0);
else
- set_state(PART:"elm.swallow.content", "default", 0.0);
+ set_state(PART:"content", "default", 0.0);
}
}
program { name: "signal";
action: SIGNAL_EMIT "elm,anim,done" "elm";
}
}
-} \ No newline at end of file
+}
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";
rel2.to: "bar";
}
}
- part { name: "rect.bar"; type: RECT;
+ part { name: "rect_bar"; type: RECT;
dragable.events: "bar";
description { state: "default" 0.0;
min: PANEMIN PANEWID;
@@ -129,27 +129,27 @@ group { name: "efl/panes/vertical";
}
}
programs {
- program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback
+ program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
action: SIGNAL_EMIT "elm,action,press" "elm";
}
- program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback
+ program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "elm,action,unpress" "elm";
}
- program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback
+ program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback
+ program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "elm,action,click,double" "elm";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,fixed"; source: "elm";
action: STATE_SET "disabled" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,unfixed"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
}
}
@@ -251,7 +251,7 @@ group { name: "efl/panes/horizontal";
rel2.to: "bar";
}
}
- part { name: "rect.bar"; type: RECT;
+ part { name: "rect_bar"; type: RECT;
dragable.events: "bar";
description { state: "default" 0.0;
min: PANEWID PANEMIN;
@@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal";
}
}
programs {
- program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback
+ program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
action: SIGNAL_EMIT "elm,action,press" "elm";
}
- program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback
+ program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "elm,action,unpress" "elm";
}
- program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback
+ program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback
+ program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "elm,action,click,double" "elm";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,fixed"; source: "elm";
action: STATE_SET "disabled" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,unfixed"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
}
}
@@ -377,7 +377,7 @@ group { name: "efl/panes/vertical:flush";
rel2.to: "bar";
}
}
- part { name: "rect.bar"; type: RECT;
+ part { name: "rect_bar"; type: RECT;
dragable.events: "bar";
description { state: "default" 0.0;
min: PANEMIN PANEWID;
@@ -451,8 +451,8 @@ group { name: "efl/panes/vertical:flush";
part { name: "bar1"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "rect.bar";
- rel2.to: "rect.bar";
+ rel1.to: "rect_bar";
+ rel2.to: "rect_bar";
rel2.relative: 0.5 1.0;
color: 0 0 0 0;
}
@@ -460,35 +460,35 @@ group { name: "efl/panes/vertical:flush";
part { name: "bar2"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "rect.bar";
+ rel1.to: "rect_bar";
rel1.relative: 0.5 0.0;
- rel2.to: "rect.bar";
+ rel2.to: "rect_bar";
color: 0 0 0 0;
}
}
}
programs {
- program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback
+ program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
action: SIGNAL_EMIT "elm,action,press" "elm";
}
- program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback
+ program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "elm,action,unpress" "elm";
}
- program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback
+ program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback
+ program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "elm,action,click,double" "elm";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,fixed"; source: "elm";
action: STATE_SET "disabled" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,unfixed"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
program {
signal: "mouse,in"; source: "bar1";
@@ -605,7 +605,7 @@ group { name: "efl/panes/horizontal:flush";
rel2.to: "bar";
}
}
- part { name: "rect.bar"; type: RECT;
+ part { name: "rect_bar"; type: RECT;
dragable.events: "bar";
description { state: "default" 0.0;
min: PANEWID PANEMIN;
@@ -679,8 +679,8 @@ group { name: "efl/panes/horizontal:flush";
part { name: "bar1"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "rect.bar";
- rel2.to: "rect.bar";
+ rel1.to: "rect_bar";
+ rel2.to: "rect_bar";
rel2.relative: 1.0 0.5;
color: 0 0 0 0;
}
@@ -688,9 +688,9 @@ group { name: "efl/panes/horizontal:flush";
part { name: "bar2"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "rect.bar";
+ rel1.to: "rect_bar";
rel1.relative: 0.0 0.5;
- rel2.to: "rect.bar";
+ rel2.to: "rect_bar";
color: 0 0 0 0;
}
}
@@ -724,27 +724,27 @@ group { name: "efl/panes/horizontal:flush";
target: "glow2a";
target: "glow2b";
}
- program {signal: "mouse,down,1"; source: "rect.bar"; // for "press" smart callback
+ program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
action: SIGNAL_EMIT "elm,action,press" "elm";
}
- program { signal: "mouse,up,1"; source: "rect.bar"; // for "unpress" smart callback
+ program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "elm,action,unpress" "elm";
}
- program { signal: "mouse,clicked,1"; source: "rect.bar"; // for "clicked" smart callback
+ program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { signal: "mouse,down,1,double"; source: "rect.bar"; // for "clicked,double" smart callback
+ program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "elm,action,click,double" "elm";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,fixed"; source: "elm";
action: STATE_SET "disabled" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
program { // for elm_panes_fixed_set()
signal: "elm,panes,unfixed"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "rect.bar";
+ target: "rect_bar";
}
}
}
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";
desc { "default";
color: 0 0 0 64;
}
- desc { "show_image";
+ desc { "content_visible";
inherit: "default";
hid;
}
}
- swallow { "image";
+ swallow { "content";
desc { "default";
rel.to: "base";
hid;
}
- desc { "show_image";
+ desc { "content_visible";
inherit: "default";
vis;
}
@@ -150,16 +150,16 @@ group { "efl/popup/backwall";
programs {
program {
- signal: "elm,state,image,visible"; source: "elm";
- action: STATE_SET "show_image" 0.0;
+ signal: "elm,state,content,set"; source: "elm";
+ action: STATE_SET "content_visible" 0.0;
target: "base";
- target: "image";
+ target: "content";
}
program {
- signal: "elm,state,image,hidden"; source: "elm";
+ signal: "elm,state,content,unset"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
- target: "image";
+ target: "content";
}
program {
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";
image.border_scale_by: 0.25; image.border_scale: 1;
}
}
- part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
+ part { name: "bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "inside";
rel2.to: "inside";
@@ -259,7 +259,7 @@ group { "efl/progressbar/horizontal";
align: 1.0 0.5;
}
}
- part { name: "bar_internal";
+ part { name: "image_bar";
clip_to: "fract_clip";
scale: 1;
description { state: "default" 0.0;
@@ -315,10 +315,10 @@ group { "efl/progressbar/horizontal";
min: 64 24;
max: 64 24;
rel1.to_x: "insidep0";
- rel1.to_y: "bar_internal";
+ rel1.to_y: "image_bar";
rel1.relative: 0.0 0.0;
rel2.to_x: "insidep1";
- rel2.to_y: "bar_internal";
+ rel2.to_y: "image_bar";
rel2.relative: 1.0 1.0;
image.normal: "inset_bar_horiz_glow_mid_base.png";
align: 0.0 0.5;
@@ -372,11 +372,11 @@ group { "efl/progressbar/horizontal";
scale: 1;
description { state: "default" 0.0;
max: 36 11;
- rel1.to_x: "bar_internal";
- rel1.to_y: "bar_internal";
+ rel1.to_x: "image_bar";
+ rel1.to_y: "image_bar";
rel1.relative: 0.0 (26/96);
rel2.to_x: "barend";
- rel2.to_y: "bar_internal";
+ rel2.to_y: "image_bar";
rel2.relative: 0.2 ((26+44)/96);
align: 1.0 0.0;
image.normal: "inset_bar_horiz_glow_light.png";
@@ -387,10 +387,10 @@ group { "efl/progressbar/horizontal";
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_x: "barend";
- rel1.to_y: "bar_internal";
+ rel1.to_y: "image_bar";
rel1.relative: 0.8 (26/96);
- rel2.to_x: "bar_internal";
- rel2.to_y: "bar_internal";
+ rel2.to_x: "image_bar";
+ rel2.to_y: "image_bar";
rel2.relative: 1.0 ((26+44)/96);
align: 0.0 0.0;
image.normal: "inset_bar_horiz_glow_inv_light.png";
@@ -402,14 +402,14 @@ group { "efl/progressbar/horizontal";
program { name: "inverted-on";
signal: "elm,state,inverted,on"; source: "elm";
action: STATE_SET "inv" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "barend";
target: "light";
}
program { name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "barend";
target: "light";
}
@@ -419,7 +419,7 @@ group { "efl/progressbar/horizontal";
new a, Float:dx, Float:dy, Float:vl, st[20];
get_drag(PART:"cur.progressbar", dx, dy);
- get_state(PART:"bar_internal", st, 19, vl);
+ get_state(PART:"image_bar", st, 19, vl);
if (!strcmp(st, "inv")) {
a = round(((1.0 - dx) * 255) / 0.2);
custom_state(PART:"light", "inv", 0.0);
@@ -504,7 +504,7 @@ group { "efl/progressbar/horizontal";
target: "text.status";
}
program { name: "text-visible";
- signal: "elm,state,elm.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -512,7 +512,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "text-hidden";
- signal: "elm,state,elm.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -782,7 +782,7 @@ group { "efl/progressbar/vertical";
image.border_scale_by: 0.25; image.border_scale: 1;
}
}
- part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
+ part { name: "bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "inside";
rel2.to: "inside";
@@ -819,7 +819,7 @@ group { "efl/progressbar/vertical";
align: 0.5 1.0;
}
}
- part { name: "bar_internal";
+ part { name: "image_bar";
clip_to: "fract_clip";
scale: 1;
description { state: "default" 0.0;
@@ -875,10 +875,10 @@ group { "efl/progressbar/vertical";
min: 24 64;
max: 24 64;
rel1.to_y: "insidep0";
- rel1.to_x: "bar_internal";
+ rel1.to_x: "image_bar";
rel1.relative: 0.0 0.0;
rel2.to_y: "insidep1";
- rel2.to_x: "bar_internal";
+ rel2.to_x: "image_bar";
rel2.relative: 1.0 1.0;
image.normal: "inset_bar_vert_glow_mid_base.png";
align: 0.5 0.0;
@@ -945,11 +945,11 @@ group { "efl/progressbar/vertical";
scale: 1;
description { state: "default" 0.0;
max: 11 36;
- rel1.to_y: "bar_internal";
- rel1.to_x: "bar_internal";
+ rel1.to_y: "image_bar";
+ rel1.to_x: "image_bar";
rel1.relative: (26/96) 0.0;
rel2.to_y: "barend";
- rel2.to_x: "bar_internal";
+ rel2.to_x: "image_bar";
rel2.relative: ((26+44)/96) 0.2;
align: 0.0 1.0;
image.normal: "inset_bar_vert_glow_light.png";
@@ -960,10 +960,10 @@ group { "efl/progressbar/vertical";
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_y: "barend";
- rel1.to_x: "bar_internal";
+ rel1.to_x: "image_bar";
rel1.relative: (26/96) 0.8;
- rel2.to_y: "bar_internal";
- rel2.to_x: "bar_internal";
+ rel2.to_y: "image_bar";
+ rel2.to_x: "image_bar";
rel2.relative: ((26+44)/96) 1.0;
align: 0.0 0.0;
image.normal: "inset_bar_vert_glow_inv_light.png";
@@ -975,14 +975,14 @@ group { "efl/progressbar/vertical";
program { name: "inverted-on";
signal: "elm,state,inverted,on"; source: "elm";
action: STATE_SET "inv" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "barend";
target: "light";
}
program { name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "barend";
target: "light";
}
@@ -992,7 +992,7 @@ group { "efl/progressbar/vertical";
new a, Float:dx, Float:dy, Float:vl, st[20];
get_drag(PART:"cur.progressbar", dx, dy);
- get_state(PART:"bar_internal", st, 19, vl);
+ get_state(PART:"image_bar", st, 19, vl);
if (!strcmp(st, "inv")) {
a = round(((1.0 - dy) * 255) / 0.2);
custom_state(PART:"light", "inv", 0.0);
@@ -1077,7 +1077,7 @@ group { "efl/progressbar/vertical";
target: "text.status";
}
program { name: "text-visible";
- signal: "elm,state,elm.text,set"; source: "elm";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -1085,7 +1085,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "text-hidden";
- signal: "elm,state,elm.text,unset"; source: "elm";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -1136,7 +1136,7 @@ group { "efl/progressbar/horizontal:wheel";
images.image: "knob_round_busy.png" COMP;
images.image: "glow_round_corners.png" COMP;
parts {
- part { name: "elm.swallow.bar" ; type: SWALLOW; mouse_events: 0;
+ part { name: "bar" ; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
min: 0 0;
max: 0 0;
@@ -1294,7 +1294,7 @@ group { "efl/progressbar/horizontal:double";
program { name: "inverted-on";
signal: "elm,state,inverted,on"; source: "elm";
action: STATE_SET "inv" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "bar1";
target: "barend";
target: "barend1";
@@ -1304,7 +1304,7 @@ group { "efl/progressbar/horizontal:double";
{ name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "bar1";
target: "barend";
target: "barend1";
@@ -1383,7 +1383,7 @@ group { "efl/progressbar/vertical:double";
program { name: "inverted-on";
signal: "elm,state,inverted,on"; source: "elm";
action: STATE_SET "inv" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "barend";
target: "light";
target: "bar1";
@@ -1392,7 +1392,7 @@ group { "efl/progressbar/vertical:double";
program { name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "bar_internal";
+ target: "image_bar";
target: "barend";
target: "light";
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";
target: "indicator";
}
program {
- signal: "state,text,set"; source: "efl";
+ signal: "elm,state,text,set"; source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
@@ -245,7 +245,7 @@ group { "efl/radio";
}
}
program {
- signal: "state,text,unset"; source: "efl";
+ signal: "elm,state,text,unset"; source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
@@ -253,7 +253,7 @@ group { "efl/radio";
}
}
program {
- signal: "state,content,set"; source: "efl";
+ signal: "elm,state,content,set"; source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
@@ -261,7 +261,7 @@ group { "efl/radio";
}
}
program {
- signal: "state,content,unset"; source: "efl";
+ signal: "elm,state,content,unset"; source: "elm";
script {
new m = get_int(btmode);
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";
rel1.relative: 0.0 1.0;
rel1.to: "sb_vbar_a1";
rel2.relative: 1.0 0.0;
- rel2.to: "elm.dragable.vbar";
+ rel2.to: "dragable.vbar";
fixed: 1 1;
}
}
@@ -164,13 +164,13 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 0.0 1.0;
- rel1.to: "elm.dragable.vbar";
+ rel1.to: "dragable.vbar";
rel2.relative: 1.0 0.0;
rel2.to: "sb_vbar_a2";
fixed: 1 1;
}
}
- part { name: "elm.dragable.vbar"; type: RECT;
+ part { name: "dragable.vbar"; type: RECT;
clip_to: "sb_vbar";
scale: 1;
dragable.x: 0 0 0;
@@ -218,8 +218,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 0.0;
- rel1.to: "elm.dragable.vbar";
- rel2.to: "elm.dragable.vbar";
+ rel1.to: "dragable.vbar";
+ rel2.to: "dragable.vbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -252,8 +252,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 1.0;
- rel1.to: "elm.dragable.vbar";
- rel2.to: "elm.dragable.vbar";
+ rel1.to: "dragable.vbar";
+ rel2.to: "dragable.vbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -304,7 +304,7 @@ group { name: "efl/scroller";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
target: "sb_vbar_a1";
target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
@@ -320,7 +320,7 @@ group { name: "efl/scroller";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
target: "sb_vbar_a1";
target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
@@ -344,7 +344,7 @@ group { name: "efl/scroller";
}
program { name: "drag_up";
action: DRAG_VAL_STEP 0.0 -1.0;
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
@@ -360,17 +360,17 @@ group { name: "efl/scroller";
}
program { name: "drag_down";
action: DRAG_VAL_STEP 0.0 1.0;
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0;
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
}
program {
signal: "mouse,down,1*"; source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0;
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
}
program {
signal: "elm,action,scroll"; source: "elm";
@@ -442,7 +442,7 @@ group { name: "efl/scroller";
rel1.relative: 1.0 0.0;
rel1.to: "sb_hbar_a1";
rel2.relative: 0.0 1.0;
- rel2.to: "elm.dragable.hbar";
+ rel2.to: "dragable.hbar";
fixed: 1 1;
}
}
@@ -451,13 +451,13 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 1.0 0.0;
- rel1.to: "elm.dragable.hbar";
+ rel1.to: "dragable.hbar";
rel2.relative: 0.0 1.0;
rel2.to: "sb_hbar_a2";
fixed: 1 1;
}
}
- part { name: "elm.dragable.hbar"; type: RECT;
+ part { name: "dragable.hbar"; type: RECT;
clip_to: "sb_hbar";
scale: 1;
dragable.x: 1 1 0;
@@ -505,8 +505,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 0.0 1.0;
- rel1.to: "elm.dragable.hbar";
- rel2.to: "elm.dragable.hbar";
+ rel1.to: "dragable.hbar";
+ rel2.to: "dragable.hbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -539,8 +539,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 1.0 1.0;
- rel1.to: "elm.dragable.hbar";
- rel2.to: "elm.dragable.hbar";
+ rel1.to: "dragable.hbar";
+ rel2.to: "dragable.hbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -591,7 +591,7 @@ group { name: "efl/scroller";
action: STATE_SET "default" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
target: "sb_hbar_a1";
target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
@@ -607,7 +607,7 @@ group { name: "efl/scroller";
action: STATE_SET "hidden" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
target: "sb_hbar_a1";
target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
@@ -631,7 +631,7 @@ group { name: "efl/scroller";
}
program { name: "drag_left";
action: DRAG_VAL_STEP -1.0 0.0;
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_a2";
@@ -647,18 +647,18 @@ group { name: "efl/scroller";
}
program { name: "drag_right";
action: DRAG_VAL_STEP 1.0 0.0;
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0;
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
after: "check_pos_hbar";
}
program {
signal: "mouse,down,1*"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0;
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
after: "check_pos_hbar";
}
program {
@@ -688,8 +688,8 @@ group { name: "efl/scroller";
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.background";
- rel2.to: "elm.swallow.background";
+ rel1.to: "background";
+ rel2.to: "background";
// color: 64 64 64 200;
color: 0 0 0 0;
color_class: "scroller_bg";
@@ -697,11 +697,11 @@ group { name: "efl/scroller";
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.background";
- rel2.to: "elm.swallow.background";
+ rel1.to: "background";
+ rel2.to: "background";
}
}
- part { name: "elm.swallow.background"; type: SWALLOW;
+ part { name: "background"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.offset: 1 1;
@@ -711,7 +711,7 @@ group { name: "efl/scroller";
rel2.to_y: "sb_hbar";
}
}
- part { name: "elm.swallow.content"; type: SWALLOW;
+ part { name: "content"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.offset: 1 1;
@@ -744,11 +744,11 @@ group { name: "efl/scroller";
color: 255 255 255 128;
}
}
- part { name: "elm.swallow.overlay"; type: SWALLOW;
+ part { name: "overlay"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ rel1.to: "content";
+ rel2.to: "content";
}
}
part { name: "runner_vbar"; mouse_events: 0;
@@ -915,9 +915,9 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
fixed: 1 1;
rel1.offset: 2 0;
- rel1.to: "elm.dragable.vbar";
+ rel1.to: "dragable.vbar";
rel2.offset: -3 -1;
- rel2.to: "elm.dragable.vbar";
+ rel2.to: "dragable.vbar";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 3 13;
@@ -1076,9 +1076,9 @@ group { name: "efl/scroller";
description { state: "default" 0.0;
fixed: 1 1;
rel1.offset: 0 2;
- rel1.to: "elm.dragable.hbar";
+ rel1.to: "dragable.hbar";
rel2.offset: -1 -3;
- rel2.to: "elm.dragable.hbar";
+ rel2.to: "dragable.hbar";
image.normal: "vgrad_med_lighter.png";
fill.smooth: 0;
min: 13 3;
@@ -1133,51 +1133,51 @@ group { name: "efl/scroller";
}
programs {
program {
- signal: "mouse,down,1*"; source: "elm.dragable.vbar";
+ signal: "mouse,down,1*"; source: "dragable.vbar";
action: STATE_SET "clicked" 0.0;
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
- signal: "mouse,down,*"; source: "elm.dragable.vbar";
+ signal: "mouse,down,*"; source: "dragable.vbar";
action: SIGNAL_EMIT "elm,vbar,press" "elm";
}
program {
- signal: "mouse,up,1"; source: "elm.dragable.vbar";
+ signal: "mouse,up,1"; source: "dragable.vbar";
action: STATE_SET "default" 0.0;
- target: "elm.dragable.vbar";
+ target: "dragable.vbar";
target: "shadow_vbar";
target: "glow_vbar";
target: "center_glow_vbar";
}
program {
- signal: "mouse,up,*"; source: "elm.dragable.vbar";
+ signal: "mouse,up,*"; source: "dragable.vbar";
action: SIGNAL_EMIT "elm,vbar,unpress" "elm";
}
program {
- signal: "mouse,down,1*"; source: "elm.dragable.hbar";
+ signal: "mouse,down,1*"; source: "dragable.hbar";
action: STATE_SET "clicked" 0.0;
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
- signal: "mouse,down,*"; source: "elm.dragable.hbar";
+ signal: "mouse,down,*"; source: "dragable.hbar";
action: SIGNAL_EMIT "elm,hbar,press" "elm";
}
program {
- signal: "mouse,up,1"; source: "elm.dragable.hbar";
+ signal: "mouse,up,1"; source: "dragable.hbar";
action: STATE_SET "default" 0.0;
- target: "elm.dragable.hbar";
+ target: "dragable.hbar";
target: "shadow_hbar";
target: "glow_hbar";
target: "center_glow_hbar";
}
program {
- signal: "mouse,up,*"; source: "elm.dragable.hbar";
+ signal: "mouse,up,*"; source: "dragable.hbar";
action: SIGNAL_EMIT "elm,hbar,unpress" "elm";
}
program {
@@ -1256,13 +1256,13 @@ group { name: "efl/scroller:noclip";
rel2.offset: 999999 999999;
}
}
- part { name: "elm.swallow.background";
+ part { name: "background";
description { state: "default" 0.0;
rel1.offset: 0 0;
rel2.offset: -1 -1;
}
}
- part { name: "elm.swallow.content";
+ part { name: "content";
description { state: "default" 0.0;
rel1.offset: 0 1;
rel2.offset: -1 -1;
@@ -1283,50 +1283,50 @@ group { name: "efl/scroller:noclip";
group { name: "efl/scroller/contents";
parts {
- part { name: "elm.swallow.content";
+ part { name: "content";
type: SWALLOW;
description { state: "default" 0.0;
}
}
- part { name: "elm.swallow.content_r";
+ part { name: "content_r";
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 0.0;
- to: "elm.swallow.content";
+ to: "content";
}
rel2 {
relative: 2.0 1.0;
- to: "elm.swallow.content";
+ to: "content";
}
}
}
- part { name: "elm.swallow.content_b";
+ part { name: "content_b";
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 0.0 1.0;
- to: "elm.swallow.content";
+ to: "content";
}
rel2 {
relative: 1.0 2.0;
- to: "elm.swallow.content";
+ to: "content";
}
}
}
- part { name: "elm.swallow.content_rb";
+ part { name: "content_rb";
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 1.0;
- to: "elm.swallow.content";
+ to: "content";
}
rel2 {
relative: 2.0 2.0;
- to: "elm.swallow.content";
+ to: "content";
}
}
}
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";
}
}
parts {
- part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
+ part { name: "text"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
text {
@@ -161,11 +161,11 @@ group { name: "efl/tooltip";
description { state: "default" 0.0;
min: 30 30;
rel1 {
- to: "elm.swallow.content";
+ to: "content";
offset: -5 -4;
}
rel2 {
- to: "elm.swallow.content";
+ to: "content";
offset: 4 5;
}
image {
@@ -217,12 +217,12 @@ group { name: "efl/tooltip";
rel1 { \
relative: rx 0.0; \
offset: ox 0; \
- to: "elm.swallow.content"; \
+ to: "content"; \
} \
rel2 { \
relative: rx 1.0; \
offset: ox 0; \
- to: "elm.swallow.content"; \
+ to: "content"; \
} \
} \
description { state: "visible" 0.0; \
@@ -241,12 +241,12 @@ group { name: "efl/tooltip";
rel1 { \
relative: rx 0.0; \
offset: ox 0; \
- to: "elm.swallow.content"; \
+ to: "content"; \
} \
rel2 { \
relative: rx 1.0; \
offset: ox 0; \
- to: "elm.swallow.content"; \
+ to: "content"; \
} \
} \
} \
@@ -291,12 +291,12 @@ group { name: "efl/tooltip";
rel1 { \
relative: 0.0 ry; \
offset: 0 oy; \
- to: "elm.swallow.content"; \
+ to: "content"; \
} \
rel2 { \
relative: 1.0 ry; \
offset: 0 oy; \
- to: "elm.swallow.content"; \
+ to: "content"; \
} \
} \
description { state: "visible" 0.0; \
@@ -348,15 +348,15 @@ group { name: "efl/tooltip";
part { name: "clipper_content"; type: RECT;
description { state: "default" 0.0;
color: 255 255 255 0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ rel1.to: "content";
+ rel2.to: "content";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW;
+ part { name: "content"; type: SWALLOW;
clip_to: "clipper_content";
description { state: "default" 0.0;
rel1.offset: 10 10;
@@ -421,7 +421,7 @@ group { name: "efl/tooltip:transparent";
data.item: "pad_y" "10";
data.item: "transparent" "enabled";
parts {
- part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ part { name: "content"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0; }
}
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
/* Standard widget overrides */
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
-static const char * _efl_ui_button_default_text_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
-{
- if (elm_widget_is_legacy(obj))
- return "elm.text";
- else
- return "text";
-}
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
+
static const char * _efl_ui_button_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
{
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
else
return "content";
}
+
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
EAPI void
@@ -391,14 +386,11 @@ elm_button_autorepeat_get(const Evas_Object *obj)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_BUTTON_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \
- ELM_PART_TEXT_DEFAULT_OPS(efl_ui_button), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button)
#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)
char buf[64];
if (!elm_widget_resize_object_get(obj)) return;
-
- if (elm_widget_is_legacy(obj))
- snprintf(buf, sizeof(buf), "elm,state,icon,%s",
- elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
- else
- snprintf(buf, sizeof(buf), "elm,state,icon,%s",
- elm_layout_content_get(obj, "content") ? "visible" : "hidden");
+ snprintf(buf, sizeof(buf), "elm,state,icon,%s",
+ elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
elm_layout_signal_emit(obj, buf, "elm");
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)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
double vx, vy;
- edje_object_part_drag_value_get
- (wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
- edje_object_part_drag_value_get
- (wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
+ if (elm_widget_is_legacy(obj))
+ {
+ edje_object_part_drag_value_get
+ (wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
+ edje_object_part_drag_value_get
+ (wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
+ }
+ else
+ {
+ edje_object_part_drag_value_get
+ (wd->resize_obj, "dragable.vbar", NULL, &vy);
+ edje_object_part_drag_value_get
+ (wd->resize_obj, "dragable.hbar", &vx, NULL);
+ }
efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
}
@@ -1496,8 +1506,17 @@ _efl_ui_image_zoomable_bar_size_changed_cb(void *data, const Efl_Event *event EI
double width = 0.0, height = 0.0;
efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
- edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
+
+ if (elm_widget_is_legacy(obj))
+ {
+ edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
+ }
+ else
+ {
+ edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height);
+ }
}
static void
@@ -1510,8 +1529,17 @@ _efl_ui_image_zoomable_bar_pos_changed_cb(void *data, const Efl_Event *event EIN
double posx = 0.0, posy = 0.0;
efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
- edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
+
+ if (elm_widget_is_legacy(obj))
+ {
+ edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
+ }
+ else
+ {
+ edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy);
+ }
}
static void
@@ -1543,111 +1571,223 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
static void
_efl_ui_image_zoomable_edje_object_attach(Eo *obj)
{
- efl_layout_signal_callback_add
- (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
- obj);
- efl_layout_signal_callback_add
- (obj, "drag,set", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,start", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_start_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,stop", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,step", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,page", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_add
- (obj, "elm,vbar,press", "elm",
- _efl_ui_image_zoomable_vbar_press_cb, obj);
- efl_layout_signal_callback_add
- (obj, "elm,vbar,unpress", "elm",
- _efl_ui_image_zoomable_vbar_unpress_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
- obj);
- efl_layout_signal_callback_add
- (obj, "drag,set", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,start", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_start_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,stop", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,step", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_add
- (obj, "drag,page", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_add
- (obj, "elm,hbar,press", "elm",
- _efl_ui_image_zoomable_hbar_press_cb, obj);
- efl_layout_signal_callback_add
- (obj, "elm,hbar,unpress", "elm",
- _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+ if (elm_widget_is_legacy(obj))
+ {
+ efl_layout_signal_callback_add
+ (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_vbar_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,set", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,start", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,stop", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,step", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,page", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,vbar,press", "elm",
+ _efl_ui_image_zoomable_vbar_press_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,vbar,unpress", "elm",
+ _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_hbar_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,set", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,start", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,stop", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,step", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,page", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,hbar,press", "elm",
+ _efl_ui_image_zoomable_hbar_press_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,hbar,unpress", "elm",
+ _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+ }
+ else
+ {
+ efl_layout_signal_callback_add
+ (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag", "dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
+ obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,set", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,start", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,stop", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,step", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,page", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,vbar,press", "elm",
+ _efl_ui_image_zoomable_vbar_press_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,vbar,unpress", "elm",
+ _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag", "dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
+ obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,set", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,start", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,stop", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,step", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "drag,page", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,hbar,press", "elm",
+ _efl_ui_image_zoomable_hbar_press_cb, obj);
+ efl_layout_signal_callback_add
+ (obj, "elm,hbar,unpress", "elm",
+ _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+ }
}
static void
_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
{
- efl_layout_signal_callback_del
- (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
- obj);
- efl_layout_signal_callback_del
- (obj, "drag,set", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,start", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_start_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,stop", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,step", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,page", "elm.dragable.vbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_del
- (obj, "elm,vbar,press", "elm",
- _efl_ui_image_zoomable_vbar_press_cb, obj);
- efl_layout_signal_callback_del
- (obj, "elm,vbar,unpress", "elm",
- _efl_ui_image_zoomable_vbar_unpress_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
- obj);
- efl_layout_signal_callback_del
- (obj, "drag,set", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,start", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_start_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,stop", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,step", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_del
- (obj, "drag,page", "elm.dragable.hbar",
- _efl_ui_image_zoomable_edje_drag_cb, obj);
- efl_layout_signal_callback_del
- (obj, "elm,hbar,press", "elm",
- _efl_ui_image_zoomable_hbar_press_cb, obj);
- efl_layout_signal_callback_del
- (obj, "elm,hbar,unpress", "elm",
- _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+ if (elm_widget_is_legacy(obj))
+ {
+ efl_layout_signal_callback_del
+ (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_vbar_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,set", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,start", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,stop", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,step", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,page", "elm.dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,vbar,press", "elm",
+ _efl_ui_image_zoomable_vbar_press_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,vbar,unpress", "elm",
+ _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_hbar_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,set", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,start", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,stop", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,step", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,page", "elm.dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,hbar,press", "elm",
+ _efl_ui_image_zoomable_hbar_press_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,hbar,unpress", "elm",
+ _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+ }
+ else
+ {
+ efl_layout_signal_callback_del
+ (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag", "dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
+ obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,set", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,start", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,stop", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,step", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,page", "dragable.vbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,vbar,press", "elm",
+ _efl_ui_image_zoomable_vbar_press_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,vbar,unpress", "elm",
+ _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag", "dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
+ obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,set", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,start", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,stop", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,step", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "drag,page", "dragable.hbar",
+ _efl_ui_image_zoomable_edje_drag_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,hbar,press", "elm",
+ _efl_ui_image_zoomable_hbar_press_cb, obj);
+ efl_layout_signal_callback_del
+ (obj, "elm,hbar,unpress", "elm",
+ _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+ }
}
EOLIAN static void
@@ -1678,7 +1818,10 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable
priv->pan_obj = efl_add(MY_PAN_CLASS, obj);
efl_ui_scroll_manager_pan_set(priv->smanager, priv->pan_obj);
- edje_object_part_swallow(edje, "elm.swallow.content", priv->pan_obj);
+ if (elm_widget_is_legacy(obj))
+ edje_object_part_swallow(edje, "elm.swallow.content", priv->pan_obj);
+ else
+ edje_object_part_swallow(edje, "content", priv->pan_obj);
pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
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,
{
snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
set ? "visible" : "hidden");
- efl_layout_signal_emit(obj, buf, "elm");
}
else
{
- snprintf(buf, sizeof(buf), "state,%s,%s", type,
+ snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
set ? "set" : "unset");
- efl_layout_signal_emit(obj, buf, "efl");
}
+ efl_layout_signal_emit(obj, buf, "elm");
}
static inline void
@@ -205,7 +204,8 @@ _icon_signal_emit(Efl_Ui_Layout_Data *sd,
}
}
- if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
+ if (elm_widget_is_legacy(sd->obj) &&
+ !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
type = sub_d->part + strlen("elm.swallow.");
else
type = sub_d->part;
@@ -231,12 +231,7 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd,
{
if (elm_widget_is_legacy(sd->obj) &&
!((!strcmp("elm.text", sub_d->part)) ||
- (!strncmp("elm.text.", sub_d->part, 9))))
- {
- return;
- }
- else if(!((!strcmp("text", sub_d->part)) ||
- (!strncmp("text.", sub_d->part, 5))))
+ (!strncmp("elm.text.", sub_d->part, 9))))
{
return;
}
@@ -526,10 +521,13 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj,
if (!elm_widget_is_legacy(obj))
{
- if (is_text)
- *part = efl_ui_default_text;
- else
- *part = efl_ui_default_content;
+ if (!*part)
+ {
+ if (is_text)
+ *part = efl_ui_default_text;
+ else
+ *part = efl_ui_default_content;
+ }
return EINA_TRUE;
}
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
if (eina_streq(pd->part, "backwall"))
{
- Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "image");
+ Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "content");
if (prev_obj)
{
+ edje_object_signal_emit(sd->backwall, "elm,state,content,unset", "elm");
edje_object_part_unswallow(sd->backwall, prev_obj);
efl_del(prev_obj);
}
@@ -375,12 +376,11 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
Eina_Bool ret = elm_image_file_set(image, file, group);
if (!ret)
{
- edje_object_signal_emit(sd->backwall, "elm,state,image,hidden", "elm");
efl_del(image);
return EINA_FALSE;
}
- edje_object_part_swallow(sd->backwall, "image", image);
- edje_object_signal_emit(sd->backwall, "elm,state,image,visible", "elm");
+ edje_object_part_swallow(sd->backwall, "content", image);
+ edje_object_signal_emit(sd->backwall, "elm,state,content,set", "elm");
return EINA_TRUE;
}
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[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static Efl_Ui_Progress_Status *
_progress_status_new(const char *part_name, double val)
{
@@ -477,10 +471,21 @@ _progress_part_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *par
WRN("min is greater than max.");
}
- if (!strcmp(part_name, "elm.cur.progressbar") || !strcmp(part_name, "cur.progressbar"))
+ if (elm_widget_is_legacy(obj))
+ {
+ if (!strcmp(part_name, "elm.cur.progressbar"))
+ {
+ sd->val_min = min;
+ sd->val_max = max;
+ }
+ }
+ else
{
- sd->val_min = min;
- sd->val_max = max;
+ if (!strcmp(part_name, "cur.progressbar"))
+ {
+ sd->val_min = min;
+ sd->val_max = max;
+ }
}
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
if (val < min) val = min;
if (val > max) val = max;
- if (!strcmp(part_name, "elm.cur.progressbar") || !strcmp(part_name, "cur.progressbar"))
- sd->val = val;
+ if (elm_widget_is_legacy(obj))
+ {
+ if (!strcmp(part_name, "elm.cur.progressbar"))
+ sd->val = val;
+ }
+ else
+ {
+ if (!strcmp(part_name, "cur.progressbar"))
+ sd->val = val;
+ }
EINA_LIST_FOREACH(sd->progress_status, l, ps)
{
@@ -711,15 +724,9 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_get(const Eo *obj, void *_pd
/* Efl.Part end */
/* Internal EO APIs and hidden overrides */
-static const char * _efl_ui_progressbar_default_text_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
-{
- if (elm_widget_is_legacy(obj))
- return "elm.text";
- else
- return "text";
-}
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
+
static const char * _efl_ui_progressbar_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
{
if (elm_widget_is_legacy(obj))
@@ -727,17 +734,15 @@ static const char * _efl_ui_progressbar_default_content_part_get(const Eo *obj E
else
return "content";
}
+
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_progressbar)
#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_progressbar), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \
- ELM_PART_TEXT_DEFAULT_OPS(efl_ui_progressbar), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar)
#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)
edje = elm_widget_resize_object_get(obj);
if (!edje) return;
-
- if (elm_widget_is_legacy(obj))
- snprintf(buf, sizeof(buf), "elm,state,icon,%s",
- elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
- else
- snprintf(buf, sizeof(buf), "elm,state,icon,%s",
- elm_layout_content_get(obj, "content") ? "visible" : "hidden");
+ snprintf(buf, sizeof(buf), "elm,state,icon,%s",
+ elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
elm_layout_signal_emit(obj, buf, "elm");
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)
double vx, vy;
edje_object_part_drag_value_get
- (wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
+ (wd->resize_obj, "dragable.vbar", NULL, &vy);
edje_object_part_drag_value_get
- (wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
+ (wd->resize_obj, "dragable.hbar", &vx, NULL);
efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
}
@@ -206,8 +206,8 @@ _efl_ui_scroller_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UNU
edje_object_calc_force(wd->resize_obj);
efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
- edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
- edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
+ edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0);
+ edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height);
}
static void
@@ -220,8 +220,8 @@ _efl_ui_scroller_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNUS
double posx = 0.0, posy = 0.0;
efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
- edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
- edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
+ edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0);
+ edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy);
}
static void
@@ -260,22 +260,22 @@ _scroll_edje_object_attach(Eo *obj)
efl_layout_signal_callback_add
(obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
+ (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
obj);
efl_layout_signal_callback_add
- (obj, "drag,set", "elm.dragable.vbar",
+ (obj, "drag,set", "dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,start", "elm.dragable.vbar",
+ (obj, "drag,start", "dragable.vbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,stop", "elm.dragable.vbar",
+ (obj, "drag,stop", "dragable.vbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,step", "elm.dragable.vbar",
+ (obj, "drag,step", "dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,page", "elm.dragable.vbar",
+ (obj, "drag,page", "dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "elm,vbar,press", "elm",
@@ -284,22 +284,22 @@ _scroll_edje_object_attach(Eo *obj)
(obj, "elm,vbar,unpress", "elm",
_efl_ui_scroller_vbar_unpress_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
+ (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
obj);
efl_layout_signal_callback_add
- (obj, "drag,set", "elm.dragable.hbar",
+ (obj, "drag,set", "dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,start", "elm.dragable.hbar",
+ (obj, "drag,start", "dragable.hbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,stop", "elm.dragable.hbar",
+ (obj, "drag,stop", "dragable.hbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,step", "elm.dragable.hbar",
+ (obj, "drag,step", "dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
- (obj, "drag,page", "elm.dragable.hbar",
+ (obj, "drag,page", "dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "elm,hbar,press", "elm",
@@ -317,22 +317,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
efl_layout_signal_callback_del
(obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
+ (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
obj);
efl_layout_signal_callback_del
- (obj, "drag,set", "elm.dragable.vbar",
+ (obj, "drag,set", "dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,start", "elm.dragable.vbar",
+ (obj, "drag,start", "dragable.vbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,stop", "elm.dragable.vbar",
+ (obj, "drag,stop", "dragable.vbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,step", "elm.dragable.vbar",
+ (obj, "drag,step", "dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,page", "elm.dragable.vbar",
+ (obj, "drag,page", "dragable.vbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
(obj, "elm,vbar,press", "elm",
@@ -341,22 +341,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
(obj, "elm,vbar,unpress", "elm",
_efl_ui_scroller_vbar_unpress_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
+ (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
obj);
efl_layout_signal_callback_del
- (obj, "drag,set", "elm.dragable.hbar",
+ (obj, "drag,set", "dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,start", "elm.dragable.hbar",
+ (obj, "drag,start", "dragable.hbar",
_efl_ui_scroller_edje_drag_start_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,stop", "elm.dragable.hbar",
+ (obj, "drag,stop", "dragable.hbar",
_efl_ui_scroller_edje_drag_stop_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,step", "elm.dragable.hbar",
+ (obj, "drag,step", "dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
- (obj, "drag,page", "elm.dragable.hbar",
+ (obj, "drag,page", "dragable.hbar",
_efl_ui_scroller_edje_drag_cb, obj);
efl_layout_signal_callback_del
(obj, "elm,hbar,press", "elm",
@@ -409,7 +409,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
sd->pan_obj = efl_add(EFL_UI_PAN_CLASS, obj);
efl_ui_scroll_manager_pan_set(sd->smanager, sd->pan_obj);
- edje_object_part_swallow(wd->resize_obj, "elm.swallow.content", sd->pan_obj);
+ edje_object_part_swallow(wd->resize_obj, "content", sd->pan_obj);
_scroll_edje_object_attach(obj);
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)
if (elm_widget_is_legacy(sd->obj))
{
- edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque",
- &ox, &oy, &ow, &oh);
- edje_object_part_geometry_get(sd->frame_obj, "elm.swallow.client",
- &wdata->content.x, &wdata->content.y,
- &wdata->content.w, &wdata->content.h);
+ edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque",
+ &ox, &oy, &ow, &oh);
+ edje_object_part_geometry_get(sd->frame_obj, "elm.swallow.client",
+ &wdata->content.x, &wdata->content.y,
+ &wdata->content.w, &wdata->content.h);
}
else
{
- edje_object_part_geometry_get(sd->frame_obj, "spacer.opaque",
- &ox, &oy, &ow, &oh);
- edje_object_part_geometry_get(sd->frame_obj, "client",
- &wdata->content.x, &wdata->content.y,
- &wdata->content.w, &wdata->content.h);
+ edje_object_part_geometry_get(sd->frame_obj, "spacer.opaque",
+ &ox, &oy, &ow, &oh);
+ edje_object_part_geometry_get(sd->frame_obj, "client",
+ &wdata->content.x, &wdata->content.y,
+ &wdata->content.w, &wdata->content.h);
}
if (!alpha)
@@ -3995,19 +3995,19 @@ _resize_info_get(Evas_Object *obj, int rotation, Efl_Ui_Win_Move_Resize_Mode mod
if (elm_widget_is_legacy(obj))
{
- for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos_legacy); k++)
- {
+ for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos_legacy); k++)
+ {
if (_resize_infos_legacy[k].mode == mode)
return &_resize_infos_legacy[k];
- }
+ }
}
else
{
- for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++)
- {
+ for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++)
+ {
if (_resize_infos[k].mode == mode)
return &_resize_infos[k];
- }
+ }
}
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)
_elm_cursor_hot_change, cur);
evas_object_event_callback_add(cur->hotobj, EVAS_CALLBACK_RESIZE,
_elm_cursor_hot_change, cur);
- if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot"))
- edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
- else if (edje_object_part_exists(cur->obj, "elm.content.hotspot"))
- edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj);
- else if (edje_object_part_exists(cur->obj, "hotspot"))
- edje_object_part_swallow(cur->obj, "hotspot", cur->hotobj);
- else if (edje_object_part_exists(cur->obj, "content.hotspot"))
- edje_object_part_swallow(cur->obj, "content.hotspot", cur->hotobj);
+
+ if (elm_widget_is_legacy(obj))
+ {
+ if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot"))
+ edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
+ else if (edje_object_part_exists(cur->obj, "elm.content.hotspot"))
+ edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj);
+ else
+ {
+ ELM_SAFE_FREE(cur->hotobj, evas_object_del);
+ ELM_SAFE_FREE(cur->obj, evas_object_del);
+ return EINA_FALSE;
+ }
+ }
else
{
- ELM_SAFE_FREE(cur->hotobj, evas_object_del);
- ELM_SAFE_FREE(cur->obj, evas_object_del);
- return EINA_FALSE;
+ if (edje_object_part_exists(cur->obj, "hotspot"))
+ edje_object_part_swallow(cur->obj, "hotspot", cur->hotobj);
+ else if (edje_object_part_exists(cur->obj, "content.hotspot"))
+ edje_object_part_swallow(cur->obj, "content.hotspot", cur->hotobj);
+ else
+ {
+ ELM_SAFE_FREE(cur->hotobj, evas_object_del);
+ ELM_SAFE_FREE(cur->obj, evas_object_del);
+ return EINA_FALSE;
+ }
}
evas_object_event_callback_add(cur->obj, EVAS_CALLBACK_DEL,