diff options
| author | Taehyub Kim <taehyub.kim@samsung.com> | 2018-04-18 15:48:53 +0900 |
|---|---|---|
| committer | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2018-04-19 20:34:23 +0900 |
| commit | 0e8f0355447cd99493b98d0d7baa73e156ef58b0 (patch) | |
| tree | ab91280a0b2c105b48a5a34cf98f6e73c51a374b | |
| parent | 974fa323a180cf049426661dcff1c3855c0bbc5c (diff) | |
| download | efl-0e8f0355447cd99493b98d0d7baa73e156ef58b0.tar.gz | |
efl_part: remove the elm legacy name of efl ui theme
Summary: efl_part: remove the elm legacy name of efl ui theme
Test Plan: run elementary_test
Reviewers: Jaehyun_Cho, woohyun, cedric, raster, jpeg
Differential Revision: https://phab.enlightenment.org/D5934
38 files changed, 1382 insertions, 1110 deletions
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc index 3c57ac81b3..ddb3365f8f 100644 --- a/data/elementary/themes/edc/efl/bg.edc +++ b/data/elementary/themes/edc/efl/bg.edc @@ -1,12 +1,12 @@ /* bg widget style information [SWALLOW] - elm.swallow.rectangle: Used for elm_bg_color_set() - elm.swallow.background: Used for elm_bg_file_set() - elm.swallow.content: Used for elm_layout_part_content_set(bg, "overlay", content). + rectangle: Used for elm_bg_color_set() + bg: Used for elm_bg_file_set() + content: Used for elm_layout_part_content_set(bg, "overlay", content). */ -group { name: "efl/bg"; +group { "efl/bg"; data.item: "version" "119"; images.image: "bevel_dark_out.png" COMP; parts { @@ -20,11 +20,11 @@ group { name: "efl/bg"; color: 64 64 64 255; } } - part { name: "elm.swallow.rectangle"; type: SWALLOW; + part { name: "rectangle"; type: SWALLOW; description { state: "default" 0.0; } } - part { name: "elm.swallow.background"; type: SWALLOW; + part { name: "bg"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; @@ -38,7 +38,7 @@ group { name: "efl/bg"; fill.smooth: 0; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; description { state: "default" 0.0; } } diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc index f6e8b8922d..34835f01d6 100644 --- a/data/elementary/themes/edc/efl/border.edc +++ b/data/elementary/themes/edc/efl/border.edc @@ -7,7 +7,7 @@ * - virtual keyboard */ -group { name: "efl/border"; +group { "efl/border"; images.image: "vgrad_med_lighter.png" COMP; images.image: "vgrad_med_dark.png" COMP; images.image: "bevel_out.png" COMP; @@ -33,7 +33,7 @@ group { name: "efl/border"; data.item: "version" "119"; parts { /* opaque region of the window, to inform the compositor */ - spacer { "elm.spacer.opaque"; + spacer { "spacer.opaque"; desc { rel1.to: "top_clip"; rel2.to: "bottom_clip"; @@ -41,12 +41,12 @@ group { name: "efl/border"; desc { "max"; inherit: "default"; } } /* covers the entire client contents, excluding the main menu */ - spacer { "elm.spacer.content"; + spacer { "spacer.content"; required; // since 1.19 desc { - rel1.to: "elm.swallow.menu"; + rel1.to: "menu"; rel1.relative: 0.0 1.0; - rel2.to: "elm.swallow.keyboard"; + rel2.to: "keyboard"; rel2.relative: 1.0 0.0; } } @@ -76,7 +76,7 @@ group { name: "efl/border"; rel2.to: "bottom_clip"; } } - rect { "elm.rect.background"; + rect { "rect.background"; required; // @since 1.19 clip: "bg_clip"; desc { "default"; @@ -90,7 +90,7 @@ group { name: "efl/border"; } } /* window background: image */ - swallow { "elm.swallow.background"; + swallow { "background"; required; // @since 1.19 clip: "client_clip"; } @@ -102,7 +102,7 @@ group { name: "efl/border"; middle: 0; } fill.smooth: 0; - rel.to: "elm.spacer.content"; + rel.to: "spacer.content"; visible: 0; } desc { "visible"; @@ -112,7 +112,7 @@ group { name: "efl/border"; } spacer { "indicator_spacer"; desc { "default"; - rel.to: "elm.swallow.indicator"; + rel.to: "indicator"; } desc { "hidden"; rel.to: "top_clip"; @@ -127,10 +127,10 @@ group { name: "efl/border"; desc { "default"; color: 64 64 64 255; // FIXME: color_class align: 0.5 0.0; - rel.to: "elm.swallow.menu"; + rel.to: "menu"; } } - swallow { "elm.swallow.menu"; + swallow { "menu"; required: 1; // since 1.19 desc { "default"; rel.to: "indicator_spacer"; @@ -148,9 +148,9 @@ group { name: "efl/border"; /* application contents - spacer and clipper (without main menu) */ spacer { "client_spacer"; desc { "default"; - rel1.to: "elm.swallow.menu"; + rel1.to: "menu"; rel1.relative: 0.0 1.0; - rel2.to: "elm.swallow.keyboard"; + rel2.to: "keyboard"; rel2.relative: 1.0 0.0; } } @@ -162,7 +162,7 @@ group { name: "efl/border"; } /* application contents */ - swallow { "elm.swallow.client"; + swallow { "client"; clip: "client_clip"; desc { "default"; rel.to: "client_spacer"; @@ -170,7 +170,7 @@ group { name: "efl/border"; } /* modal window blocker */ - rect { "elm.rect.blocker"; + rect { "rect.blocker"; required; desc { "default"; rel1.to: "top_clip"; @@ -234,18 +234,18 @@ group { name: "efl/border"; fill.smooth: 0; } } - text { "elm.text.title"; nomouse; + text { "text.title"; nomouse; scale: 1; effect: SHADOW BOTTOM; clip: "top_clip"; desc { "default"; rel1.relative: 1.0 0.0; rel1.offset: 1 3; - rel1.to_x: "elm.event.icon"; + rel1.to_x: "event.icon"; rel1.to_y: "shadow_spacer"; rel2.relative: 0.0 0.0; rel2.offset: -2 3; - rel2.to_x: "elm.event.minimize"; + rel2.to_x: "event.minimize"; rel2.to_y: "shadow_spacer"; align: 0.5 0.0; color_class: "border_title"; @@ -269,17 +269,17 @@ group { name: "efl/border"; desc { "default"; rel1.relative: 1.0 0.0; rel1.offset: 1 2; - rel1.to_x: "elm.event.icon"; + rel1.to_x: "event.icon"; rel1.to_y: "shadow_spacer"; rel2.relative: 0.0 0.0; rel2.offset: -1 2; - rel2.to_x: "elm.event.minimize"; + rel2.to_x: "event.minimize"; rel2.to_y: "shadow_spacer"; align: 0.5 0.0; color_class: "border_title_active"; color3: 255 255 255 255; text { font: FNBD; size: 10; - text_source: "elm.text.title"; + text_source: "text.title"; text_class: "title_bar"; align: 0.5 0.0; min: 0 1; @@ -292,10 +292,10 @@ group { name: "efl/border"; visible: 1; } } - spacer { "icon"; + spacer { "spacer.icon"; desc { "default"; - rel1.to: "elm.event.icon"; - rel2.to: "elm.event.icon"; + rel1.to: "event.icon"; + rel2.to: "event.icon"; } desc { "bounce1"; inherit: "default"; @@ -308,12 +308,12 @@ group { name: "efl/border"; rel2.relative: 1.2 1.2; } } - swallow { "elm.swallow.icon"; nomouse; + swallow { "icon"; nomouse; clip_to: "top_clip"; desc { "default"; - rel1.to: "icon"; + rel1.to: "spacer.icon"; rel1.relative: 0.15 0.15; - rel2.to: "icon"; + rel2.to: "spacer.icon"; rel2.relative: 0.85 0.85; rel2.offset: 0 0; } @@ -338,10 +338,10 @@ group { name: "efl/border"; max: 20 20; rel1.relative: 1.0 0.0; rel1.offset: 2 -0; - rel1.to: "elm.event.icon"; + rel1.to: "event.icon"; rel2.relative: 1.0 1.0; rel2.offset: 2 -1; - rel2.to: "elm.event.icon"; + rel2.to: "event.icon"; align: 0.0 0.5; fixed: 1 1; } @@ -387,8 +387,8 @@ group { name: "efl/border"; clip: "clip1"; desc { "default"; image.normal: "sym_close_dark_normal.png"; - rel1.to: "elm.event.close"; - rel2.to: "elm.event.close"; + rel1.to: "event.close"; + rel2.to: "event.close"; min: 15 15; max: 15 15; fixed: 1 1; @@ -402,8 +402,8 @@ group { name: "efl/border"; clip: "clip1"; desc { "default"; image.normal: "sym_up_dark_normal.png"; - rel1.to: "elm.event.maximize"; - rel2.to: "elm.event.maximize"; + rel1.to: "event.maximize"; + rel2.to: "event.maximize"; min: 15 15; max: 15 15; fixed: 1 1; @@ -417,8 +417,8 @@ group { name: "efl/border"; clip: "clip1"; desc { "default"; image.normal: "sym_down_dark_normal.png"; - rel1.to: "elm.event.minimize"; - rel2.to: "elm.event.minimize"; + rel1.to: "event.minimize"; + rel2.to: "event.minimize"; min: 15 15; max: 15 15; fixed: 1 1; @@ -432,8 +432,8 @@ group { name: "efl/border"; clip: "clip2"; desc { "default"; image.normal: "sym_close_light_normal.png"; - rel1.to: "elm.event.close"; - rel2.to: "elm.event.close"; + rel1.to: "event.close"; + rel2.to: "event.close"; min: 15 15; max: 15 15; fixed: 1 1; @@ -447,8 +447,8 @@ group { name: "efl/border"; clip: "clip2"; desc { "default"; image.normal: "sym_up_light_normal.png"; - rel1.to: "elm.event.maximize"; - rel2.to: "elm.event.maximize"; + rel1.to: "event.maximize"; + rel2.to: "event.maximize"; min: 15 15; max: 15 15; fixed: 1 1; @@ -462,8 +462,8 @@ group { name: "efl/border"; clip: "clip2"; desc { "default"; image.normal: "sym_down_light_normal.png"; - rel1.to: "elm.event.minimize"; - rel2.to: "elm.event.minimize"; + rel1.to: "event.minimize"; + rel2.to: "event.minimize"; min: 15 15; max: 15 15; fixed: 1 1; @@ -473,7 +473,7 @@ group { name: "efl/border"; image.normal: "sym_down_light_selected.png"; } } - rect { "elm.event.icon"; + rect { "event.icon"; desc { "default"; rel1.relative: 0.0 0.0; rel1.to: "top_clip"; @@ -484,19 +484,19 @@ group { name: "efl/border"; color: 0 0 0 0; } } - rect { "elm.event.titlebar"; + rect { "event.titlebar"; desc { "default"; rel1.relative: 1.0 0.0; - rel1.to_x: "elm.event.icon"; + rel1.to_x: "event.icon"; rel1.to_y: "top_clip"; rel2.relative: 0.0 1.0; rel2.offset: 0 -1; - rel2.to_x: "elm.event.minimize"; + rel2.to_x: "event.minimize"; rel2.to_y: "top_clip"; color: 0 0 0 0; } } - rect { "elm.event.close"; + rect { "event.close"; desc { "default"; rel.to: "top_clip"; rel1.relative: 1.0 0.0; @@ -506,29 +506,29 @@ group { name: "efl/border"; color: 0 0 0 0; } } - rect { "elm.event.maximize"; + rect { "event.maximize"; desc { "default"; rel1.relative: -0.25 0.0; rel1.offset: -1 0; - rel1.to_x: "elm.event.close"; + rel1.to_x: "event.close"; rel1.to_y: "top_clip"; rel2.relative: -0.25 1.0; - rel2.to_x: "elm.event.close"; + rel2.to_x: "event.close"; rel2.to_y: "top_clip"; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; color: 0 0 0 0; } } - rect { "elm.event.minimize"; + rect { "event.minimize"; desc { "default"; rel1.relative: 0.0 0.0; rel1.offset: -1 0; - rel1.to_x: "elm.event.maximize"; + rel1.to_x: "event.maximize"; rel1.to_y: "top_clip"; rel2.relative: 0.0 1.0; rel2.to_y: "top_clip"; - rel2.to_x: "elm.event.maximize"; + rel2.to_x: "event.maximize"; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; color: 0 0 0 0; @@ -544,7 +544,7 @@ group { name: "efl/border"; hid; } } - rect { "elm.event.resize.tl"; + rect { "event.resize.tl"; clip: "top_resize_clip"; desc { "default"; rel.to: "top_clip"; @@ -556,14 +556,14 @@ group { name: "efl/border"; } desc { "hidden"; inherit: "default"; hid; } } - rect { "elm.event.resize.t"; + rect { "event.resize.t"; clip: "top_resize_clip"; desc { "default"; rel1.relative: 1.0 0.0; rel1.to_y: "top_clip"; - rel1.to_x: "elm.event.resize.tl"; + rel1.to_x: "event.resize.tl"; rel2.relative: 0.0 0.0; - rel2.to_x: "elm.event.resize.tr"; + rel2.to_x: "event.resize.tr"; rel2.to_y: "top_clip"; min: 0 4; align: 0.5 0.0; @@ -572,7 +572,7 @@ group { name: "efl/border"; } desc { "hidden"; inherit: "default"; hid; } } - rect { "elm.event.resize.tr"; + rect { "event.resize.tr"; clip: "top_resize_clip"; desc { "default"; rel.to: "top_clip"; @@ -586,7 +586,7 @@ group { name: "efl/border"; desc { "hidden"; inherit: "default"; hid; } } /* bottom border - spacer and clipper */ - swallow { "elm.swallow.keyboard"; + swallow { "keyboard"; desc { "default"; rel.to: "bottom_clip"; rel2.relative: 1.0 0.0; @@ -626,7 +626,7 @@ group { name: "efl/border"; fill.smooth: 0; } } - rect { "elm.event.resize.bl"; + rect { "event.resize.bl"; clip: "bottom_clip"; desc { "default"; rel1.relative: 0.0 1.0; @@ -640,15 +640,15 @@ group { name: "efl/border"; } desc { "hidden"; inherit: "default"; hid; } } - rect { "elm.event.resize.b"; + rect { "event.resize.b"; clip: "bottom_clip"; desc { "default"; rel1.relative: 1.0 1.0; - rel1.to_x: "elm.event.resize.tl"; + rel1.to_x: "event.resize.tl"; rel1.to_y: "bottom_clip"; rel1.offset: 0 -1; rel2.relative: 0.0 1.0; - rel2.to_x: "elm.event.resize.tr"; + rel2.to_x: "event.resize.tr"; rel2.to_y: "bottom_clip"; min: 0 5; align: 0.5 1.0; @@ -657,7 +657,7 @@ group { name: "efl/border"; } desc { "hidden"; inherit: "default"; hid; } } - rect { "elm.event.resize.br"; + rect { "event.resize.br"; clip: "bottom_clip"; desc { "default"; rel1.relative: 1.0 1.0; @@ -687,14 +687,14 @@ group { name: "efl/border"; clip: "bg_clip"; desc { "default"; color: 148 23 45 255; - rel.to: "elm.swallow.indicator"; + rel.to: "indicator"; } desc { "bg_transparent"; inherit: "default"; color: 0 0 0 0; } } - swallow { "elm.swallow.indicator"; + swallow { "indicator"; clip: "bg_clip"; desc { "default"; rel.to: "top_clip"; @@ -774,12 +774,12 @@ group { name: "efl/border"; program { signal: "elm,state,background,solid,on"; source: "elm"; action: STATE_SET "visible"; - target: "elm.rect.background"; + target: "rect.background"; } program { signal: "elm,state,background,solid,off"; source: "elm"; action: STATE_SET "default"; - target: "elm.rect.background"; + target: "rect.background"; } program { signal: "elm,state,background,standard,on"; source: "elm"; @@ -795,7 +795,7 @@ group { name: "efl/border"; signal: "elm,action,focus"; source: "elm"; action: STATE_SET "focused"; target: "top"; - target: "elm.text.title"; + target: "text.title"; target: "title2"; target: "clip1"; target: "clip2"; @@ -804,7 +804,7 @@ group { name: "efl/border"; signal: "elm,action,unfocus"; source: "elm"; action: STATE_SET "default"; target: "top"; - target: "elm.text.title"; + target: "text.title"; target: "title2"; target: "clip1"; target: "clip2"; @@ -812,25 +812,25 @@ group { name: "efl/border"; program { signal: "elm,state,urgent"; source: "elm"; action: STATE_SET "bounce1"; - target: "icon"; + target: "spacer.icon"; after: "urg1"; } program { name: "urg1"; action: STATE_SET "bounce2"; transition: DECELERATE 0.4; - target: "icon"; + target: "spacer.icon"; after: "urg2"; } program { name: "urg2"; action: STATE_SET "bounce1"; transition: ACCELERATE 0.3; - target: "icon"; + target: "spacer.icon"; after: "urg1"; } program { signal: "elm,state,not_urgent"; source: "elm"; action: STATE_SET "default"; - target: "icon"; + target: "spacer.icon"; } program { name: "spin"; signal: "elm,state,hung"; source: "elm"; @@ -872,7 +872,7 @@ group { name: "efl/border"; program { signal: "elm,state,maximize*"; source: "elm"; action: STATE_SET "max"; - target: "elm.spacer.opaque"; + target: "spacer.opaque"; } program { signal: "elm,state,maximize*"; source: "elm"; @@ -881,7 +881,7 @@ group { name: "efl/border"; program { signal: "elm,state,unmaximize*"; source: "elm"; action: STATE_SET "default"; - target: "elm.spacer.opaque"; + target: "spacer.opaque"; } program { signal: "elm,state,unmaximize*"; source: "elm"; @@ -928,33 +928,33 @@ group { name: "efl/border"; signal: "elm,action,indicator,show_effect"; source: "elm"; action: STATE_SET "visible"; transition: DECELERATE 0.2; - target: "elm.swallow.indicator"; + target: "indicator"; } program { signal: "elm,action,indicator,hide_effect"; source: "elm"; action: STATE_SET "hidden"; transition: DECELERATE 0.2; - target: "elm.swallow.indicator"; + target: "indicator"; } program { name: "update_indicator"; script { if (get_int(indicator_enabled)) { if ((get_int(indicator_type) == INDICATOR_TYPE_BG_OPAQUE) || (get_int(indicator_type) == INDICATOR_TYPE_UNKNOWN)) { - set_state(PART:"elm.swallow.indicator", "visible", 0.0); + set_state(PART:"indicator", "visible", 0.0); set_state(PART:"indicator_spacer", "default", 0.0); set_state(PART:"indicator_bg", "default", 0.0); } else if (get_int(indicator_type) == INDICATOR_TYPE_BG_TRANSPARENT) { - set_state(PART:"elm.swallow.indicator", "visible", 0.0); + set_state(PART:"indicator", "visible", 0.0); set_state(PART:"indicator_spacer", "default", 0.0); set_state(PART:"indicator_bg", "bg_transparent", 0.0); } else if (get_int(indicator_type) == INDICATOR_TYPE_HIDDEN) { - set_state(PART:"elm.swallow.indicator", "hidden", 0.0); + set_state(PART:"indicator", "hidden", 0.0); set_state(PART:"indicator_spacer", "hidden", 0.0); set_state(PART:"indicator_bg", "default", 0.0); } } else { - set_state(PART:"elm.swallow.indicator", "default", 0.0); + set_state(PART:"indicator", "default", 0.0); set_state(PART:"indicator_spacer", "default", 0.0); } } @@ -964,171 +964,171 @@ group { name: "efl/border"; program { name: "show_menu"; signal: "elm,action,show_menu"; source: "elm"; action: STATE_SET "visible"; - target: "elm.swallow.menu"; + target: "menu"; } program { name: "hide_menu"; signal: "elm,action,hide"; source: "elm"; action: STATE_SET "default"; - target: "elm.swallow.menu"; + target: "menu"; } /* modal windows */ program { name: "hide_blocker"; signal: "elm,action,hide_blocker"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.rect.blocker"; + target: "rect.blocker"; transition: DECELERATE 0.2; } program { name: "show_blocker"; signal: "elm,action,show_blocker"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.rect.blocker"; + target: "rect.blocker"; transition: DECELERATE 0.2; } /* minimize, maximize & close buttons */ program { - signal: "mouse,down,*"; source: "elm.event.close"; + signal: "mouse,down,*"; source: "event.close"; action: STATE_SET "selected"; target: "close1"; target: "close2"; } program { - signal: "mouse,up,*"; source: "elm.event.close"; + signal: "mouse,up,*"; source: "event.close"; action: STATE_SET "default"; target: "close1"; target: "close2"; } program { - signal: "mouse,down,*"; source: "elm.event.maximize"; + signal: "mouse,down,*"; source: "event.maximize"; action: STATE_SET "selected"; target: "max1"; target: "max2"; } program { - signal: "mouse,up,*"; source: "elm.event.maximize"; + signal: "mouse,up,*"; source: "event.maximize"; action: STATE_SET "default"; target: "max1"; target: "max2"; } program { - signal: "mouse,down,*"; source: "elm.event.minimize"; + signal: "mouse,down,*"; source: "event.minimize"; action: STATE_SET "selected"; target: "min1"; target: "min2"; } program { - signal: "mouse,up,*"; source: "elm.event.minimize"; + signal: "mouse,up,*"; source: "event.minimize"; action: STATE_SET "default"; target: "min1"; target: "min2"; } program { - signal: "mouse,down,1"; source: "elm.event.titlebar"; + signal: "mouse,down,1"; source: "event.titlebar"; action: SIGNAL_EMIT "elm,action,move,start" "elm"; } program { - signal: "mouse,up,1"; source: "elm.event.titlebar"; + signal: "mouse,up,1"; source: "event.titlebar"; action: SIGNAL_EMIT "elm,action,move,stop" "elm"; } program { - signal: "mouse,clicked,1"; source: "elm.event.minimize"; + signal: "mouse,clicked,1"; source: "event.minimize"; action: SIGNAL_EMIT "elm,action,minimize" "elm"; } program { - signal: "mouse,clicked,1"; source: "elm.event.maximize"; + signal: "mouse,clicked,1"; source: "event.maximize"; action: SIGNAL_EMIT "elm,action,maximize" "elm"; } program { - signal: "mouse,clicked,1"; source: "elm.event.close"; + signal: "mouse,clicked,1"; source: "event.close"; action: SIGNAL_EMIT "elm,action,close" "elm"; } program { - signal: "mouse,in"; source: "elm.event.resize.t"; - action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.t"; + signal: "mouse,in"; source: "event.resize.t"; + action: SIGNAL_EMIT "elm,action,resize,show" "event.resize.t"; } program { - signal: "mouse,out"; source: "elm.event.resize.t"; - action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.t"; + signal: "mouse,out"; source: "event.resize.t"; + action: SIGNAL_EMIT "elm,action,resize,hide" "event.resize.t"; } program { - signal: "mouse,down,1"; source: "elm.event.resize.t"; - action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.t"; + signal: "mouse,down,1"; source: "event.resize.t"; + action: SIGNAL_EMIT "elm,action,resize,start" "event.resize.t"; } program { - signal: "mouse,in"; source: "elm.event.resize.b"; - action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.b"; + signal: "mouse,in"; source: "event.resize.b"; + action: SIGNAL_EMIT "elm,action,resize,show" "event.resize.b"; } program { - signal: "mouse,out"; source: "elm.event.resize.b"; - action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.b"; + signal: "mouse,out"; source: "event.resize.b"; + action: SIGNAL_EMIT "elm,action,resize,hide" "event.resize.b"; } program { - signal: "mouse,down,1"; source: "elm.event.resize.b"; - action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.b"; + signal: "mouse,down,1"; source: "event.resize.b"; + action: SIGNAL_EMIT "elm,action,resize,start" "event.resize.b"; } program { - signal: "mouse,in"; source: "elm.event.resize.tl"; - action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tl"; + signal: "mouse,in"; source: "event.resize.tl"; + action: SIGNAL_EMIT "elm,action,resize,show" "event.resize.tl"; } program { - signal: "mouse,out"; source: "elm.event.resize.tl"; - action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tl"; + signal: "mouse,out"; source: "event.resize.tl"; + action: SIGNAL_EMIT "elm,action,resize,hide" "event.resize.tl"; } program { - signal: "mouse,down,1"; source: "elm.event.resize.tl"; - action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tl"; + signal: "mouse,down,1"; source: "event.resize.tl"; + action: SIGNAL_EMIT "elm,action,resize,start" "event.resize.tl"; } program { - signal: "mouse,in"; source: "elm.event.resize.tr"; - action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tr"; + signal: "mouse,in"; source: "event.resize.tr"; + action: SIGNAL_EMIT "elm,action,resize,show" "event.resize.tr"; } program { - signal: "mouse,out"; source: "elm.event.resize.tr"; - action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tr"; + signal: "mouse,out"; source: "event.resize.tr"; + action: SIGNAL_EMIT "elm,action,resize,hide" "event.resize.tr"; } program { - signal: "mouse,down,1"; source: "elm.event.resize.tr"; - action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tr"; + signal: "mouse,down,1"; source: "event.resize.tr"; + action: SIGNAL_EMIT "elm,action,resize,start" "event.resize.tr"; } program { - signal: "mouse,in"; source: "elm.event.resize.bl"; - action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.bl"; + signal: "mouse,in"; source: "event.resize.bl"; + action: SIGNAL_EMIT "elm,action,resize,show" "event.resize.bl"; } program { - signal: "mouse,out"; source: "elm.event.resize.bl"; - action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.bl"; + signal: "mouse,out"; source: "event.resize.bl"; + action: SIGNAL_EMIT "elm,action,resize,hide" "event.resize.bl"; } program { - signal: "mouse,down,1"; source: "elm.event.resize.bl"; - action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.bl"; + signal: "mouse,down,1"; source: "event.resize.bl"; + action: SIGNAL_EMIT "elm,action,resize,start" "event.resize.bl"; } program { - signal: "mouse,in"; source: "elm.event.resize.br"; - action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.br"; + signal: "mouse,in"; source: "event.resize.br"; + action: SIGNAL_EMIT "elm,action,resize,show" "event.resize.br"; } program { - signal: "mouse,out"; source: "elm.event.resize.br"; - action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.br"; + signal: "mouse,out"; source: "event.resize.br"; + action: SIGNAL_EMIT "elm,action,resize,hide" "event.resize.br"; } program { - signal: "mouse,down,1"; source: "elm.event.resize.br"; - action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.br"; + signal: "mouse,down,1"; source: "event.resize.br"; + action: SIGNAL_EMIT "elm,action,resize,start" "event.resize.br"; } program { - signal: "mouse,clicked,1"; source: "elm.event.icon"; + signal: "mouse,clicked,1"; source: "event.icon"; action: SIGNAL_EMIT "elm,action,menu" "elm"; } } } -group { name: "efl/border/dialog"; +group { "efl/border/dialog"; inherit: "efl/border"; parts { - text { "elm.text.title"; + text { "text.title"; clip: "top_clip"; desc { "default"; - rel2.to_x: "elm.event.close"; + rel2.to_x: "event.close"; } desc { "focused"; inherit: "default"; @@ -1137,7 +1137,7 @@ group { name: "efl/border/dialog"; } text { "title2"; desc { "default"; - rel2.to_x: "elm.event.close"; + rel2.to_x: "event.close"; } desc { "focused"; inherit: "default"; @@ -1176,12 +1176,12 @@ group { name: "efl/border/dialog"; visible: 0; } } - rect { "elm.event.maximize"; + rect { "event.maximize"; desc { "default"; visible: 0; } } - rect { "elm.event.minimize"; + rect { "event.minimize"; desc { "default"; visible: 0; } @@ -1189,8 +1189,8 @@ group { name: "efl/border/dialog"; } } -group { name: "efl/border/naviframe"; - inherit: "efl/border/dialog"; +group { "efl/border/naviframe"; + inherit: "efl/border"; images.image: "sym_left_dark_normal.png" COMP; images.image: "sym_left_glow_normal.png" COMP; images.image: "sym_left_light_normal.png" COMP; @@ -1220,4 +1220,3 @@ group { name: "efl/border/naviframe"; #undef MAXIMIZED #undef SET_MODE #undef UNSET_MODE - diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc index 9853358e67..0f55ceca22 100644 --- a/data/elementary/themes/edc/efl/button.edc +++ b/data/elementary/themes/edc/efl/button.edc @@ -18,9 +18,9 @@ group { name: "efl/button"; new bg = m & BACKGROUND; if (bg) { set_state(PART:"base", "hidden", 0.0); - set_state(PART:"elm.swallow.background", "visible", 0.0); + set_state(PART:"background", "visible", 0.0); } else { - set_state(PART:"elm.swallow.background", "default", 0.0); + set_state(PART:"background", "default", 0.0); if (!d) { if (!p) { @@ -36,65 +36,65 @@ group { name: "efl/button"; } if (m1 == (ICON | LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); set_state(PART:"event", "default", 0.0); if (!p) { - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"icon_clip", "default", 0.0); } else { - set_state(PART:"elm.text", "pressed_visible", 0.0); + set_state(PART:"text", "pressed_visible", 0.0); set_state(PART:"icon_clip", "pressed", 0.0); } } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (ICON)) { if (!d) { - set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); set_state(PART:"event", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); if (!p) set_state(PART:"icon_clip", "default", 0.0); else set_state(PART:"icon_clip", "pressed", 0.0); } else { - set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"event", "default", 0.0); if (!p) - set_state(PART:"elm.text", "textonly", 0.0); + set_state(PART:"text", "textonly", 0.0); else - set_state(PART:"elm.text", "pressed_textonly", 0.0); + set_state(PART:"text", "pressed_textonly", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_textonly", 0.0); + set_state(PART:"text", "disabled_textonly", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -128,7 +128,7 @@ group { name: "efl/button"; visible: 0; } } - swallow { "elm.swallow.background"; nomouse; + swallow { "background"; nomouse; required; desc { "default"; rel1.to: "base"; @@ -153,7 +153,7 @@ group { name: "efl/button"; color_class: "button_icon_disabled"; } } - swallow { "elm.swallow.content"; nomouse; + swallow { "content"; nomouse; clip_to: "icon_clip"; required; desc { "default"; @@ -193,8 +193,8 @@ group { name: "efl/button"; } desc { "visible"; inherit: "default"; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -203,8 +203,8 @@ group { name: "efl/button"; } desc { "icononly"; inherit: "default"; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -212,14 +212,14 @@ group { name: "efl/button"; } } } - text { "elm.text"; nomouse; + text { "text"; nomouse; effect: SHADOW BOTTOM; scale; required; desc { "default"; rel1.offset: 0 5; rel1.relative: 1.0 0.0; - rel1.to_x: "elm.swallow.content"; + rel1.to_x: "content"; rel1.to_y: "base"; rel2.offset: -8 -8; rel2.to: "base"; @@ -336,7 +336,7 @@ group { name: "efl/button"; action: SIGNAL_EMIT "elm,action,click" "elm"; } program { name: "button_text_visible"; - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,text,set"; source: "efl"; 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: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,text,unset"; source: "efl"; 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: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; 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: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -421,61 +421,61 @@ group { name: "efl/button:anchor"; new d = m & DISABLE; if (m1 == (ICON | LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (ICON)) { if (!d) { - set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "textonly", 0.0); + set_state(PART:"text", "textonly", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_textonly", 0.0); + set_state(PART:"text", "disabled_textonly", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"bar", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "default", 0.0); set_state(PART:"bar", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); set_state(PART:"icon_clip", "disabled", 0.0); set_state(PART:"bar", "disabled", 0.0); @@ -498,7 +498,7 @@ group { name: "efl/button:anchor"; color: 255 255 255 64; } } - swallow { "elm.swallow.background"; nomouse; + swallow { "background"; nomouse; desc { "default"; rel1.to: "base"; rel2.to: "base"; @@ -509,7 +509,7 @@ group { name: "efl/button:anchor"; visible: 1; } } - swallow { "elm.swallow.content"; nomouse; + swallow { "content"; nomouse; clip_to: "icon_clip"; desc { "default"; fixed: 1 0; @@ -547,8 +547,8 @@ group { name: "efl/button:anchor"; } desc { "visible"; inherit: "default"; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -557,8 +557,8 @@ group { name: "efl/button:anchor"; } desc { "icononly"; inherit: "default"; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -566,13 +566,13 @@ group { name: "efl/button:anchor"; } } } - text { "elm.text"; nomouse; + text { "text"; nomouse; effect: GLOW; scale: 1; desc { "default"; rel1.offset: -2 0; rel1.relative: 1.0 0.0; - rel1.to_x: "elm.swallow.content"; + rel1.to_x: "content"; rel1.to_y: "base"; rel2.offset: -1 -1; rel2.to: "base"; @@ -620,13 +620,13 @@ group { name: "efl/button:anchor"; scale: 1; desc { "default"; fixed: 1 1; - rel1.to: "elm.text"; - rel2.to: "elm.text"; + rel1.to: "text"; + rel2.to: "text"; color_class: "button_text_anchor"; color2: 255 255 255 255; color3: 255 255 255 255; text { font: FN; size: 10; - text_source: "elm.text"; + text_source: "text"; min: 1 1; ellipsis: -1; text_class: "button_anchor"; @@ -718,7 +718,7 @@ group { name: "efl/button:anchor"; action: SIGNAL_EMIT "elm,action,click" "elm"; } program { name: "button_text_visible"; - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,text,set"; source: "efl"; 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: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,text,unset"; source: "efl"; 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: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; 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: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); @@ -752,12 +752,12 @@ group { name: "efl/button:anchor"; program { name: "button_background_visible"; signal: "elm,state,background,set"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.background"; + target: "background"; } program { name: "button_background_hidden"; signal: "elm,state,background,unset"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.background"; + target: "background"; } program { name: "button_state_disabled"; signal: "elm,state,disabled"; source: "elm"; diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc index 2fd7e95233..5f0c5004e9 100644 --- a/data/elementary/themes/edc/efl/calendar.edc +++ b/data/elementary/themes/edc/efl/calendar.edc @@ -41,7 +41,7 @@ color: 0 0 0 0;\ }\ }\ - part { name: "elm,calendar,button"#_sufix",left";\ + part { name: "calendar,button"#_sufix",left";\ type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ @@ -55,7 +55,7 @@ rel2.to: "right_bt"#_sufix;\ }\ }\ - part { name: "elm,calendar,button"#_sufix",right";\ + part { name: "calendar,button"#_sufix",right";\ type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc index 6bcc5cfa78..4a8c1302a6 100644 --- a/data/elementary/themes/edc/efl/check.edc +++ b/data/elementary/themes/edc/efl/check.edc @@ -13,17 +13,17 @@ group { "efl/check"; new d = m & DISABLE; if (m1 == (ICON | LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"base", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"base", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); @@ -31,17 +31,17 @@ group { "efl/check"; } } else if (m1 == (ICON)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"base", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"text", "disabled", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"base", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); @@ -49,17 +49,17 @@ group { "efl/check"; } } else if (m1 == (LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"base", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"base", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); @@ -67,17 +67,17 @@ group { "efl/check"; } } else { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"base", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"base", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); @@ -153,7 +153,7 @@ group { "efl/check"; color: 255 255 255 64; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; scale: 1; clip_to: "clip"; required; @@ -188,8 +188,8 @@ group { "efl/check"; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -198,8 +198,8 @@ group { "efl/check"; } description { state: "icononly" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -207,13 +207,13 @@ group { "efl/check"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; + part { name: "text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; required; description { state: "default" 0.0; rel1.offset: 2 2; - rel1.to_x: "elm.swallow.content"; + rel1.to_x: "content"; rel1.relative: 1.0 0.0; rel2.offset: -3 -3; color: FN_COL_DEFAULT; @@ -271,7 +271,7 @@ group { "efl/check"; target: "indicator"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "elm,state,text,set"; source: "elm"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -279,7 +279,7 @@ group { "efl/check"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "elm,state,text,unset"; source: "elm"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -347,9 +347,9 @@ group { "efl/check:toggle"; new d = m & DISABLE; if (m1 == (ICON | LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); @@ -359,9 +359,9 @@ group { "efl/check:toggle"; set_state(PART:"onrect", "default", 0.0); set_state(PART:"offrect", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -373,9 +373,9 @@ group { "efl/check:toggle"; } } else if (m1 == (ICON)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); @@ -385,9 +385,9 @@ group { "efl/check:toggle"; set_state(PART:"onrect", "default", 0.0); set_state(PART:"offrect", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"text", "disabled", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -399,9 +399,9 @@ group { "efl/check:toggle"; } } else if (m1 == (LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); @@ -411,9 +411,9 @@ group { "efl/check:toggle"; set_state(PART:"onrect", "default", 0.0); set_state(PART:"offrect", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -425,9 +425,9 @@ group { "efl/check:toggle"; } } else { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"shadow", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); @@ -437,9 +437,9 @@ group { "efl/check:toggle"; set_state(PART:"onrect", "default", 0.0); set_state(PART:"offrect", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"shadow", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -661,7 +661,7 @@ group { "efl/check:toggle"; color: 255 255 255 64; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; scale: 1; clip_to: "clip"; description { state: "default" 0.0; @@ -692,8 +692,8 @@ group { "efl/check:toggle"; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -702,8 +702,8 @@ group { "efl/check:toggle"; } description { state: "icononly" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -711,11 +711,11 @@ group { "efl/check:toggle"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; + part { name: "text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.to_x: "elm.swallow.content"; + rel1.to_x: "content"; rel1.relative: 1.0 0.0; rel1.offset: 2 2; rel2.to_x: "tog"; @@ -753,8 +753,8 @@ group { "efl/check:toggle"; ignore_flags: ON_HOLD; description { state: "default" 0.0; color: 0 0 0 0; - rel1.to_x: "elm.swallow.content"; - rel2.to_x: "elm.text"; + rel1.to_x: "content"; + rel2.to_x: "text"; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -870,7 +870,7 @@ group { "efl/check:toggle"; target: "glow_but"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -878,7 +878,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -886,7 +886,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -894,7 +894,7 @@ group { "efl/check:toggle"; } } program { - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc index 78b8590531..846a2d6c8f 100644 --- a/data/elementary/themes/edc/efl/cursor.edc +++ b/data/elementary/themes/edc/efl/cursor.edc @@ -87,7 +87,7 @@ group { name: "efl/cursor/hand1"; image.normal: "pointer_hand1.png"; } } - part { name: "elm.swallow.hotspot"; type: SWALLOW; + part { name: "hotspot"; type: SWALLOW; description { state: "default" 0.0; visible: 0; fixed: 1 1; @@ -98,21 +98,21 @@ group { name: "efl/cursor/hand1"; rel2.offset: 0 0; } } - /* elm.content.hotspot is the old name for the above part */ - alias: "elm.content.hotspot" "elm.swallow.hotspot"; + /* content.hotspot is the old name for the above part */ + alias: "content.hotspot" "hotspot"; } } group { name: "efl/cursor/blank"; parts { - part { name: "elm.swallow.hotspot"; type: SWALLOW; + part { name: "hotspot"; type: SWALLOW; description { state: "default" 0.0; visible: 0; max: 1 1; } } - /* elm.content.hotspot is the old name for the above part */ - alias: "elm.content.hotspot" "elm.swallow.hotspot"; + /* content.hotspot is the old name for the above part */ + alias: "content.hotspot" "hotspot"; } } @@ -130,7 +130,7 @@ group { name: "efl/cursor/xterm"; rel2.offset: -1 -3; } } - part { name: "elm.swallow.hotspot"; type: SWALLOW; + part { name: "hotspot"; type: SWALLOW; description { state: "default" 0.0; visible: 0; fixed: 1 1; @@ -141,8 +141,8 @@ group { name: "efl/cursor/xterm"; rel2.offset: 0 0; } } - /* elm.content.hotspot is the old name for the above part */ - alias: "elm.content.hotspot" "elm.swallow.hotspot"; + /* content.hotspot is the old name for the above part */ + alias: "content.hotspot" "hotspot"; part { name: "shine"; description { state: "default" 0.0; rel1.to: "base"; diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc index 0ce77383f7..10f0a46664 100644 --- a/data/elementary/themes/edc/efl/panes.edc +++ b/data/elementary/themes/edc/efl/panes.edc @@ -18,9 +18,9 @@ group { name: "efl/panes/vertical"; images.image: "holes_vert.png" COMP; parts { - //TODO: remove elm.swallow.left/right - alias: "first" "elm.swallow.left"; - alias: "second" "elm.swallow.right"; + //TODO: remove left/right + alias: "first" "left"; + alias: "second" "right"; part { name: "whole"; type: SPACER; description { state: "default" 0.0; @@ -54,35 +54,35 @@ group { name: "efl/panes/vertical"; } part { name: "whole_left"; type: RECT; description { state: "default" 0.0; - rel2.to_x: "elm.bar"; + rel2.to_x: "bar"; rel2.relative: 1.0 1.0; rel2.offset: -4 -1; } } part { name: "whole_right"; type: RECT; description { state: "default" 0.0; - rel1.to_x: "elm.bar"; + rel1.to_x: "bar"; rel1.relative: 0.0 0.0; rel1.offset: 3 0; } } - part { name: "elm.swallow.left"; type: SWALLOW; + part { name: "left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; - rel2.to_x: "elm.bar"; + rel2.to_x: "bar"; rel2.relative: 1.0 1.0; rel2.offset: -4 -1; } } - part { name: "elm.swallow.right"; type: SWALLOW; + part { name: "right"; type: SWALLOW; clip_to: "whole_right"; description { state: "default" 0.0; - rel1.to_x: "elm.bar"; + rel1.to_x: "bar"; rel1.relative: 0.0 0.0; rel1.offset: 3 0; } } - part { name: "elm.bar"; type: SPACER; + part { name: "bar"; type: SPACER; dragable { confine: "sub_whole"; x: 1 1 1; y: 0 0 0; @@ -98,28 +98,28 @@ group { name: "efl/panes/vertical"; part { name: "dots"; mouse_events: 0; description { state: "default" 0.0; image.normal: "holes_vert.png"; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel1.to: "bar"; + rel2.to: "bar"; FIXED_SIZE(4, 14) } } - part { name: "elm.swallow.event"; type: SWALLOW; + part { name: "event"; type: SWALLOW; description { state: "default" 0.0; visible: 0; min: PANEMIN PANEMIN2; fixed: 1 1; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel1.to: "bar"; + rel2.to: "bar"; } } - part { name: "bar"; type: RECT; - dragable.events: "elm.bar"; + part { name: "rect.bar"; type: RECT; + dragable.events: "bar"; description { state: "default" 0.0; min: PANEMIN PANEWID; max: 99999 99999; fixed: 1 1; - rel1.to_x: "elm.swallow.event"; - rel2.to_x: "elm.swallow.event"; + rel1.to_x: "event"; + rel2.to_x: "event"; color: 0 0 0 0; } description { state: "disabled" 0.0; @@ -129,27 +129,27 @@ group { name: "efl/panes/vertical"; } } programs { - program {signal: "mouse,down,1"; source: "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: "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: "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: "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: "bar"; + target: "rect.bar"; } program { // for elm_panes_fixed_set() signal: "elm,panes,unfixed"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bar"; + target: "rect.bar"; } } } @@ -157,9 +157,9 @@ group { name: "efl/panes/vertical"; group { name: "efl/panes/horizontal"; images.image: "holes_horiz.png" COMP; parts { - //TODO: remove elm.swallow.left/right - alias: "first" "elm.swallow.left"; - alias: "second" "elm.swallow.right"; + //TODO: remove left/right + alias: "first" "left"; + alias: "second" "right"; part { name: "whole"; type: SPACER; description { state: "default" 0.0; @@ -193,35 +193,35 @@ group { name: "efl/panes/horizontal"; } part { name: "whole_left"; type: RECT; description { state: "default" 0.0; - rel2.to_y: "elm.bar"; + rel2.to_y: "bar"; rel2.relative: 1.0 1.0; rel2.offset: -1 -4; } } part { name: "whole_right"; type: RECT; description { state: "default" 0.0; - rel1.to_y: "elm.bar"; + rel1.to_y: "bar"; rel1.relative: 0.0 0.0; rel1.offset: 0 3; } } - part { name: "elm.swallow.left"; type: SWALLOW; + part { name: "left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; - rel2.to_y: "elm.bar"; + rel2.to_y: "bar"; rel2.relative: 1.0 1.0; rel2.offset: -1 -4; } } - part { name: "elm.swallow.right"; type: SWALLOW; + part { name: "right"; type: SWALLOW; clip_to: "whole_right"; description { state: "default" 0.0; - rel1.to_y: "elm.bar"; + rel1.to_y: "bar"; rel1.relative: 0.0 0.0; rel1.offset: 0 3; } } - part { name: "elm.bar"; type: SPACER; + part { name: "bar"; type: SPACER; dragable { confine: "sub_whole"; x: 0 0 0; y: 1 1 1; @@ -237,28 +237,28 @@ group { name: "efl/panes/horizontal"; part { name: "dots"; mouse_events: 0; description { state: "default" 0.0; image.normal: "holes_horiz.png"; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel1.to: "bar"; + rel2.to: "bar"; FIXED_SIZE(14, 4) } } - part { name: "elm.swallow.event"; type: SWALLOW; + part { name: "event"; type: SWALLOW; description { state: "default" 0.0; visible: 0; min: PANEMIN2 PANEMIN; fixed: 1 1; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel1.to: "bar"; + rel2.to: "bar"; } } - part { name: "bar"; type: RECT; - dragable.events: "elm.bar"; + part { name: "rect.bar"; type: RECT; + dragable.events: "bar"; description { state: "default" 0.0; min: PANEWID PANEMIN; max: 99999 99999; fixed: 1 1; - rel1.to_y: "elm.swallow.event"; - rel2.to_y: "elm.swallow.event"; + rel1.to_y: "event"; + rel2.to_y: "event"; color: 0 0 0 0; } description { state: "disabled" 0.0; @@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal"; } } programs { - program {signal: "mouse,down,1"; source: "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: "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: "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: "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: "bar"; + target: "rect.bar"; } program { // for elm_panes_fixed_set() signal: "elm,panes,unfixed"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bar"; + target: "rect.bar"; } } } @@ -329,33 +329,33 @@ group { name: "efl/panes/vertical:flush"; } part { name: "whole_left"; type: RECT; description { state: "default" 0.0; - rel2.to_x: "elm.bar"; + rel2.to_x: "bar"; rel2.relative: 1.0 1.0; } } part { name: "whole_right"; type: RECT; description { state: "default" 0.0; - rel1.to_x: "elm.bar"; + rel1.to_x: "bar"; rel1.relative: 0.0 0.0; } } - part { name: "elm.swallow.left"; type: SWALLOW; + part { name: "left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; - rel2.to_x: "elm.bar"; + rel2.to_x: "bar"; rel2.relative: 1.0 1.0; fixed: 1 0; } } - part { name: "elm.swallow.right"; type: SWALLOW; + part { name: "right"; type: SWALLOW; clip_to: "whole_right"; description { state: "default" 0.0; - rel1.to_x: "elm.bar"; + rel1.to_x: "bar"; rel1.relative: 0.0 0.0; fixed: 1 0; } } - part { name: "elm.bar"; type: SPACER; + part { name: "bar"; type: SPACER; dragable { confine: "sub_whole"; x: 1 1 1; y: 0 0 0; @@ -368,24 +368,24 @@ group { name: "efl/panes/vertical:flush"; rel2.relative: 1.0 0.5; } } - part { name: "elm.swallow.event"; type: SWALLOW; + part { name: "event"; type: SWALLOW; description { state: "default" 0.0; visible: 0; min: PANEMIN PANEMIN2; fixed: 1 1; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel1.to: "bar"; + rel2.to: "bar"; } } - part { name: "bar"; type: RECT; - dragable.events: "elm.bar"; + part { name: "rect.bar"; type: RECT; + dragable.events: "bar"; description { state: "default" 0.0; min: PANEMIN PANEWID; max: 99999 99999; fixed: 1 1; - rel1.to_x: "elm.swallow.event"; + rel1.to_x: "event"; rel1.relative: 0.0 0.25; - rel2.to_x: "elm.swallow.event"; + rel2.to_x: "event"; rel2.relative: 1.0 0.75; color: 0 0 0 0; } @@ -399,7 +399,7 @@ group { name: "efl/panes/vertical:flush"; image.normal: "downlight_glow_left.png"; image.border: 0 3 0 0; max: 32 99999; - rel2.to_x: "elm.bar"; + rel2.to_x: "bar"; color: 255 255 255 0; align: 1.0 0.5; } @@ -412,7 +412,7 @@ group { name: "efl/panes/vertical:flush"; description { state: "default" 0.0; image.normal: "downlight_glow_right.png"; max: 4 99999; - rel1.to_x: "elm.bar"; + rel1.to_x: "bar"; color: 255 255 255 0; align: 0.0 0.5; } @@ -425,7 +425,7 @@ group { name: "efl/panes/vertical:flush"; description { state: "default" 0.0; image.normal: "downlight_glow_left.png"; max: 4 99999; - rel2.to_x: "elm.bar"; + rel2.to_x: "bar"; color: 255 255 255 0; align: 1.0 0.5; } @@ -439,7 +439,7 @@ group { name: "efl/panes/vertical:flush"; image.normal: "downlight_glow_right.png"; image.border: 3 0 0 0; max: 32 99999; - rel1.to_x: "elm.bar"; + rel1.to_x: "bar"; color: 255 255 255 0; align: 0.0 0.5; } @@ -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: "bar"; - rel2.to: "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: "bar"; + rel1.to: "rect.bar"; rel1.relative: 0.5 0.0; - rel2.to: "bar"; + rel2.to: "rect.bar"; color: 0 0 0 0; } } } programs { - program {signal: "mouse,down,1"; source: "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: "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: "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: "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: "bar"; + target: "rect.bar"; } program { // for elm_panes_fixed_set() signal: "elm,panes,unfixed"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bar"; + target: "rect.bar"; } program { signal: "mouse,in"; source: "bar1"; @@ -557,33 +557,33 @@ group { name: "efl/panes/horizontal:flush"; } part { name: "whole_left"; type: RECT; description { state: "default" 0.0; - rel2.to_y: "elm.bar"; + rel2.to_y: "bar"; rel2.relative: 1.0 1.0; } } part { name: "whole_right"; type: RECT; description { state: "default" 0.0; - rel1.to_y: "elm.bar"; + rel1.to_y: "bar"; rel1.relative: 0.0 0.0; } } - part { name: "elm.swallow.left"; type: SWALLOW; + part { name: "left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; - rel2.to_y: "elm.bar"; + rel2.to_y: "bar"; rel2.relative: 1.0 1.0; fixed: 0 1; } } - part { name: "elm.swallow.right"; type: SWALLOW; + part { name: "right"; type: SWALLOW; clip_to: "whole_right"; description { state: "default" 0.0; - rel1.to_y: "elm.bar"; + rel1.to_y: "bar"; rel1.relative: 0.0 0.0; fixed: 0 1; } } - part { name: "elm.bar"; type: SPACER; + part { name: "bar"; type: SPACER; dragable { confine: "sub_whole"; x: 0 0 0; y: 1 1 1; @@ -596,24 +596,24 @@ group { name: "efl/panes/horizontal:flush"; rel2.relative: 0.5 1.0; } } - part { name: "elm.swallow.event"; type: SWALLOW; + part { name: "event"; type: SWALLOW; description { state: "default" 0.0; visible: 0; min: PANEMIN2 PANEMIN; fixed: 1 1; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel1.to: "bar"; + rel2.to: "bar"; } } - part { name: "bar"; type: RECT; - dragable.events: "elm.bar"; + part { name: "rect.bar"; type: RECT; + dragable.events: "bar"; description { state: "default" 0.0; min: PANEWID PANEMIN; max: 99999 99999; fixed: 1 1; - rel1.to_y: "elm.swallow.event"; + rel1.to_y: "event"; rel1.relative: 0.25 0.0; - rel2.to_y: "elm.swallow.event"; + rel2.to_y: "event"; rel2.relative: 0.75 1.0; color: 0 0 0 0; } @@ -627,7 +627,7 @@ group { name: "efl/panes/horizontal:flush"; image.normal: "downlight_glow_up.png"; image.border: 0 0 0 3; max: 99999 32; - rel2.to_y: "elm.bar"; + rel2.to_y: "bar"; color: 255 255 255 0; align: 0.5 1.0; } @@ -640,7 +640,7 @@ group { name: "efl/panes/horizontal:flush"; description { state: "default" 0.0; image.normal: "downlight_glow.png"; max: 99999 4; - rel1.to_y: "elm.bar"; + rel1.to_y: "bar"; color: 255 255 255 0; align: 0.5 0.0; } @@ -653,7 +653,7 @@ group { name: "efl/panes/horizontal:flush"; description { state: "default" 0.0; image.normal: "downlight_glow_up.png"; max: 99999 4; - rel2.to_y: "elm.bar"; + rel2.to_y: "bar"; color: 255 255 255 0; align: 0.5 1.0; } @@ -667,7 +667,7 @@ group { name: "efl/panes/horizontal:flush"; image.normal: "downlight_glow.png"; image.border: 0 0 3 0; max: 99999 32; - rel1.to_y: "elm.bar"; + rel1.to_y: "bar"; color: 255 255 255 0; align: 0.5 0.0; } @@ -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: "bar"; - rel2.to: "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: "bar"; + rel1.to: "rect.bar"; rel1.relative: 0.0 0.5; - rel2.to: "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: "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: "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: "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: "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: "bar"; + target: "rect.bar"; } program { // for elm_panes_fixed_set() signal: "elm,panes,unfixed"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bar"; + target: "rect.bar"; } } } @@ -796,15 +796,15 @@ group { name: "efl/panes/vertical:left-fold"; new Float: dx; new Float: dy; set_int(open, 0); - get_drag(PART:"elm.bar", dx, dy); + get_drag(PART:"bar", dx, dy); set_float(drag_x, dx); - set_drag(PART:"elm.bar", 0.0, 0.5); + set_drag(PART:"bar", 0.0, 0.5); set_state(PART:"dots", "closed", 0.0); } else if (get_int(open) == 0) { set_int(open, 1); - set_drag(PART:"elm.bar", get_float(drag_x), 0.5); + set_drag(PART:"bar", get_float(drag_x), 0.5); set_state(PART:"dots", "default", 0.0); } } @@ -859,15 +859,15 @@ group { name: "efl/panes/vertical:right-fold"; new Float: dx; new Float: dy; set_int(open, 0); - get_drag(PART:"elm.bar", dx, dy); + get_drag(PART:"bar", dx, dy); set_float(drag_x, dx); - set_drag(PART:"elm.bar", 1.0, 0.5); + set_drag(PART:"bar", 1.0, 0.5); set_state(PART:"dots", "closed", 0.0); } else if (get_int(open) == 0) { set_int(open, 1); - set_drag(PART:"elm.bar", get_float(drag_x), 0.5); + set_drag(PART:"bar", get_float(drag_x), 0.5); set_state(PART:"dots", "default", 0.0); } } @@ -922,15 +922,15 @@ group { name: "efl/panes/horizontal:up-fold"; new Float: dx; new Float: dy; set_int(open, 0); - get_drag(PART:"elm.bar", dx, dy); + get_drag(PART:"bar", dx, dy); set_float(drag_y, dy); - set_drag(PART:"elm.bar", 0.5, 0.0); + set_drag(PART:"bar", 0.5, 0.0); set_state(PART:"dots", "closed", 0.0); } else if (get_int(open) == 0) { set_int(open, 1); - set_drag(PART:"elm.bar", 0.5, get_float(drag_y)); + set_drag(PART:"bar", 0.5, get_float(drag_y)); set_state(PART:"dots", "default", 0.0); } } @@ -985,15 +985,15 @@ group { name: "efl/panes/horizontal:down-fold"; new Float: dx; new Float: dy; set_int(open, 0); - get_drag(PART:"elm.bar", dx, dy); + get_drag(PART:"bar", dx, dy); set_float(drag_y, dy); - set_drag(PART:"elm.bar", 0.5, 1.0); + set_drag(PART:"bar", 0.5, 1.0); set_state(PART:"dots", "closed", 0.0); } else if (get_int(open) == 0) { set_int(open, 1); - set_drag(PART:"elm.bar", 0.5, get_float(drag_y)); + set_drag(PART:"bar", 0.5, get_float(drag_y)); set_state(PART:"dots", "default", 0.0); } } diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc index a101aa73c7..f2e1eaf900 100644 --- a/data/elementary/themes/edc/efl/pointer.edc +++ b/data/elementary/themes/edc/efl/pointer.edc @@ -38,7 +38,7 @@ group { name: "efl/pointer"; } } part { - name: "elm.swallow.hotspot"; + name: "hotspot"; /* this is a "fake" swallow part * that is used by e to determine * the pointer hotspot - or where diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc index 50fb460f09..0708f2a8ff 100644 --- a/data/elementary/themes/edc/efl/popup.edc +++ b/data/elementary/themes/edc/efl/popup.edc @@ -15,7 +15,7 @@ group { "efl/popup"; image.normal: "rounded_square.png"; } } - swallow { "elm.swallow.content"; + swallow { "content"; desc { "default"; rel.to: "base"; } @@ -28,7 +28,7 @@ group { "efl/popup_alert"; alias: "efl/popup_alert_text"; images.image: "rounded_square.png" COMP; parts { - alias: "title" "elm.text.title"; + alias: "title" "text.title"; image { "bg"; desc { "default"; min: 100 100; @@ -57,7 +57,7 @@ group { "efl/popup_alert"; min: 0 20; } } - textblock { "elm.text.title"; + textblock { "text.title"; scale; desc { "default"; fixed: 1 1; @@ -85,7 +85,7 @@ group { "efl/popup_alert"; min: 0 30; } } - swallow { "elm.swallow.content"; + swallow { "content"; desc { "default"; rel1.to_x: "base"; rel1.to_y: "title_bg"; @@ -101,7 +101,7 @@ group { "efl/popup_alert"; signal: "elm,title,show"; source: "elm"; action: STATE_SET "title_visible" 0.0; target: "title_bg"; - target: "elm.text.title"; + target: "text.title"; } program { signal: "elm,buttons,show"; source: "elm"; @@ -130,7 +130,7 @@ group { "efl/popup/backwall"; hid; } } - swallow { "elm.swallow.image"; + swallow { "image"; desc { "default"; rel.to: "base"; hid; @@ -153,13 +153,13 @@ group { "efl/popup/backwall"; signal: "elm,state,image,visible"; source: "elm"; action: STATE_SET "show_image" 0.0; target: "base"; - target: "elm.swallow.image"; + target: "image"; } program { signal: "elm,state,image,hidden"; source: "elm"; action: STATE_SET "default" 0.0; target: "base"; - target: "elm.swallow.image"; + target: "image"; } program { signal: "mouse,clicked,1"; source: "block"; @@ -172,7 +172,7 @@ group { "efl/popup_alert/button_layout1"; alias: "efl/popup_alert_scroll/button_layout1"; alias: "efl/popup_alert_text/button_layout1"; parts { - swallow { "elm.swallow.button1"; + swallow { "button1"; } } } @@ -188,13 +188,13 @@ group { "efl/popup_alert/button_layout2"; min: 5 5; } } - swallow { "elm.swallow.button1"; + swallow { "button1"; desc { "default"; rel2.to_x: "div1"; rel2.relative: 0.0 1.0; } } - swallow { "elm.swallow.button2"; + swallow { "button2"; desc { "default"; rel1.to_x: "div1"; rel1.relative: 1.0 0.0; @@ -221,13 +221,13 @@ group { "efl/popup_alert/button_layout3"; min: 5 5; } } - swallow { "elm.swallow.button1"; + swallow { "button1"; desc { "default"; rel2.to_x: "div1"; rel2.relative: 0.0 1.0; } } - swallow { "elm.swallow.button2"; + swallow { "button2"; desc { "default"; rel1.to_x: "div1"; rel2.to_x: "div2"; @@ -235,7 +235,7 @@ group { "efl/popup_alert/button_layout3"; rel2.relative: 0.0 1.0; } } - swallow { "elm.swallow.button3"; + swallow { "button3"; desc { "default"; rel1.to_x: "div2"; rel1.relative: 1.0 0.0; @@ -250,27 +250,9 @@ group { "efl/popup_alert/button"; alias: "efl/popup_alert_text/button"; } -group { name: "efl/popup_alert_scroll/scroller"; - inherit: "efl/scroller"; +group { "efl/popup_alert_scroll/scroller"; + inherit: "elm/scroller/base/popup/no_inset_shadow"; alias: "efl/popup_alert_text/scroller"; - parts { - part { name: "elm.swallow.content"; type: SWALLOW; - description { state: "default" 0.0; - rel1.offset: 0 0; - rel2.offset: 0 0; - } - } - part { name: "inset"; - description { state: "default" 0.0; - visible: 0; - } - } - part { name: "shadow"; - description { state: "default" 0.0; - visible: 0; - } - } - } } group { "efl/popup_alert_text/text"; diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc index 049724207b..82beadaead 100644 --- a/data/elementary/themes/edc/efl/progress.edc +++ b/data/elementary/themes/edc/efl/progress.edc @@ -20,18 +20,18 @@ group { "efl/progressbar/horizontal"; new d = m & DISABLE; if (l) { if (!d) { - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); } else { - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); } } else { - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); } if (ic) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); } if (!d) { @@ -44,8 +44,8 @@ group { "efl/progressbar/horizontal"; parts { part { name: "dis_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -73,7 +73,7 @@ group { "efl/progressbar/horizontal"; visible: 0; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; clip_to: "dis_clip"; required; description { state: "default" 0.0; @@ -104,8 +104,8 @@ group { "efl/progressbar/horizontal"; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -113,17 +113,17 @@ group { "efl/progressbar/horizontal"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; + part { name: "text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; required; description { state: "default" 0.0; fixed: 1 1; align: 0.0 0.5; - rel1.to_x: "elm.swallow.content"; + rel1.to_x: "content"; rel1.relative: 1.0 0.0; rel1.offset: -1 2; - rel2.to_x: "elm.swallow.content"; + rel2.to_x: "content"; rel2.relative: 1.0 1.0; rel2.offset: -1 -3; color: FN_COL_DEFAULT; @@ -166,7 +166,7 @@ group { "efl/progressbar/horizontal"; description { state: "default" 0.0; min: 16 16; max: -1 16; - rel1.to_x: "elm.text"; + rel1.to_x: "text"; rel1.relative: 1.0 0.0; rel1.offset: 3 3; rel2.offset: -4 -4; @@ -228,7 +228,7 @@ group { "efl/progressbar/horizontal"; rel2.to: "inside"; } } - part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER; + part { name: "cur.progressbar"; mouse_events: 0; type: SPACER; scale: 1; dragable.confine: "inside"; dragable.x: 1 1 1; @@ -246,9 +246,9 @@ group { "efl/progressbar/horizontal"; description { state: "default" 0.0; fixed: 1 0; min: 14 16; - rel1.to_x: "elm.cur.progressbar"; + rel1.to_x: "cur.progressbar"; rel1.relative: 1.0 0.0; - rel2.to_x: "elm.cur.progressbar"; + rel2.to_x: "cur.progressbar"; rel2.relative: 1.0 1.0; align: 0.0 0.5; } @@ -259,7 +259,7 @@ group { "efl/progressbar/horizontal"; align: 1.0 0.5; } } - part { name: "bar"; + part { name: "bar_internal"; 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"; + rel1.to_y: "bar_internal"; rel1.relative: 0.0 0.0; rel2.to_x: "insidep1"; - rel2.to_y: "bar"; + rel2.to_y: "bar_internal"; rel2.relative: 1.0 1.0; image.normal: "inset_bar_horiz_glow_mid_base.png"; align: 0.0 0.5; @@ -328,7 +328,7 @@ group { "efl/progressbar/horizontal"; align: 1.0 0.5; } } - part { name: "elm.text.status"; type: TEXT; mouse_events: 0; + part { name: "text.status"; type: TEXT; mouse_events: 0; scale: 1; effect: GLOW; description { state: "default" 0.0; @@ -372,11 +372,11 @@ group { "efl/progressbar/horizontal"; scale: 1; description { state: "default" 0.0; max: 36 11; - rel1.to_x: "bar"; - rel1.to_y: "bar"; + rel1.to_x: "bar_internal"; + rel1.to_y: "bar_internal"; rel1.relative: 0.0 (26/96); rel2.to_x: "barend"; - rel2.to_y: "bar"; + rel2.to_y: "bar_internal"; 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"; + rel1.to_y: "bar_internal"; rel1.relative: 0.8 (26/96); - rel2.to_x: "bar"; - rel2.to_y: "bar"; + rel2.to_x: "bar_internal"; + rel2.to_y: "bar_internal"; rel2.relative: 1.0 ((26+44)/96); align: 0.0 0.0; image.normal: "inset_bar_horiz_glow_inv_light.png"; @@ -402,24 +402,24 @@ group { "efl/progressbar/horizontal"; program { name: "inverted-on"; signal: "elm,state,inverted,on"; source: "elm"; action: STATE_SET "inv" 0.0; - target: "bar"; + target: "bar_internal"; target: "barend"; target: "light"; } program { name: "inverted-off"; signal: "elm,state,inverted,off"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bar"; + target: "bar_internal"; target: "barend"; target: "light"; } program { name: "drag-set"; - signal: "drag,set"; source: "elm.cur.progressbar"; + signal: "drag,set"; source: "cur.progressbar"; script { new a, Float:dx, Float:dy, Float:vl, st[20]; - get_drag(PART:"elm.cur.progressbar", dx, dy); - get_state(PART:"bar", st, 19, vl); + get_drag(PART:"cur.progressbar", dx, dy); + get_state(PART:"bar_internal", st, 19, vl); if (!strcmp(st, "inv")) { a = round(((1.0 - dx) * 255) / 0.2); custom_state(PART:"light", "inv", 0.0); @@ -435,7 +435,7 @@ group { "efl/progressbar/horizontal"; program { name: "pulse-mode0"; signal: "elm,state,pulse"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "elm.text.status"; + target: "text.status"; after: "pulse-mode1"; } program { name: "pulse-mode1"; @@ -479,7 +479,7 @@ group { "efl/progressbar/horizontal"; program { name: "fraction"; signal: "elm,state,fraction"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.text.status"; + target: "text.status"; after: "pulse-stop"; } program { name: "elmpulse-stop"; @@ -496,12 +496,12 @@ group { "efl/progressbar/horizontal"; program { name: "units-visible"; signal: "elm,state,units,visible"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.text.status"; + target: "text.status"; } program { name: "units-hidden"; signal: "elm,state,units,hidden"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "elm.text.status"; + target: "text.status"; } program { name: "text-visible"; signal: "elm,state,elm.text,set"; source: "elm"; @@ -580,18 +580,18 @@ group { "efl/progressbar/vertical"; new d = m & DISABLE; if (l) { if (!d) { - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); } else { - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); } } else { - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); } if (ic) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); } if (!d) { @@ -604,8 +604,8 @@ group { "efl/progressbar/vertical"; parts { part { name: "dis_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -633,7 +633,7 @@ group { "efl/progressbar/vertical"; visible: 0; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; clip_to: "dis_clip"; required; description { state: "default" 0.0; @@ -664,8 +664,8 @@ group { "efl/progressbar/vertical"; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -673,17 +673,17 @@ group { "efl/progressbar/vertical"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; + part { name: "text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; required; description { state: "default" 0.0; fixed: 1 1; align: 0.5 0.0; - rel1.to_y: "elm.swallow.content"; + rel1.to_y: "content"; rel1.relative: 0.0 1.0; rel1.offset: 2 -1; - rel2.to_y: "elm.swallow.content"; + rel2.to_y: "content"; rel2.relative: 1.0 1.0; rel2.offset: -3 -1; color: FN_COL_DEFAULT; @@ -726,7 +726,7 @@ group { "efl/progressbar/vertical"; description { state: "default" 0.0; min: 16 16; max: 16 -1; - rel1.to_y: "elm.text"; + rel1.to_y: "text"; rel1.relative: 0.0 1.0; rel1.offset: 3 3; rel2.offset: -4 -4; @@ -788,7 +788,7 @@ group { "efl/progressbar/vertical"; rel2.to: "inside"; } } - part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER; + part { name: "cur.progressbar"; mouse_events: 0; type: SPACER; scale: 1; dragable.confine: "inside"; dragable.x: 0 0 0; @@ -806,9 +806,9 @@ group { "efl/progressbar/vertical"; description { state: "default" 0.0; fixed: 0 1; min: 16 14; - rel1.to_y: "elm.cur.progressbar"; + rel1.to_y: "cur.progressbar"; rel1.relative: 0.0 1.0; - rel2.to_y: "elm.cur.progressbar"; + rel2.to_y: "cur.progressbar"; rel2.relative: 1.0 1.0; align: 0.5 0.0; } @@ -819,7 +819,7 @@ group { "efl/progressbar/vertical"; align: 0.5 1.0; } } - part { name: "bar"; + part { name: "bar_internal"; 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"; + rel1.to_x: "bar_internal"; rel1.relative: 0.0 0.0; rel2.to_y: "insidep1"; - rel2.to_x: "bar"; + rel2.to_x: "bar_internal"; rel2.relative: 1.0 1.0; image.normal: "inset_bar_vert_glow_mid_base.png"; align: 0.5 0.0; @@ -897,7 +897,7 @@ group { "efl/progressbar/vertical"; aspect: 1.0 1.0; aspect_preference: NONE; } } - part { name: "elm.text.status"; type: TEXT; mouse_events: 0; + part { name: "text.status"; type: TEXT; mouse_events: 0; scale: 1; effect: GLOW; description { state: "default" 0.0; @@ -945,11 +945,11 @@ group { "efl/progressbar/vertical"; scale: 1; description { state: "default" 0.0; max: 11 36; - rel1.to_y: "bar"; - rel1.to_x: "bar"; + rel1.to_y: "bar_internal"; + rel1.to_x: "bar_internal"; rel1.relative: (26/96) 0.0; rel2.to_y: "barend"; - rel2.to_x: "bar"; + rel2.to_x: "bar_internal"; 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"; + rel1.to_x: "bar_internal"; rel1.relative: (26/96) 0.8; - rel2.to_y: "bar"; - rel2.to_x: "bar"; + rel2.to_y: "bar_internal"; + rel2.to_x: "bar_internal"; rel2.relative: ((26+44)/96) 1.0; align: 0.0 0.0; image.normal: "inset_bar_vert_glow_inv_light.png"; @@ -975,24 +975,24 @@ group { "efl/progressbar/vertical"; program { name: "inverted-on"; signal: "elm,state,inverted,on"; source: "elm"; action: STATE_SET "inv" 0.0; - target: "bar"; + target: "bar_internal"; target: "barend"; target: "light"; } program { name: "inverted-off"; signal: "elm,state,inverted,off"; source: "elm"; action: STATE_SET "default" 0.0; - target: "bar"; + target: "bar_internal"; target: "barend"; target: "light"; } program { name: "drag-set"; - signal: "drag,set"; source: "elm.cur.progressbar"; + signal: "drag,set"; source: "cur.progressbar"; script { new a, Float:dx, Float:dy, Float:vl, st[20]; - get_drag(PART:"elm.cur.progressbar", dx, dy); - get_state(PART:"bar", st, 19, vl); + get_drag(PART:"cur.progressbar", dx, dy); + get_state(PART:"bar_internal", st, 19, vl); if (!strcmp(st, "inv")) { a = round(((1.0 - dy) * 255) / 0.2); custom_state(PART:"light", "inv", 0.0); @@ -1008,7 +1008,7 @@ group { "efl/progressbar/vertical"; program { name: "pulse-mode0"; signal: "elm,state,pulse"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "elm.text.status"; + target: "text.status"; after: "pulse-mode1"; } program { name: "pulse-mode1"; @@ -1052,7 +1052,7 @@ group { "efl/progressbar/vertical"; program { name: "fraction"; signal: "elm,state,fraction"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.text.status"; + target: "text.status"; after: "pulse-stop"; } program { name: "elmpulsestop"; @@ -1069,12 +1069,12 @@ group { "efl/progressbar/vertical"; program { name: "unit-visible"; signal: "elm,state,units,visible"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.text.status"; + target: "text.status"; } program { name: "unit-hidden"; signal: "elm,state,units,hidden"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "elm.text.status"; + target: "text.status"; } program { name: "text-visible"; signal: "elm,state,elm.text,set"; source: "elm"; @@ -1143,7 +1143,7 @@ group { "efl/progressbar/horizontal:wheel"; visible: 0; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; description { state: "default" 0.0; min: 0 0; max: 0 0; @@ -1231,7 +1231,7 @@ group { "efl/progressbar/horizontal:double"; image: "inset_bar_horiz_glow_inv_base_double.png" COMP; } parts { - part { name: "elm.cur.progressbar1"; mouse_events: 0; type: SPACER; + part { name: "cur.progressbar1"; mouse_events: 0; type: SPACER; insert_after: "inside"; scale: 1; dragable.confine: "inside"; @@ -1250,9 +1250,9 @@ group { "efl/progressbar/horizontal:double"; description { state: "default" 0.0; fixed: 1 0; min: 14 16; - rel1.to_x: "elm.cur.progressbar1"; + rel1.to_x: "cur.progressbar1"; rel1.relative: 1.0 0.0; - rel2.to_x: "elm.cur.progressbar1"; + rel2.to_x: "cur.progressbar1"; rel2.relative: 1.0 1.0; align: 0.0 0.5; } @@ -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"; + target: "bar_internal"; 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"; + target: "bar_internal"; target: "bar1"; target: "barend"; target: "barend1"; @@ -1320,7 +1320,7 @@ group { "efl/progressbar/vertical:double"; image: "inset_bar_vert_glow_inv_base_double.png" COMP; } parts { - part { name: "elm.cur.progressbar1"; mouse_events: 0; type: SPACER; + part { name: "cur.progressbar1"; mouse_events: 0; type: SPACER; insert_after: "inside"; scale: 1; dragable.confine: "inside"; @@ -1339,9 +1339,9 @@ group { "efl/progressbar/vertical:double"; description { state: "default" 0.0; fixed: 0 1; min: 16 14; - rel1.to_y: "elm.cur.progressbar1"; + rel1.to_y: "cur.progressbar1"; rel1.relative: 0.0 1.0; - rel2.to_y: "elm.cur.progressbar1"; + rel2.to_y: "cur.progressbar1"; rel2.relative: 1.0 1.0; align: 0.5 0.0; } @@ -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"; + target: "bar_internal"; 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"; + target: "bar_internal"; 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 8e2ccf3b63..19aed9c268 100644 --- a/data/elementary/themes/edc/efl/radio.edc +++ b/data/elementary/themes/edc/efl/radio.edc @@ -13,64 +13,64 @@ group { "efl/radio"; new d = m & DISABLE; if (m1 == (ICON | LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"inset", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "visible", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"inset", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (ICON)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"inset", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"content", "visible", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"text", "disabled", 0.0); set_state(PART:"inset", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (LABEL)) { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"text", "visible", 0.0); set_state(PART:"inset", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"text", "disabled_visible", 0.0); set_state(PART:"inset", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else { if (!d) { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"inset", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"content", "default", 0.0); set_state(PART:"sizer.content", "default", 0.0); - set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"text", "default", 0.0); set_state(PART:"inset", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); @@ -120,7 +120,7 @@ group { "efl/radio"; color: 255 255 255 64; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; required; scale: 1; clip_to: "clip"; @@ -155,8 +155,8 @@ group { "efl/radio"; } description { state: "visible" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -165,8 +165,8 @@ group { "efl/radio"; } description { state: "icononly" 0.0; inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "content"; + rel2.to: "content"; text { min: 1 1; ellipsis: -1; @@ -174,13 +174,13 @@ group { "efl/radio"; } } } - part { name: "elm.text"; type: TEXT; mouse_events: 0; + part { name: "text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; required; description { state: "default" 0.0; rel1.offset: 2 2; - rel1.to_x: "elm.swallow.content"; + rel1.to_x: "content"; rel1.relative: 1.0 0.0; rel2.offset: -3 -3; color: FN_COL_DEFAULT; @@ -237,7 +237,7 @@ group { "efl/radio"; target: "indicator"; } program { - signal: "elm,state,elm.text,set"; source: "elm"; + signal: "state,text,set"; source: "efl"; script { new m = get_int(btmode); m |= LABEL; set_int(btmode, m); @@ -245,7 +245,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,elm.text,unset"; source: "elm"; + signal: "state,text,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~LABEL; set_int(btmode, m); @@ -253,7 +253,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,content,set"; source: "elm"; + signal: "state,content,set"; source: "efl"; script { new m = get_int(btmode); m |= ICON; set_int(btmode, m); @@ -261,7 +261,7 @@ group { "efl/radio"; } } program { - signal: "elm,state,content,unset"; source: "elm"; + signal: "state,content,unset"; source: "efl"; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); diff --git a/data/elementary/themes/edc/efl/spin.edc b/data/elementary/themes/edc/efl/spin.edc index a794080dae..212ec8ac43 100644 --- a/data/elementary/themes/edc/efl/spin.edc +++ b/data/elementary/themes/edc/efl/spin.edc @@ -6,7 +6,7 @@ group { "efl/spin"; color: 0 0 0 0; } } - text { "elm.text"; + text { "text"; nomouse; scale; desc { "default"; diff --git a/data/elementary/themes/edc/efl/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc index 4d502e3779..e4120fb30c 100644 --- a/data/elementary/themes/edc/efl/spin_button.edc +++ b/data/elementary/themes/edc/efl/spin_button.edc @@ -3,7 +3,7 @@ group { "efl/spin_button"; parts { rect { "clip"; desc { "default"; - rel.to: "elm.swallow.text_button"; + rel.to: "text_button"; } } rect { "bg"; @@ -36,12 +36,12 @@ group { "efl/spin_button"; vis; } } - swallow { "elm.swallow.entry"; + swallow { "entry"; clip: "clip"; desc { "default"; fixed: 1 1; - rel1.to: "elm.swallow.text_button"; - rel2.to: "elm.swallow.text_button"; + rel1.to: "text_button"; + rel2.to: "text_button"; hid; } desc { "active"; @@ -49,7 +49,7 @@ group { "efl/spin_button"; vis; } } - swallow { "elm.swallow.dec_button"; + swallow { "dec_button"; scale; desc { "default"; fixed: 1 0; @@ -63,7 +63,7 @@ group { "efl/spin_button"; aspect: 1.0 1.0; aspect_preference: VERTICAL; } } - swallow { "elm.swallow.inc_button"; + swallow { "inc_button"; scale; desc { "default"; fixed: 1 0; @@ -77,16 +77,16 @@ group { "efl/spin_button"; aspect: 1.0 1.0; aspect_preference: VERTICAL; } } - swallow { "elm.swallow.text_button"; + swallow { "text_button"; scale; desc { "default"; vis; rel1.to_y: "inset"; - rel1.to_x: "elm.swallow.dec_button"; + rel1.to_x: "dec_button"; rel1.relative: 1.0 0.0; rel1.offset: 1 1; rel2.to_y: "inset"; - rel2.to_x: "elm.swallow.inc_button"; + rel2.to_x: "inc_button"; rel2.relative: 0.0 1.0; rel2.offset: -2 -2; } @@ -113,25 +113,25 @@ group { "efl/spin_button"; signal: "elm,state,entry,active"; source: "elm"; action: STATE_SET "active"; - target: "elm.swallow.entry"; + target: "entry"; } program { "entry_inactive"; signal: "elm,state,entry,inactive"; source: "elm"; action: STATE_SET "default"; - target: "elm.swallow.entry"; + target: "entry"; } program { "text_button_active"; signal: "elm,state,button,active"; source: "elm"; action: STATE_SET "default"; - target: "elm.swallow.text_button"; + target: "text_button"; } program { "text_button_inactive"; signal: "elm,state,button,inactive"; source: "elm"; action: STATE_SET "inactive"; - target: "elm.swallow.text_button"; + target: "text_button"; } program { "access_activate"; signal: "elm,state,access,active"; @@ -163,7 +163,7 @@ group { "efl/spin_button"; group { "efl/spin_button:vertical"; inherit: "efl/spin_button"; parts { - swallow { "elm.swallow.inc_button"; + swallow { "inc_button"; scale; desc { "default"; rel1.to: "inset"; @@ -174,16 +174,16 @@ group { "efl/spin_button:vertical"; align: 1.0 0.5; } } - swallow { "elm.swallow.text_button"; + swallow { "text_button"; scale; desc { "default"; vis; rel1.to_y: "inset"; - rel1.to_x: "elm.swallow.dec_button"; + rel1.to_x: "dec_button"; rel1.relative: 1.0 0.0; rel1.offset: 1 1; rel2.to_y: "inset"; - rel2.to_x: "elm.swallow.inc_button"; + rel2.to_x: "inc_button"; rel2.relative: 0.0 1.0; rel2.offset: -2 -2; } @@ -192,7 +192,7 @@ group { "efl/spin_button:vertical"; hid; } } - swallow { "elm.swallow.dec_button"; + swallow { "dec_button"; scale; desc { "default"; rel1.to: "inset"; @@ -206,304 +206,304 @@ group { "efl/spin_button:vertical"; } } -group { name: "efl/spin_button/inc_button"; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "sym_right_dark_normal.png" COMP; - script { - public mouse_down = 0; - public multi_down = 0; - } - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - color_class: "F032L1"; - image.normal: "sym_right_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_right_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_right_dark_normal.png"; - } +group { "efl/spin_button/inc_button"; + images.image: "sym_right_light_normal.png" COMP; + images.image: "sym_right_glow_normal.png" COMP; + images.image: "sym_right_dark_normal.png" COMP; + script { + public mouse_down = 0; + public multi_down = 0; + } + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + min: 15 15; + max: 15 15; + color_class: "F032L1"; + image.normal: "sym_right_light_normal.png"; } - part { name: "over"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + image.normal: "sym_right_glow_normal.png"; } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + image.normal: "sym_right_dark_normal.png"; } } - programs { - program { name: "button_press"; - signal: "mouse,down,1"; - source: "over"; - script { - if ((get_int(multi_down) == 0) && - (get_int(mouse_down) == 0)) { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press2"); - } - } - } - program { name: "button_press2"; - action: SIGNAL_EMIT "elm,action,press" ""; - after: "button_press_anim"; - } - program { name: "button_press_anim"; - action: STATE_SET "pressed" 0.0; - target: "arrow.image"; - } - program { name: "button_unpress"; - signal: "mouse,up,1"; - source: "over"; - script { - if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress2"); - run_program(PROGRAM:"button_unpress_anim"); - } - } + part { name: "over"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; } - program { name: "button_unpress2"; - action: SIGNAL_EMIT "elm,action,unpress" ""; + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; } - program { name: "button_unpress_anim"; - action: STATE_SET "default" 0.0; - target: "arrow.image"; + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; } - program { name: "button_click"; - signal: "mouse,clicked,1"; - source: "over"; - script { - if (get_int(multi_down) == 0) { - run_program(PROGRAM:"button_click2"); - } + } + } + programs { + program { name: "button_press"; + signal: "mouse,down,1"; + source: "over"; + script { + if ((get_int(multi_down) == 0) && + (get_int(mouse_down) == 0)) { + set_int(mouse_down, 1); + run_program(PROGRAM:"button_press2"); } } - program { name: "action_unpressed"; - signal: "elm,action,unpressed"; - source: "elm"; - after: "button_unpress_anim"; - } - program { name: "action_pressed"; - signal: "elm,action,pressed"; - source: "elm"; - after: "button_press_anim"; - } - program { name: "button_click2"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { name: "access_pressed"; - signal: "elm,action,anim,activate"; - source: "elm"; - action: STATE_SET "pressed" 0.0; - target: "arrow.image"; - after: "access_pressed_anim"; - } - program { name: "access_pressed_anim"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.1; - target: "arrow.image"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "arrow.image"; - target: "disabler"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "arrow.image"; - target: "disabler"; - } - program { - name: "multi_down"; - signal: "elm,action,multi,down"; - source: "elm"; - script { - set_int(multi_down, 1); + } + program { name: "button_press2"; + action: SIGNAL_EMIT "elm,action,press" ""; + after: "button_press_anim"; + } + program { name: "button_press_anim"; + action: STATE_SET "pressed" 0.0; + target: "arrow.image"; + } + program { name: "button_unpress"; + signal: "mouse,up,1"; + source: "over"; + script { + if (get_int(mouse_down) == 1) { + set_int(mouse_down, 0); + run_program(PROGRAM:"button_unpress2"); + run_program(PROGRAM:"button_unpress_anim"); } } - program { - name: "multi_up"; - signal: "elm,action,multi,up"; - source: "elm"; - script { - set_int(multi_down, 0); + } + program { name: "button_unpress2"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + } + program { name: "button_unpress_anim"; + action: STATE_SET "default" 0.0; + target: "arrow.image"; + } + program { name: "button_click"; + signal: "mouse,clicked,1"; + source: "over"; + script { + if (get_int(multi_down) == 0) { + run_program(PROGRAM:"button_click2"); } } } + program { name: "action_unpressed"; + signal: "elm,action,unpressed"; + source: "elm"; + after: "button_unpress_anim"; + } + program { name: "action_pressed"; + signal: "elm,action,pressed"; + source: "elm"; + after: "button_press_anim"; + } + program { name: "button_click2"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "access_pressed"; + signal: "elm,action,anim,activate"; + source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "arrow.image"; + after: "access_pressed_anim"; + } + program { name: "access_pressed_anim"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.1; + target: "arrow.image"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "arrow.image"; + target: "disabler"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "arrow.image"; + target: "disabler"; + } + program { + name: "multi_down"; + signal: "elm,action,multi,down"; + source: "elm"; + script { + set_int(multi_down, 1); + } + } + program { + name: "multi_up"; + signal: "elm,action,multi,up"; + source: "elm"; + script { + set_int(multi_down, 0); + } + } } +} -group { name: "efl/spin_button/dec_button"; - inherit: "efl/spin_button/inc_button"; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_left_dark_normal.png" COMP; - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - image.normal: "sym_left_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_dark_normal.png"; - } +group { "efl/spin_button/dec_button"; + inherit: "efl/spin_button/inc_button"; + images.image: "sym_left_light_normal.png" COMP; + images.image: "sym_left_glow_normal.png" COMP; + images.image: "sym_left_dark_normal.png" COMP; + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + min: 15 15; + max: 15 15; + image.normal: "sym_left_light_normal.png"; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + image.normal: "sym_left_glow_normal.png"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + image.normal: "sym_left_dark_normal.png"; } } + } } -group { name: "efl/spin_button/text_button"; - alias: "efl/spin_button/text_button:vertical"; - parts { - part { name: "bg"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - } +group { "efl/spin_button/text_button"; + alias: "efl/spin_button/text_button:vertical"; + parts { + part { name: "bg"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; } - part { name: "elm.text"; - type: TEXT; - scale: 1; - effect: SHADOW BOTTOM; - description { state: "default" 0.0; - color: FN_COL_DEFAULT; - color_class: "spinner"; - rel1.to: "bg"; - rel2.to: "bg"; - text { font: FN; size: 10; - min: 1 1; - text_class: "spinner"; - ellipsis: -1; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0 ; - color: FN_COL_DISABLE; - color_class: "spinner_disabled"; + } + part { name: "text"; + type: TEXT; + scale: 1; + effect: SHADOW BOTTOM; + description { state: "default" 0.0; + color: FN_COL_DEFAULT; + color_class: "spinner"; + rel1.to: "bg"; + rel2.to: "bg"; + text { font: FN; size: 10; + min: 1 1; + text_class: "spinner"; + ellipsis: -1; } } - part { name: "over"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } + description { state: "disabled" 0.0; + inherit: "default" 0.0 ; + color: FN_COL_DISABLE; + color_class: "spinner_disabled"; } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } + } + part { name: "over"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; } } - programs { - program { name: "button_click"; - signal: "mouse,clicked,1"; - source: "over"; - script { - run_program(PROGRAM:"button_click2"); - } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { name: "button_click"; + signal: "mouse,clicked,1"; + source: "over"; + script { + run_program(PROGRAM:"button_click2"); } - program { name: "button_click2"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disabler"; - target: "elm.text"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disabler"; - target: "elm.text"; - } - } + } + program { name: "button_click2"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disabler"; + target: "text"; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disabler"; + target: "text"; + } + } } -group { name: "efl/spin_button/inc_button:vertical"; - inherit: "efl/spin_button/inc_button"; - images.image: "sym_up_light_normal.png" COMP; - images.image: "sym_up_glow_normal.png" COMP; - images.image: "sym_up_dark_normal.png" COMP; - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - image.normal: "sym_up_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_up_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_up_dark_normal.png"; - } - } - } +group { "efl/spin_button/inc_button:vertical"; + inherit: "efl/spin_button/inc_button"; + images.image: "sym_up_light_normal.png" COMP; + images.image: "sym_up_glow_normal.png" COMP; + images.image: "sym_up_dark_normal.png" COMP; + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + min: 15 15; + max: 15 15; + image.normal: "sym_up_light_normal.png"; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + image.normal: "sym_up_glow_normal.png"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + image.normal: "sym_up_dark_normal.png"; + } + } + } } -group { name: "efl/spin_button/dec_button:vertical"; - inherit: "efl/spin_button/dec_button"; - images.image: "sym_down_light_normal.png" COMP; - images.image: "sym_down_glow_normal.png" COMP; - images.image: "sym_down_dark_normal.png" COMP; - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - image.normal: "sym_down_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_down_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_down_dark_normal.png"; - } +group { "efl/spin_button/dec_button:vertical"; + inherit: "efl/spin_button/dec_button"; + images.image: "sym_down_light_normal.png" COMP; + images.image: "sym_down_glow_normal.png" COMP; + images.image: "sym_down_dark_normal.png" COMP; + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + min: 15 15; + max: 15 15; + image.normal: "sym_down_light_normal.png"; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + image.normal: "sym_down_glow_normal.png"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + image.normal: "sym_down_dark_normal.png"; } } } +}
\ No newline at end of file diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc index 8f8e4c30d3..6c223ca049 100644 --- a/data/elementary/themes/edc/efl/text.edc +++ b/data/elementary/themes/edc/efl/text.edc @@ -2,7 +2,7 @@ group { "efl/text/scroller"; inherit: "efl/scroller"; image: "bg_glow_in.png" COMP; parts { - part { name: "elm.swallow.background"; type: SWALLOW; + part { name: "background"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; rel1.offset: 1 1; @@ -28,17 +28,17 @@ group { "efl/text/scroller"; color: DARK_GREY_BG_COLOR; } } - part { name: "elm.swallow.content"; + part { name: "content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; + rel1.to: "icon"; rel1.relative: 1.0 0.0; rel1.offset: 0 0; - rel2.to: "elm.swallow.end"; + rel2.to: "end"; rel2.relative: 0.0 1.0; rel2.offset: -1 -1; } } - part { name: "elm.swallow.icon"; type: SWALLOW; + part { name: "icon"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; @@ -59,14 +59,14 @@ group { "efl/text/scroller"; program { signal: "elm,action,show,icon"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "icon"; } program { signal: "elm,action,hide,icon"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "icon"; } - part { name: "elm.swallow.end"; type: SWALLOW; + part { name: "end"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; @@ -87,12 +87,12 @@ group { "efl/text/scroller"; program { signal: "elm,action,show,end"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.end"; + target: "end"; } program { signal: "elm,action,hide,end"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.end"; + target: "end"; } part { name: "glow"; insert_after: "shadow"; @@ -182,7 +182,7 @@ group { "efl/text/single/scroller"; visible: 0; } } - part { name: "elm.dragable.vbar"; type: RECT; + part { name: "dragable.vbar"; type: RECT; dragable.x: 0 0 0; dragable.y: 1 1 0; dragable.confine: "sb_vbar_base"; @@ -202,7 +202,7 @@ group { "efl/text/single/scroller"; visible: 0; } } - part { name: "elm.dragable.hbar"; type: RECT; + part { name: "dragable.hbar"; type: RECT; dragable.x: 1 1 0; dragable.y: 0 0 0; dragable.confine: "sb_hbar_base"; @@ -217,35 +217,35 @@ group { "efl/text/single/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: DARK_GREY_BG_COLOR; color_class: "scroller_bg"; } } 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; rel2.offset: -2 -2; } } - part { name: "elm.swallow.content"; type: SWALLOW; + part { name: "content"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; + rel1.to: "icon"; rel1.relative: 1.0 0.0; - rel2.to: "elm.swallow.end"; + rel2.to: "end"; rel2.relative: 0.0 1.0; } } - part { name: "elm.swallow.icon"; type: SWALLOW; + part { name: "icon"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; @@ -264,14 +264,14 @@ group { "efl/text/single/scroller"; program { signal: "elm,action,show,icon"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "icon"; } program { signal: "elm,action,hide,icon"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "icon"; } - part { name: "elm.swallow.end"; type: SWALLOW; + part { name: "end"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; fixed: 1 1; @@ -290,12 +290,12 @@ group { "efl/text/single/scroller"; program { signal: "elm,action,show,end"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.end"; + target: "end"; } program { signal: "elm,action,hide,end"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.end"; + target: "end"; } part { name: "inset"; mouse_events: 0; description { state: "default" 0.0; @@ -320,7 +320,7 @@ group { "efl/text/single/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.offset: 1 1; @@ -422,17 +422,17 @@ group { "efl/text/cursor"; } programs { program { - signal: "selection,changed"; source: "elm.text"; + signal: "selection,changed"; source: "text"; action: STATE_SET "hidden" 0.0; target: "clipper"; } program { - signal: "selection,cleared"; source: "elm.text"; + signal: "selection,cleared"; source: "text"; action: STATE_SET "default" 0.0; target: "clipper"; } program { - signal: "selection,reset"; source: "elm.text"; + signal: "selection,reset"; source: "text"; action: STATE_SET "default" 0.0; target: "clipper"; } @@ -541,17 +541,17 @@ group { "efl/text"; } } parts { - part { name: "elm.swallow.background"; type: SWALLOW; + part { name: "background"; type: SWALLOW; description { state: "default" 0.0; rel1.offset: 1 1; rel2.offset: -2 -2; } } - part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0; + part { name: "guide"; type: TEXTBLOCK; mouse_events: 0; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; + rel1.to: "text"; + rel2.to: "text"; text { style: "efl_ui_text_guide_style"; min: 0 1; align: 0.0 0.0; @@ -562,7 +562,7 @@ group { "efl/text"; visible: 0; } } - part { name: "elm.text"; type: SWALLOW; + part { name: "text"; type: SWALLOW; scale: 1; description { state: "default" 0.0; /* we gotta use 0 0 here, because of scrolled entries */ @@ -579,32 +579,32 @@ group { "efl/text"; program { signal: "load"; source: ""; action: FOCUS_SET; - target: "elm.text"; + target: "text"; } program { signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.0; - target: "elm.text"; + target: "text"; } program { signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.text"; + target: "text"; } #if 0 program { signal: "elm,guide,disabled"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "elm.guide"; + target: "guide"; } program { signal: "elm,guide,enabled"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.guide"; + target: "guide"; } #endif program { name: "key-down"; - signal: "entry,keydown"; source: "elm.text"; + signal: "entry,keydown"; source: "text"; script { new buf[32]; snprintf(buf, 31, "key-down%i", (rand() % 5) + 1); @@ -645,7 +645,7 @@ group { "efl/text/magnifier"; visible: 0; } } - part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0; + part { name: "content"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; rel1.offset: 10 10; rel1.to: "over"; @@ -677,14 +677,14 @@ group { "efl/text/magnifier"; program { name: "magnifier_show"; signal: "elm,action,show,magnifier"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; + target: "content"; target: "bg"; target: "over"; } program { name: "magnifier_hide"; signal: "elm,action,hide,magnifier"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "elm.swallow.content"; + target: "content"; target: "bg"; target: "over"; } @@ -913,4 +913,4 @@ group { "efl/text/emoticon/worried"; images.image: group { "efl/text/emoticon/wtf"; images.image: "emo-wtf.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal: "emo-wtf.png"; } } } } -//------------------------------------------------------------ +//------------------------------------------------------------
\ No newline at end of file diff --git a/data/elementary/themes/edc/efl/textpath.edc b/data/elementary/themes/edc/efl/textpath.edc index dd597a55ac..d4caf3faf0 100644 --- a/data/elementary/themes/edc/efl/textpath.edc +++ b/data/elementary/themes/edc/efl/textpath.edc @@ -8,7 +8,7 @@ group { name: "efl/textpath"; } } parts { - part { name: "elm.text"; + part { name: "text"; type: TEXTBLOCK; scale: 1; description { state: "default" 0.0; diff --git a/data/elementary/themes/edc/efl/uiclock.edc b/data/elementary/themes/edc/efl/uiclock.edc index ac37fdc793..942b7f2a15 100644 --- a/data/elementary/themes/edc/efl/uiclock.edc +++ b/data/elementary/themes/edc/efl/uiclock.edc @@ -182,7 +182,7 @@ group { "efl/uiclock"; vis; } } - rect { "elm.access"; + rect { "access"; repeat; desc { "default"; color: 0 0 0 0; diff --git a/data/elementary/themes/edc/efl/video.edc b/data/elementary/themes/edc/efl/video.edc index 1f943a8096..ac92ec97c9 100644 --- a/data/elementary/themes/edc/efl/video.edc +++ b/data/elementary/themes/edc/efl/video.edc @@ -8,7 +8,7 @@ group { name: "efl/video"; color: 128 128 128 255; } } - part { name: "elm.swallow.video"; type: SWALLOW; mouse_events: 1; + part { name: "video"; type: SWALLOW; mouse_events: 1; clip_to: "clipper"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; diff --git a/data/elementary/themes/edc/efl/win.edc b/data/elementary/themes/edc/efl/win.edc index c217f62b16..cdb0d9ecf5 100644 --- a/data/elementary/themes/edc/efl/win.edc +++ b/data/elementary/themes/edc/efl/win.edc @@ -1,8 +1,8 @@ -group { name: "efl/win"; +group { "efl/win"; data.item: "version" "119"; parts { rect { "client_clip"; nomouse; } - swallow { "elm.swallow.menu"; + swallow { "menu"; clip_to: "client_clip"; desc { "default"; rel2.relative: 1 0; @@ -17,12 +17,12 @@ group { name: "efl/win"; vis; } } - swallow { "elm.swallow.contents"; + swallow { "contents"; clip_to: "client_clip"; desc { "default"; } desc { "with_menu"; - rel1.to: "elm.swallow.menu"; + rel1.to: "menu"; rel1.relative: 0 1; link.base: "elm,action,show_menu" "elm"; } diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c index 09f07b1e63..725a365192 100644 --- a/src/lib/elementary/efl_ui_bg_widget.c +++ b/src/lib/elementary/efl_ui_bg_widget.c @@ -38,13 +38,26 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd) elm_widget_theme_style_get(obj))) CRI("Failed to set layout!"); - pd->rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, obj, - efl_gfx_color_set(efl_added, 0, 0, 0, 0), - efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added)); + if (elm_widget_is_legacy(obj)) + { + pd->rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, obj, + efl_gfx_color_set(efl_added, 0, 0, 0, 0), + efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added)); - pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj, - efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE), - efl_content_set(efl_part(obj, "elm.swallow.background"), efl_added)); + pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj, + efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE), + efl_content_set(efl_part(obj, "elm.swallow.background"), efl_added)); + } + else + { + pd->rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, obj, + efl_gfx_color_set(efl_added, 0, 0, 0, 0), + efl_content_set(efl_part(obj, "rectangle"), efl_added)); + + pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj, + efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE), + efl_content_set(efl_part(obj, "bg"), efl_added)); + } pd->file = NULL; pd->key = NULL; diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index ba24914836..931372ae00 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -40,6 +40,12 @@ 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 Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); static const Elm_Action key_actions[] = { @@ -329,8 +335,21 @@ _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) -ELM_PART_CONTENT_DEFAULT_GET(efl_ui_button, _content_aliases[0].real_part) +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)) + return "elm.swallow.content"; + else + return "content"; +} ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) EAPI void @@ -372,11 +391,14 @@ 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_calendar.c b/src/lib/elementary/efl_ui_calendar.c index 60f6730083..d3a63ac68b 100644 --- a/src/lib/elementary/efl_ui_calendar.c +++ b/src/lib/elementary/efl_ui_calendar.c @@ -16,10 +16,10 @@ #define MY_CLASS_NAME "Efl.Ui.Calendar" #define MY_CLASS_PFX efl_ui_calendar -#define EFL_UI_CALENDAR_BUTTON_LEFT "elm,calendar,button,left" -#define EFL_UI_CALENDAR_BUTTON_RIGHT "elm,calendar,button,right" -#define EFL_UI_CALENDAR_BUTTON_YEAR_LEFT "elm,calendar,button_year,left" -#define EFL_UI_CALENDAR_BUTTON_YEAR_RIGHT "elm,calendar,button_year,right" +#define EFL_UI_CALENDAR_BUTTON_LEFT "calendar,button,left" +#define EFL_UI_CALENDAR_BUTTON_RIGHT "calendar,button,right" +#define EFL_UI_CALENDAR_BUTTON_YEAR_LEFT "calendar,button_year,left" +#define EFL_UI_CALENDAR_BUTTON_YEAR_RIGHT "calendar,button_year,right" static const char PART_NAME_DEC_BUTTON[] = "dec_button"; static const char PART_NAME_INC_BUTTON[] = "inc_button"; diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index dcde1a6830..4614419705 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -402,8 +402,13 @@ _icon_signal_emit(Evas_Object *obj) char buf[64]; if (!elm_widget_resize_object_get(obj)) return; - snprintf(buf, sizeof(buf), "elm,state,icon,%s", - elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); + + 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"); elm_layout_signal_emit(obj, buf, "elm"); edje_object_message_signal_process(wd->resize_obj); diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 1d0755ce93..eaf0a4f2aa 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -38,6 +38,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; +static const char efl_ui_default_text[] = "text"; +static const char efl_ui_default_content[] = "content"; + static const Elm_Layout_Part_Alias_Description _text_aliases[] = { {"default", "elm.text"}, @@ -168,13 +171,14 @@ _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), "elm,state,%s,%s", type, + snprintf(buf, sizeof(buf), "state,%s,%s", type, set ? "set" : "unset"); + efl_layout_signal_emit(obj, buf, "efl"); } - efl_layout_signal_emit(obj, buf, "elm"); } static inline void @@ -222,10 +226,21 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd, //FIXME: Don't limit to "elm.text" prefix. //Send signals for all text parts after elm 2.0 - if ((sub_d->type != TEXT) || - (!((!strcmp("elm.text", sub_d->part)) || - (!strncmp("elm.text.", sub_d->part, 9))))) - return; + + if (sub_d->type != TEXT) + { + 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)))) + { + return; + } + } ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd); @@ -509,6 +524,15 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj, { const Elm_Layout_Part_Alias_Description *aliases = NULL; + if (!elm_widget_is_legacy(obj)) + { + if (is_text) + *part = efl_ui_default_text; + else + *part = efl_ui_default_content; + return EINA_TRUE; + } + if (is_text) aliases = elm_layout_text_aliases_get(obj); else diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index 1888cf1dc4..43e17e4cd9 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -446,15 +446,31 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN sd->event = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_color_set(sd->event, 0, 0, 0, 0); evas_object_pass_events_set(sd->event, EINA_TRUE); - if (edje_object_part_exists - (wd->resize_obj, "elm.swallow.event")) + + if (elm_widget_is_legacy(obj)) { - Evas_Coord minw = 0, minh = 0; + if (edje_object_part_exists + (wd->resize_obj, "elm.swallow.event")) + { + Evas_Coord minw = 0, minh = 0; - elm_coords_finger_size_adjust(1, &minw, 1, &minh); - evas_object_size_hint_min_set(sd->event, minw, minh); - elm_layout_content_set(obj, "elm.swallow.event", sd->event); + elm_coords_finger_size_adjust(1, &minw, 1, &minh); + evas_object_size_hint_min_set(sd->event, minw, minh); + elm_layout_content_set(obj, "elm.swallow.event", sd->event); + } } + else + { + if (edje_object_part_exists + (wd->resize_obj, "event")) + { + Evas_Coord minw = 0, minh = 0; + + elm_coords_finger_size_adjust(1, &minw, 1, &minh); + evas_object_size_hint_min_set(sd->event, minw, minh); + elm_layout_content_set(obj, "event", sd->event); + } + } elm_widget_sub_object_add(obj, sd->event); elm_layout_sizing_eval(obj); @@ -476,7 +492,10 @@ _efl_ui_panes_split_ratio_get(const Eo *obj, Efl_Ui_Panes_Data *sd) double w, h; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0.0); - edje_object_part_drag_value_get(wd->resize_obj, "elm.bar", &w, &h); + if (elm_widget_is_legacy(obj)) + edje_object_part_drag_value_get(wd->resize_obj, "elm.bar", &w, &h); + else + edje_object_part_drag_value_get(wd->resize_obj, "bar", &w, &h); if (sd->dir == EFL_UI_DIR_HORIZONTAL) return h; @@ -492,9 +511,19 @@ _efl_ui_panes_split_ratio_set(Eo *obj, Efl_Ui_Panes_Data *sd, double ratio) else if (ratio > 1.0) ratio = 1.0; if (sd->dir == EFL_UI_DIR_HORIZONTAL) - edje_object_part_drag_value_set(wd->resize_obj, "elm.bar", 0.0, ratio); + { + if (elm_widget_is_legacy(obj)) + edje_object_part_drag_value_set(wd->resize_obj, "elm.bar", 0.0, ratio); + else + edje_object_part_drag_value_set(wd->resize_obj, "bar", 0.0, ratio); + } else - edje_object_part_drag_value_set(wd->resize_obj, "elm.bar", ratio, 0.0); + { + if (elm_widget_is_legacy(obj)) + edje_object_part_drag_value_set(wd->resize_obj, "elm.bar", ratio, 0.0); + else + edje_object_part_drag_value_set(wd->resize_obj, "bar", ratio, 0.0); + } } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c index f9c65315d4..e28f81dabe 100644 --- a/src/lib/elementary/efl_ui_popup.c +++ b/src/lib/elementary/efl_ui_popup.c @@ -318,7 +318,7 @@ _efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd) /* Standard widget overrides */ -ELM_PART_CONTENT_DEFAULT_GET(efl_ui_popup, "elm.swallow.content") +ELM_PART_CONTENT_DEFAULT_GET(efl_ui_popup, "content") ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data) EOLIAN static Eo * @@ -364,7 +364,7 @@ _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, "elm.swallow.image"); + Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "image"); if (prev_obj) { edje_object_part_unswallow(sd->backwall, prev_obj); @@ -379,7 +379,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char efl_del(image); return EINA_FALSE; } - edje_object_part_swallow(sd->backwall, "elm.swallow.image", image); + edje_object_part_swallow(sd->backwall, "image", image); edje_object_signal_emit(sd->backwall, "elm,state,image,visible", "elm"); return EINA_TRUE; diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c index 25ba2208fe..7de2f49eab 100644 --- a/src/lib/elementary/efl_ui_popup_alert.c +++ b/src/lib/elementary/efl_ui_popup_alert.c @@ -19,14 +19,14 @@ static const char PART_NAME_BUTTON_LAYOUT[EFL_UI_POPUP_ALERT_BUTTON_COUNT][15] = "button_layout3"}; static const char BUTTON_SWALLOW_NAME[EFL_UI_POPUP_ALERT_BUTTON_COUNT][20] = - {"elm.swallow.button1", - "elm.swallow.button2", - "elm.swallow.button3"}; + {"button1", + "button2", + "button3"}; static Eina_Bool _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *part, const char *label) { - if (eina_streq(part, "title") || eina_streq(part, "elm.text.title")) + if (eina_streq(part, "title") || eina_streq(part, "text.title")) { Eina_Bool changed = eina_stringshare_replace(&pd->title_text, label); if (changed) @@ -51,7 +51,7 @@ _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *p const char * _efl_ui_popup_alert_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Alert_Data *pd, const char *part) { - if (eina_streq(part, "title") || eina_streq(part, "elm.text.title")) + if (eina_streq(part, "title") || eina_streq(part, "text.title")) { if (pd->title_text) return pd->title_text; @@ -199,7 +199,7 @@ _efl_ui_popup_alert_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Alert_Data *pd) static Eina_Bool _part_is_efl_ui_popup_alert_part(const Eo *obj EINA_UNUSED, const char *part) { - return (eina_streq(part, "title") || eina_streq(part, "elm.text.title")); + return (eina_streq(part, "title") || eina_streq(part, "text.title")); } /* Efl.Part begin */ diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll.c b/src/lib/elementary/efl_ui_popup_alert_scroll.c index 2d3ad1acaa..81b1bf931e 100644 --- a/src/lib/elementary/efl_ui_popup_alert_scroll.c +++ b/src/lib/elementary/efl_ui_popup_alert_scroll.c @@ -154,7 +154,7 @@ static Eina_Bool _efl_ui_popup_alert_scroll_content_set(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd, const char *part, Eo *content) { //For efl_content_set() - if (part && !strcmp(part, "elm.swallow.content")) + if (part && !strcmp(part, "content")) { pd->content = content; @@ -176,7 +176,7 @@ Eo * _efl_ui_popup_alert_scroll_content_get(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd, const char *part) { //For efl_content_set() - if (part && !strcmp(part, "elm.swallow.content")) + if (part && !strcmp(part, "content")) return pd->content; return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part)); @@ -186,7 +186,7 @@ static Eo * _efl_ui_popup_alert_scroll_content_unset(Eo *obj, Efl_Ui_Popup_Alert_Scroll_Data *pd, const char *part) { //For efl_content_set() - if (part && !strcmp(part, "elm.swallow.content")) + if (part && !strcmp(part, "content")) { Eo *content = pd->content; if (!content) return content; @@ -273,7 +273,7 @@ _efl_ui_popup_alert_scroll_efl_object_constructor(Eo *obj, elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_AUTO); - efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.content"), + efl_content_set(efl_part(efl_super(obj, MY_CLASS), "content"), pd->scroller); pd->size = EINA_SIZE2D(0, 0); diff --git a/src/lib/elementary/efl_ui_popup_alert_text.c b/src/lib/elementary/efl_ui_popup_alert_text.c index dabb29022f..18345c50dd 100644 --- a/src/lib/elementary/efl_ui_popup_alert_text.c +++ b/src/lib/elementary/efl_ui_popup_alert_text.c @@ -189,7 +189,7 @@ _efl_ui_popup_alert_text_content_unset(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd static Eina_Bool _efl_ui_popup_alert_text_text_set(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, const char *part, const char *label) { - if (part && !strcmp(part, "elm.text")) + if (part && !strcmp(part, "text")) { if (!pd->message) { @@ -212,7 +212,7 @@ _efl_ui_popup_alert_text_text_set(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, con const char * _efl_ui_popup_alert_text_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Popup_Alert_Text_Data *pd, const char *part) { - if (part && !strcmp(part, "elm.text")) + if (part && !strcmp(part, "text")) { if (pd->message) return elm_object_text_get(pd->message); @@ -226,13 +226,13 @@ _efl_ui_popup_alert_text_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Popup_Alert_ EOLIAN static void _efl_ui_popup_alert_text_efl_text_text_set(Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd, const char *label) { - _efl_ui_popup_alert_text_text_set(obj, pd, "elm.text", label); + _efl_ui_popup_alert_text_text_set(obj, pd, "text", label); } EOLIAN static const char* _efl_ui_popup_alert_text_efl_text_text_get(const Eo *obj, Efl_Ui_Popup_Alert_Text_Data *pd) { - return _efl_ui_popup_alert_text_text_get(obj, pd, "elm.text"); + return _efl_ui_popup_alert_text_text_get(obj, pd, "text"); } static void @@ -279,7 +279,7 @@ _efl_ui_popup_alert_text_efl_object_constructor(Eo *obj, elm_scroller_policy_set(pd->scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); - efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.content"), + efl_content_set(efl_part(efl_super(obj, MY_CLASS), "content"), pd->scroller); pd->size = EINA_SIZE2D(0, 0); diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index d92e79d1ca..b335702de4 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -42,6 +42,12 @@ 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) { @@ -111,12 +117,21 @@ _units_set(Evas_Object *obj) eina_strbuf_reset(sd->format_strbuf); sd->format_cb(sd->format_cb_data, sd->format_strbuf, val); - elm_layout_text_set(obj, "elm.text.status", eina_strbuf_string_get(sd->format_strbuf)); + + if (elm_widget_is_legacy(obj)) + elm_layout_text_set(obj, "elm.text.status", eina_strbuf_string_get(sd->format_strbuf)); + else + elm_layout_text_set(obj, "text.status", eina_strbuf_string_get(sd->format_strbuf)); eina_value_flush(&val); } else - elm_layout_text_set(obj, "elm.text.status", NULL); + { + if (elm_widget_is_legacy(obj)) + elm_layout_text_set(obj, "elm.text.status", NULL); + else + elm_layout_text_set(obj, "text.status", NULL); + } } static void @@ -291,7 +306,12 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) Eina_Strbuf *buf; buf = eina_strbuf_new(); - const char *txt = elm_layout_text_get(obj, "elm.text.status"); + const char *txt; + if (elm_widget_is_legacy(obj)) + txt = elm_layout_text_get(obj, "elm.text.status"); + else + txt = elm_layout_text_get(obj, "text.status"); + if (txt) eina_strbuf_append(buf, txt); if (elm_widget_disabled_get(obj)) @@ -338,7 +358,10 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data evas_object_color_set(priv->spacer, 0, 0, 0, 0); evas_object_pass_events_set(priv->spacer, EINA_TRUE); - elm_layout_content_set(obj, "elm.swallow.bar", priv->spacer); + if (elm_widget_is_legacy(obj)) + elm_layout_content_set(obj, "elm.swallow.bar", priv->spacer); + else + elm_layout_content_set(obj, "bar", priv->spacer); _units_set(obj); _val_set(obj); @@ -454,7 +477,7 @@ _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")) + if (!strcmp(part_name, "elm.cur.progressbar") || !strcmp(part_name, "cur.progressbar")) { sd->val_min = min; sd->val_max = max; @@ -493,7 +516,7 @@ _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")) + if (!strcmp(part_name, "elm.cur.progressbar") || !strcmp(part_name, "cur.progressbar")) sd->val = val; EINA_LIST_FOREACH(sd->progress_status, l, ps) @@ -541,13 +564,19 @@ _efl_ui_progressbar_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Progressbar_Dat { if (EINA_DBL_EQ(sd->val, val)) return; - _progressbar_part_value_set(obj, sd, "elm.cur.progressbar", val); + if (elm_widget_is_legacy(obj)) + _progressbar_part_value_set(obj, sd, "elm.cur.progressbar", val); + else + _progressbar_part_value_set(obj, sd, "cur.progressbar", val); } EOLIAN static double _efl_ui_progressbar_efl_ui_range_range_value_get(const Eo *obj, Efl_Ui_Progressbar_Data *sd EINA_UNUSED) { - return efl_ui_range_value_get(efl_part(obj, "elm.cur.progressbar")); + if (elm_widget_is_legacy(obj)) + return efl_ui_range_value_get(efl_part(obj, "elm.cur.progressbar")); + else + return efl_ui_range_value_get(efl_part(obj, "cur.progressbar")); } EOLIAN static void @@ -596,7 +625,10 @@ _efl_ui_progressbar_pulse_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data EOLIAN static void _efl_ui_progressbar_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double min, double max) { - _progress_part_min_max_set(obj, sd, "elm.cur.progressbar", min, max); + if (elm_widget_is_legacy(obj)) + _progress_part_min_max_set(obj, sd, "elm.cur.progressbar", min, max); + else + _progress_part_min_max_set(obj, sd, "cur.progressbar", min, max); } EOLIAN static void @@ -679,17 +711,33 @@ _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) -ELM_PART_CONTENT_DEFAULT_GET(efl_ui_progressbar, _content_aliases[0].real_part) +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)) + return "elm.swallow.content"; + 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 78afc19c60..2aec1bc7c2 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -375,8 +375,13 @@ _icon_signal_emit(Evas_Object *obj) edje = elm_widget_resize_object_get(obj); if (!edje) return; - snprintf(buf, sizeof(buf), "elm,state,icon,%s", - elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); + + 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"); elm_layout_signal_emit(obj, buf, "elm"); edje_object_message_signal_process(edje); diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c index c479099c6c..4519b4371c 100644 --- a/src/lib/elementary/efl_ui_spin.c +++ b/src/lib/elementary/efl_ui_spin.c @@ -95,14 +95,15 @@ _label_write(Evas_Object *obj) buf = eina_strbuf_string_get(sd->format_strbuf); eina_value_flush(&val); - elm_layout_text_set(obj, "elm.text", buf); + elm_layout_text_set(obj, "text", buf); sd->templates = buf; } else { char buf[1024]; snprintf(buf, sizeof(buf), "%.0f", sd->val); - elm_layout_text_set(obj, "elm.text", buf); + elm_layout_text_set(obj, "text", buf); + evas_object_show(obj); } } diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index 21b08a31d0..8e6ec7f744 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -365,7 +365,7 @@ _toggle_entry(Evas_Object *obj) evas_object_event_callback_add (sd->ent, EVAS_CALLBACK_SHOW, _entry_show_cb, obj); elm_entry_single_line_set(sd->ent, EINA_TRUE); - elm_layout_content_set(obj, "elm.swallow.entry", sd->ent); + elm_layout_content_set(obj, "entry", sd->ent); _entry_accept_filter_add(obj); elm_entry_markup_filter_append(sd->ent, _invalid_input_validity_filter, NULL); if (_elm_config->spinner_min_max_filter_enable) @@ -762,7 +762,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd) sd->inc_button = efl_add(EFL_UI_BUTTON_CLASS, obj, elm_widget_element_update(obj, efl_added, PART_NAME_INC_BUTTON), efl_event_callback_array_add(efl_added, _inc_dec_button_cb(), obj), - efl_content_set(efl_part(obj, "elm.swallow.inc_button"), efl_added)); + efl_content_set(efl_part(obj, "inc_button"), efl_added)); sd->text_button = efl_add(EFL_UI_BUTTON_CLASS, obj, elm_widget_element_update(obj, efl_added, PART_NAME_TEXT_BUTTON), @@ -770,12 +770,12 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd) _text_button_clicked_cb, obj), efl_event_callback_add(efl_added, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _text_button_focus_changed_cb, obj), - efl_content_set(efl_part(obj, "elm.swallow.text_button"), efl_added)); + efl_content_set(efl_part(obj, "text_button"), efl_added)); sd->dec_button = efl_add(EFL_UI_BUTTON_CLASS, obj, elm_widget_element_update(obj, efl_added, PART_NAME_DEC_BUTTON), efl_event_callback_array_add(efl_added, _inc_dec_button_cb(), obj), - efl_content_set(efl_part(obj, "elm.swallow.dec_button"), efl_added)); + efl_content_set(efl_part(obj, "dec_button"), efl_added)); { Eina_List *items = NULL; @@ -888,7 +888,7 @@ _efl_ui_spin_button_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_D const char *name; name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); if (name) return name; - const char *ret = elm_layout_text_get(obj, "elm.text"); + const char *ret = elm_layout_text_get(obj, "text"); return ret; } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 1b784f5b7c..157a152b9c 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -461,7 +461,7 @@ _validate(Evas_Object *obj) if (sd->validators == 0) return; - vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); + vc.text = edje_object_part_text_get(sd->entry_edje, "text"); res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); buf = eina_strbuf_new(); eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass"); @@ -667,7 +667,7 @@ _edje_entry_user_insert(Evas_Object *obj, const char *data) EFL_UI_TEXT_DATA_GET(obj, sd); sd->changed = EINA_TRUE; - edje_object_part_text_user_insert(sd->entry_edje, "elm.text", data); + edje_object_part_text_user_insert(sd->entry_edje, "text", data); elm_layout_sizing_eval(obj); } @@ -756,10 +756,10 @@ _dnd_pos_cb(void *data EINA_UNUSED, y = y + oy - ey; edje_object_part_text_cursor_coord_set - (sd->entry_edje, "elm.text", EDJE_CURSOR_USER, x, y); + (sd->entry_edje, "text", EDJE_CURSOR_USER, x, y); pos = edje_object_part_text_cursor_pos_get - (sd->entry_edje, "elm.text", EDJE_CURSOR_USER); - edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text", + (sd->entry_edje, "text", EDJE_CURSOR_USER); + edje_object_part_text_cursor_pos_set(sd->entry_edje, "text", EDJE_CURSOR_MAIN, pos); } @@ -773,7 +773,7 @@ _dnd_drop_cb(void *data EINA_UNUSED, EFL_UI_TEXT_DATA_GET(obj, sd); rv = edje_object_part_text_cursor_coord_set - (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN, drop->x, drop->y); + (sd->entry_edje, "text", EDJE_CURSOR_MAIN, drop->x, drop->y); if (!rv) WRN("Warning: Failed to position cursor: paste anyway"); @@ -837,16 +837,16 @@ _efl_ui_text_background_switch(Evas_Object *from_edje, Evas_Object *to_edje) if (!from_edje || !to_edje) return; - if (edje_object_part_exists(from_edje, "elm.swallow.background") && - edje_object_part_exists(to_edje, "elm.swallow.background") && - !edje_object_part_swallow_get(to_edje, "elm.swallow.background")) + if (edje_object_part_exists(from_edje, "background") && + edje_object_part_exists(to_edje, "background") && + !edje_object_part_swallow_get(to_edje, "background")) { - bg_obj = edje_object_part_swallow_get(from_edje, "elm.swallow.background"); + bg_obj = edje_object_part_swallow_get(from_edje, "background"); if (bg_obj) { edje_object_part_unswallow(from_edje, bg_obj); - edje_object_part_swallow(to_edje, "elm.swallow.background", bg_obj); + edje_object_part_swallow(to_edje, "background", bg_obj); } } } @@ -884,26 +884,26 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) edje_object_signal_emit(sd->entry_edje, "elm,state,disabled", "elm"); edje_object_part_text_input_panel_layout_set - (sd->entry_edje, "elm.text", (Edje_Input_Panel_Layout)sd->input_panel_layout); + (sd->entry_edje, "text", (Edje_Input_Panel_Layout)sd->input_panel_layout); edje_object_part_text_input_panel_layout_variation_set - (sd->entry_edje, "elm.text", sd->input_panel_layout_variation); + (sd->entry_edje, "text", sd->input_panel_layout_variation); edje_object_part_text_autocapital_type_set - (sd->entry_edje, "elm.text", (Edje_Text_Autocapital_Type)sd->autocapital_type); + (sd->entry_edje, "text", (Edje_Text_Autocapital_Type)sd->autocapital_type); edje_object_part_text_prediction_allow_set - (sd->entry_edje, "elm.text", sd->prediction_allow); + (sd->entry_edje, "text", sd->prediction_allow); edje_object_part_text_input_hint_set - (sd->entry_edje, "elm.text", (Edje_Input_Hints)sd->input_hints); + (sd->entry_edje, "text", (Edje_Input_Hints)sd->input_hints); edje_object_part_text_input_panel_enabled_set - (sd->entry_edje, "elm.text", sd->input_panel_enable); + (sd->entry_edje, "text", sd->input_panel_enable); edje_object_part_text_input_panel_imdata_set - (sd->entry_edje, "elm.text", sd->input_panel_imdata, + (sd->entry_edje, "text", sd->input_panel_imdata, sd->input_panel_imdata_len); edje_object_part_text_input_panel_return_key_type_set - (sd->entry_edje, "elm.text", (Edje_Input_Panel_Return_Key_Type)sd->input_panel_return_key_type); + (sd->entry_edje, "text", (Edje_Input_Panel_Return_Key_Type)sd->input_panel_return_key_type); edje_object_part_text_input_panel_return_key_disabled_set - (sd->entry_edje, "elm.text", sd->input_panel_return_key_disabled); + (sd->entry_edje, "text", sd->input_panel_return_key_disabled); edje_object_part_text_input_panel_show_on_demand_set - (sd->entry_edje, "elm.text", sd->input_panel_show_on_demand); + (sd->entry_edje, "text", sd->input_panel_show_on_demand); // elm_entry_cursor_pos_set -> cursor,changed -> widget_show_region_set // -> smart_objects_calculate will call all smart calculate functions, @@ -991,7 +991,7 @@ _cursor_geometry_recalc(Evas_Object *obj) edje_object_size_min_restricted_calc(sd->cursor, &cw, NULL, cw, 0); evas_object_geometry_get(sd->entry_edje, &x, &y, &w, &h); evas_object_geometry_get( - edje_object_part_swallow_get(sd->entry_edje, "elm.text"), + edje_object_part_swallow_get(sd->entry_edje, "text"), &x2, &y2, &w2, &h2); cx = cx + x - x2; cy = cy + y - y2; @@ -1008,7 +1008,7 @@ _layout_text_sizing_eval(Eo *obj, Evas_Coord tw, Evas_Coord th) EFL_UI_TEXT_DATA_GET(obj, sd); - sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + sw = edje_object_part_swallow_get(sd->entry_edje, "text"); if (sd->scroll) { Evas_Coord vw = 0, vh = 0; @@ -1073,7 +1073,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd) evas_object_geometry_get(obj, NULL, NULL, &resw, &resh); - sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + sw = edje_object_part_swallow_get(sd->entry_edje, "text"); if (!sw) return; if (!sd->changed && (resw == sd->ent_w) && (resh == sd->ent_h)) return; @@ -1141,7 +1141,7 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) if (efl_ui_focus_object_focus_get(obj)) { - Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "text"); evas_object_focus_set(sw, EINA_TRUE); _edje_signal_emit(sd, "elm,action,focus", "elm"); @@ -1157,7 +1157,7 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) } else { - Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "text"); _edje_signal_emit(sd, "elm,action,unfocus", "elm"); if (sd->scroll) @@ -1175,9 +1175,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) { sd->sel_mode = EINA_FALSE; elm_widget_scroll_hold_pop(obj); - edje_object_part_text_select_allow_set(sd->entry_edje, "elm.text", EINA_FALSE); + edje_object_part_text_select_allow_set(sd->entry_edje, "text", EINA_FALSE); edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); - edje_object_part_text_select_none(sd->entry_edje, "elm.text"); + edje_object_part_text_select_none(sd->entry_edje, "text"); } } edje_object_signal_emit(sd->scr_edje, "validation,default", "elm"); @@ -1228,11 +1228,11 @@ _efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd /* unfortunately entry doesn't follow the signal pattern * elm,state,icon,{visible,hidden}, so we have to replicate this * smart function */ - if (sobj == elm_layout_content_get(obj, "elm.swallow.icon")) + if (sobj == elm_layout_content_get(obj, "icon")) { elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); } - else if (sobj == elm_layout_content_get(obj, "elm.swallow.end")) + else if (sobj == elm_layout_content_get(obj, "end")) { elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); } @@ -1262,7 +1262,7 @@ _hoversel_position(Evas_Object *obj) } else edje_object_part_text_cursor_geometry_get - (sd->entry_edje, "elm.text", &cx, &cy, &cw, &ch); + (sd->entry_edje, "text", &cx, &cy, &cw, &ch); evas_object_size_hint_min_get(sd->hoversel, &mw, &mh); if (cx + mw > w) @@ -1295,7 +1295,7 @@ _hover_dismissed_cb(void *data, const Efl_Event *event EINA_UNUSED) { if (!sd->password) edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_TRUE); + (sd->entry_edje, "text", EINA_TRUE); } } elm_widget_scroll_freeze_pop(data); @@ -1313,13 +1313,13 @@ _hover_selected_cb(void *data, if (!sd->sel_allow) return; sd->sel_mode = EINA_TRUE; - edje_object_part_text_select_none(sd->entry_edje, "elm.text"); + edje_object_part_text_select_none(sd->entry_edje, "text"); if (!_elm_config->desktop_entry) { if (!sd->password) edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_TRUE); + (sd->entry_edje, "text", EINA_TRUE); } edje_object_signal_emit(sd->entry_edje, "elm,state,select,on", "elm"); @@ -1477,7 +1477,7 @@ _cut_cb(Eo *obj) sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_FALSE); + (sd->entry_edje, "text", EINA_FALSE); edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); if (!_elm_config->desktop_entry) @@ -1506,7 +1506,7 @@ _copy_cb(Eo *obj) if (!_elm_config->desktop_entry) { edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_FALSE); + (sd->entry_edje, "text", EINA_FALSE); edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); elm_widget_scroll_hold_pop(obj); } @@ -1531,11 +1531,11 @@ _hover_cancel_cb(void *data, sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_FALSE); + (sd->entry_edje, "text", EINA_FALSE); edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); if (!_elm_config->desktop_entry) elm_widget_scroll_hold_pop(data); - edje_object_part_text_select_none(sd->entry_edje, "elm.text"); + edje_object_part_text_select_none(sd->entry_edje, "text"); } static void @@ -1660,8 +1660,8 @@ _menu_call(Evas_Object *obj) if (!_elm_config->desktop_entry) { edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_FALSE); - edje_object_part_text_select_abort(sd->entry_edje, "elm.text"); + (sd->entry_edje, "text", EINA_FALSE); + edje_object_part_text_select_abort(sd->entry_edje, "text"); } } } @@ -1698,7 +1698,7 @@ _magnifier_create(void *data) _magnifier_proxy_update, data); evas_object_event_callback_add(sd->mgf_proxy, EVAS_CALLBACK_MOVE, _magnifier_proxy_update, data); - edje_object_part_swallow(sd->mgf_bg, "elm.swallow.content", sd->mgf_proxy); + edje_object_part_swallow(sd->mgf_bg, "content", sd->mgf_proxy); evas_object_image_source_set(sd->mgf_proxy, data); evas_object_geometry_get(data, NULL, NULL, &w, &h); @@ -1731,7 +1731,7 @@ _magnifier_move(void *data) double fx, fy, fw, fh; double scale = _elm_config->magnifier_scale; - edje_object_part_text_cursor_geometry_get(sd->entry_edje, "elm.text", + edje_object_part_text_cursor_geometry_get(sd->entry_edje, "text", &cx, &cy, NULL, &ch); if (sd->scroll) { @@ -1998,12 +1998,12 @@ _mouse_move_cb(void *data, evas_object_geometry_get(sd->entry_edje, &x, &y, NULL, NULL); rv = edje_object_part_text_cursor_coord_set - (sd->entry_edje, "elm.text", EDJE_CURSOR_USER, + (sd->entry_edje, "text", EDJE_CURSOR_USER, ev->cur.canvas.x - x, ev->cur.canvas.y - y); if (rv) { edje_object_part_text_cursor_copy - (sd->entry_edje, "elm.text", EDJE_CURSOR_USER, EDJE_CURSOR_MAIN); + (sd->entry_edje, "text", EDJE_CURSOR_USER, EDJE_CURSOR_MAIN); } else WRN("Warning: Cannot move cursor"); @@ -2177,7 +2177,7 @@ _entry_cursor_changed_signal_cb(void *data, { EFL_UI_TEXT_DATA_GET(data, sd); sd->cursor_pos = edje_object_part_text_cursor_pos_get - (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); + (sd->entry_edje, "text", EDJE_CURSOR_MAIN); sd->cur_changed = EINA_TRUE; if (efl_ui_focus_object_focus_get(data)) { @@ -2215,12 +2215,12 @@ _signal_anchor_geoms_do_things_with_lol(Efl_Ui_Text_Data *sd, Evas_Coord px, py, x, y; geoms = edje_object_part_text_anchor_geometry_get - (sd->entry_edje, "elm.text", ei->name); + (sd->entry_edje, "text", ei->name); if (!geoms) return; evas_object_geometry_get( - edje_object_part_object_get(sd->entry_edje, "elm.text"), + edje_object_part_object_get(sd->entry_edje, "text"), &x, &y, NULL, NULL); evas_pointer_canvas_xy_get (evas_object_evas_get(sd->entry_edje), &px, &py); @@ -2740,7 +2740,7 @@ _start_handler_mouse_down_cb(void *data, Efl_Text_Cursor_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *main_cur; - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); sd->start_handler_down = EINA_TRUE; @@ -2829,7 +2829,7 @@ _end_handler_mouse_down_cb(void *data, sd->end_handler_down = EINA_TRUE; - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); efl_ui_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN); @@ -3050,7 +3050,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) sd->single_line = !efl_text_multiline_get(text_obj); - edje_object_part_swallow(sd->entry_edje, "elm.text", text_obj); + edje_object_part_swallow(sd->entry_edje, "text", text_obj); evas_object_size_hint_weight_set (sd->entry_edje, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set @@ -3093,7 +3093,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) elm_interface_scrollable_objects_set(obj, sd->entry_edje, sd->hit_rect); edje_object_text_markup_filter_callback_add - (sd->entry_edje, "elm.text", _markup_filter_cb, obj); + (sd->entry_edje, "text", _markup_filter_cb, obj); evas_object_event_callback_add (sd->entry_edje, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, obj); @@ -3108,56 +3108,56 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "entry,changed,user", "elm.text", + (sd->entry_edje, "entry,changed,user", "text", _entry_changed_user_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "preedit,changed", "elm.text", + (sd->entry_edje, "preedit,changed", "text", _entry_preedit_changed_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "cursor,changed", "elm.text", + (sd->entry_edje, "cursor,changed", "text", _entry_cursor_changed_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "cursor,changed,manual", "elm.text", + (sd->entry_edje, "cursor,changed,manual", "text", _entry_cursor_changed_manual_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "anchor,mouse,down,*", "elm.text", + (sd->entry_edje, "anchor,mouse,down,*", "text", _entry_anchor_down_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "anchor,mouse,up,*", "elm.text", + (sd->entry_edje, "anchor,mouse,up,*", "text", _entry_anchor_up_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "anchor,mouse,move,*", "elm.text", + (sd->entry_edje, "anchor,mouse,move,*", "text", _entry_anchor_move_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "anchor,mouse,in,*", "elm.text", + (sd->entry_edje, "anchor,mouse,in,*", "text", _entry_anchor_in_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "anchor,mouse,out,*", "elm.text", + (sd->entry_edje, "anchor,mouse,out,*", "text", _entry_anchor_out_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "entry,key,enter", "elm.text", + (sd->entry_edje, "entry,key,enter", "text", _entry_key_enter_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "entry,key,escape", "elm.text", + (sd->entry_edje, "entry,key,escape", "text", _entry_key_escape_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "mouse,down,1", "elm.text", + (sd->entry_edje, "mouse,down,1", "text", _entry_mouse_down_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "mouse,clicked,1", "elm.text", + (sd->entry_edje, "mouse,clicked,1", "text", _entry_mouse_clicked_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "mouse,down,1,double", "elm.text", + (sd->entry_edje, "mouse,down,1,double", "text", _entry_mouse_double_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "mouse,down,1,triple", "elm.text", + (sd->entry_edje, "mouse,down,1,triple", "text", _entry_mouse_triple_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "entry,undo,request", "elm.text", + (sd->entry_edje, "entry,undo,request", "text", _entry_undo_request_signal_cb, obj); edje_object_signal_callback_add - (sd->entry_edje, "entry,redo,request", "elm.text", + (sd->entry_edje, "entry,redo,request", "text", _entry_redo_request_signal_cb, obj); efl_text_set(sd->text_obj, ""); @@ -3167,7 +3167,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) elm_widget_can_focus_set(obj, EINA_TRUE); if (_elm_config->desktop_entry) edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_TRUE); + (sd->entry_edje, "text", EINA_TRUE); efl_ui_text_input_panel_layout_set(obj, ELM_INPUT_PANEL_LAYOUT_NORMAL); efl_ui_text_input_panel_enabled_set(obj, EINA_TRUE); @@ -3175,7 +3175,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) efl_ui_text_input_hint_set(obj, ELM_INPUT_HINT_AUTO_COMPLETE); sd->autocapital_type = (Elm_Autocapital_Type)edje_object_part_text_autocapital_type_get - (sd->entry_edje, "elm.text"); + (sd->entry_edje, "text"); entries = eina_list_prepend(entries, obj); @@ -3273,7 +3273,7 @@ _efl_ui_text_efl_object_destructor(Eo *obj, Efl_Ui_Text_Data *sd) _unused_item_objs_free(sd); _clear_text_selection(sd); - text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); efl_event_callback_del(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, _efl_ui_text_changed_user_cb, obj); efl_event_callback_del(text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, @@ -3425,14 +3425,14 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) edje_object_part_text_select_allow_set - (sd->entry_edje, "elm.text", EINA_FALSE); + (sd->entry_edje, "text", EINA_FALSE); edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); } if (sd->have_selection) efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); sd->have_selection = EINA_FALSE; - edje_object_part_text_select_none(sd->entry_edje, "elm.text"); + edje_object_part_text_select_none(sd->entry_edje, "text"); _hide_selection_handler(obj); } @@ -3453,7 +3453,7 @@ _efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data *sd, int start, int end EOLIAN static void _efl_ui_text_cursor_selection_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) { - edje_object_part_text_select_extend(sd->entry_edje, "elm.text"); + edje_object_part_text_select_extend(sd->entry_edje, "text"); } EOLIAN static void @@ -3692,7 +3692,7 @@ _efl_ui_text_input_panel_layout_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, E sd->input_panel_layout = layout; edje_object_part_text_input_panel_layout_set - (sd->entry_edje, "elm.text", (Edje_Input_Panel_Layout)layout); + (sd->entry_edje, "text", (Edje_Input_Panel_Layout)layout); if (layout == ELM_INPUT_PANEL_LAYOUT_PASSWORD) efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); @@ -3712,7 +3712,7 @@ _efl_ui_text_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_D sd->input_panel_layout_variation = variation; edje_object_part_text_input_panel_layout_variation_set - (sd->entry_edje, "elm.text", variation); + (sd->entry_edje, "text", variation); } EOLIAN static int @@ -3726,7 +3726,7 @@ _efl_ui_text_autocapital_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm { sd->autocapital_type = autocapital_type; edje_object_part_text_autocapital_type_set - (sd->entry_edje, "elm.text", (Edje_Text_Autocapital_Type)autocapital_type); + (sd->entry_edje, "text", (Edje_Text_Autocapital_Type)autocapital_type); } EOLIAN static Elm_Autocapital_Type @@ -3740,7 +3740,7 @@ _efl_ui_text_prediction_allow_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Ein { sd->prediction_allow = prediction; edje_object_part_text_prediction_allow_set - (sd->entry_edje, "elm.text", prediction); + (sd->entry_edje, "text", prediction); } EOLIAN static Eina_Bool @@ -3755,7 +3755,7 @@ _efl_ui_text_input_hint_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm_Input sd->input_hints = hints; edje_object_part_text_input_hint_set - (sd->entry_edje, "elm.text", (Edje_Input_Hints)hints); + (sd->entry_edje, "text", (Edje_Input_Hints)hints); } EOLIAN static Elm_Input_Hints @@ -3769,7 +3769,7 @@ _efl_ui_text_input_panel_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, { sd->input_panel_enable = enabled; edje_object_part_text_input_panel_enabled_set - (sd->entry_edje, "elm.text", enabled); + (sd->entry_edje, "text", enabled); } EOLIAN static Eina_Bool @@ -3781,14 +3781,14 @@ _efl_ui_text_input_panel_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data EOLIAN static void _efl_ui_text_input_panel_show(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) { - edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); + edje_object_part_text_input_panel_show(sd->entry_edje, "text"); } EOLIAN static void _efl_ui_text_input_panel_hide(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) { - edje_object_part_text_input_panel_hide(sd->entry_edje, "elm.text"); + edje_object_part_text_input_panel_hide(sd->entry_edje, "text"); } EOLIAN static void @@ -3796,7 +3796,7 @@ _efl_ui_text_input_panel_language_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, { sd->input_panel_lang = lang; edje_object_part_text_input_panel_language_set - (sd->entry_edje, "elm.text", (Edje_Input_Panel_Lang)lang); + (sd->entry_edje, "text", (Edje_Input_Panel_Lang)lang); } EOLIAN static Elm_Input_Panel_Lang @@ -3815,7 +3815,7 @@ _efl_ui_text_input_panel_imdata_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, c memcpy(sd->input_panel_imdata, data, len); edje_object_part_text_input_panel_imdata_set - (sd->entry_edje, "elm.text", sd->input_panel_imdata, + (sd->entry_edje, "text", sd->input_panel_imdata, sd->input_panel_imdata_len); } @@ -3823,7 +3823,7 @@ EOLIAN static void _efl_ui_text_input_panel_imdata_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, void *data, int *len) { edje_object_part_text_input_panel_imdata_get - (sd->entry_edje, "elm.text", data, len); + (sd->entry_edje, "text", data, len); } EOLIAN static void @@ -3832,7 +3832,7 @@ _efl_ui_text_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Da sd->input_panel_return_key_type = return_key_type; edje_object_part_text_input_panel_return_key_type_set - (sd->entry_edje, "elm.text", (Edje_Input_Panel_Return_Key_Type)return_key_type); + (sd->entry_edje, "text", (Edje_Input_Panel_Return_Key_Type)return_key_type); } EOLIAN static Elm_Input_Panel_Return_Key_Type @@ -3847,7 +3847,7 @@ _efl_ui_text_input_panel_return_key_disabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Tex sd->input_panel_return_key_disabled = disabled; edje_object_part_text_input_panel_return_key_disabled_set - (sd->entry_edje, "elm.text", disabled); + (sd->entry_edje, "text", disabled); } EOLIAN static Eina_Bool @@ -3869,7 +3869,7 @@ _efl_ui_text_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Dat sd->input_panel_show_on_demand = ondemand; edje_object_part_text_input_panel_show_on_demand_set - (sd->entry_edje, "elm.text", ondemand); + (sd->entry_edje, "text", ondemand); } EOLIAN static Eina_Bool @@ -3924,7 +3924,7 @@ _efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EIN { efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); if (sd->editable && sd->input_panel_enable) - edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); + edje_object_part_text_input_panel_show(sd->entry_edje, "text"); } return EINA_TRUE; } @@ -3965,7 +3965,7 @@ _efl_ui_text_efl_access_text_string_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_D { Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; char *ret = NULL; - Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "text"); cur = evas_object_textblock_cursor_new(text_obj); cur2 = evas_object_textblock_cursor_new(text_obj); @@ -4047,7 +4047,7 @@ _efl_ui_text_efl_access_text_access_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_T { Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; char *ret = NULL; - Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "text"); cur = evas_object_textblock_cursor_new(text_obj); cur2 = evas_object_textblock_cursor_new(text_obj); @@ -4143,7 +4143,7 @@ _efl_ui_text_efl_access_text_offset_at_point_get(const Eo *obj, Efl_Ui_Text_Data { Evas_Textblock_Cursor *cur; int ret; - Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "text"); if (!text_obj) return -1; @@ -4176,7 +4176,7 @@ _efl_ui_text_efl_access_text_character_extents_get(const Eo *obj, Efl_Ui_Text_Da { Evas_Textblock_Cursor *cur; int ret; - Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "text"); if (!text_obj) return EINA_FALSE; @@ -4208,7 +4208,7 @@ _efl_ui_text_efl_access_text_range_extents_get(const Eo *obj, Efl_Ui_Text_Data * Evas_Textblock_Cursor *cur1, *cur2; int ret; int x, xx, y, yy; - Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "text"); if (!text_obj) return EINA_FALSE; @@ -4415,7 +4415,7 @@ EOLIAN static Eina_Bool _efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int start_offset, int end_offset) { Evas_Textblock_Cursor *cur1, *cur2; - Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "text"); if (!text_obj) return EINA_FALSE; @@ -4477,14 +4477,14 @@ _efl_ui_text_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd) const char *name; name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (name && strncmp("", name, 1)) return name; - const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide"); + const char *ret = edje_object_part_text_get(pd->entry_edje, "guide"); return ret; } EOLIAN static Efl_Text_Cursor_Cursor * _efl_ui_text_cursor_new(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED) { - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); return efl_text_cursor_new(text_obj); } @@ -4501,7 +4501,7 @@ _decoration_create(Eo *obj, Efl_Ui_Text_Data *sd, const char *group_name, Eina_Bool above) { Eo *ret = efl_add(EFL_CANVAS_LAYOUT_CLASS, sd->entry_edje); - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); elm_widget_element_update(obj, ret, group_name); evas_object_smart_member_add(ret, sd->entry_edje); if (above) @@ -4538,7 +4538,7 @@ static void _decoration_calc_offset(Efl_Ui_Text_Data *sd, Evas_Coord *_x, Evas_Coord *_y) { Evas_Coord x, y; - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); evas_object_geometry_get(text_obj, &x, &y, NULL, NULL); @@ -4559,7 +4559,7 @@ _update_text_cursors(Eo *obj) if (!sd->deferred_decoration_cursor) return; sd->deferred_decoration_cursor = EINA_FALSE; - text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); x = y = w = h = -1; xx = yy = ww = hh = -1; @@ -4842,7 +4842,7 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd) Efl_Text_Cursor_Cursor *start, *end; Efl_Text_Annotate_Annotation *anchor; - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); _anchors_clear_all(obj, sd); start = efl_text_cursor_new(text_obj); @@ -4951,7 +4951,7 @@ _anchors_update(Eo *o, Efl_Ui_Text_Data *sd) Anchor *an; Eo *sw; - sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + sw = edje_object_part_swallow_get(sd->entry_edje, "text"); if (!sd->deferred_decoration_anchor) return; sd->deferred_decoration_anchor = EINA_FALSE; @@ -4964,7 +4964,7 @@ _anchors_update(Eo *o, Efl_Ui_Text_Data *sd) smart = evas_object_smart_parent_get(o); clip = evas_object_clip_get( - edje_object_part_swallow_get(sd->entry_edje, "elm.text")); + edje_object_part_swallow_get(sd->entry_edje, "text")); _decoration_calc_offset(sd, &x, &y); EINA_LIST_FOREACH(sd->anchors, l, an) { @@ -5132,7 +5132,7 @@ static void _update_decorations(Eo *obj) { EFL_UI_TEXT_DATA_GET(obj, sd); - Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); + Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "text"); _update_text_cursors(obj); _update_text_selection(obj, text_obj); @@ -5205,16 +5205,16 @@ _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED text = efl_canvas_text_range_text_get(obj, start, end); if (!text || (text[0] == '\0')) { - _edje_signal_emit(sd, "selection,cleared", "elm.text"); + _edje_signal_emit(sd, "selection,cleared", "text"); sd->have_selection = EINA_FALSE; } else { if (!sd->have_selection) { - _edje_signal_emit(sd, "selection,start", "elm.text"); + _edje_signal_emit(sd, "selection,start", "text"); } - _edje_signal_emit(sd, "selection,changed", "elm.text"); + _edje_signal_emit(sd, "selection,changed", "text"); sd->have_selection = EINA_TRUE; } if (text) free(text); diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index ad800b4a18..d2894d35f4 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -406,10 +406,10 @@ _sizing_eval(Efl_Ui_Textpath_Data *pd) static void _textpath_ellipsis_set(Efl_Ui_Textpath_Data *pd, Eina_Bool enabled) { - edje_object_part_text_style_user_pop(pd->text_obj, "elm.text"); + edje_object_part_text_style_user_pop(pd->text_obj, "text"); if (enabled) - edje_object_part_text_style_user_push(pd->text_obj, "elm.text", + edje_object_part_text_style_user_push(pd->text_obj, "text", "DEFAULT='ellipsis=1.0'"); } @@ -422,7 +422,7 @@ _ellipsis_set(Efl_Ui_Textpath_Data *pd) Eina_Bool is_ellipsis = EINA_FALSE; const Evas_Object *tb; - tb = edje_object_part_object_get(pd->text_obj, "elm.text"); + tb = edje_object_part_object_get(pd->text_obj, "text"); evas_object_textblock_size_native_get(tb, &w, &h); evas_object_size_hint_min_set(pd->text_obj, w, h); if (pd->ellipsis) @@ -533,13 +533,13 @@ _efl_ui_textpath_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *pd, const c EOLIAN static void _efl_ui_textpath_efl_text_text_set(Eo *obj, Efl_Ui_Textpath_Data *pd, const char *text) { - _textpath_text_set_internal(obj, pd, "elm.text", text); + _textpath_text_set_internal(obj, pd, "text", text); } EOLIAN static const char * _efl_ui_textpath_efl_text_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *pd) { - return edje_object_part_text_get(pd->text_obj, "elm.text"); + return edje_object_part_text_get(pd->text_obj, "text"); } EOLIAN static Efl_Ui_Theme_Apply diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index f23fe57bce..30b52dc65d 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -236,7 +236,10 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv) elm_widget_theme_style_get(obj))) CRI("Failed to set layout!"); - elm_layout_content_set(obj, "elm.swallow.video", priv->emotion); + if (elm_widget_is_legacy(obj)) + elm_layout_content_set(obj, "elm.swallow.video", priv->emotion); + else + elm_layout_content_set(obj, "video", priv->emotion); efl_event_callback_array_add(priv->emotion, _video_cb(), obj); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 9fbad2360c..318ca78878 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1478,11 +1478,23 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha) return; } - 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", + 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); + } + 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); + } + if (!alpha) ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh); else @@ -1506,8 +1518,12 @@ _elm_win_frame_geometry_adjust(Efl_Ui_Win_Data *sd) { int fw, fh, ox, oy, ow, oh; evas_object_geometry_get(sd->frame_obj, NULL, NULL, &fw, &fh); - edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", - &ox, &oy, &ow, &oh); + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", + &ox, &oy, &ow, &oh); + else + edje_object_part_geometry_get(sd->frame_obj, "spacer.opaque", + &ox, &oy, &ow, &oh); l = ox; t = oy; r = fw - ow - l; @@ -1539,7 +1555,11 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd) _elm_win_opaque_dirty(sd); _elm_win_frame_geometry_adjust(sd); evas_object_geometry_get(sd->frame_obj, &ox, &oy, &ow, &oh); - edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch); + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch); + else + edje_object_part_geometry_get(sd->frame_obj, "spacer.content", &cx, &cy, &cw, &ch); + if (!_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch)) return; _elm_win_frame_geometry_adjust(sd); evas_object_geometry_get(sd->obj, NULL, NULL, &w, &h); @@ -3209,9 +3229,15 @@ _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor) } evas_object_move(sd->pointer.obj, 0, 0); evas_object_resize(sd->pointer.obj, mw, mh); - edje_object_part_geometry_get(sd->pointer.obj, - "elm.swallow.hotspot", - &hx, &hy, NULL, NULL); + if (elm_widget_is_legacy(obj) + edje_object_part_geometry_get(sd->pointer.obj, + "elm.swallow.hotspot", + &hx, &hy, NULL, NULL); + else + edje_object_part_geometry_get(sd->pointer.obj, + "hotspot", + &hx, &hy, NULL, NULL); + sd->pointer.hot_x = hx; sd->pointer.hot_y = hy; @@ -3910,7 +3936,7 @@ typedef struct _resize_info { #endif } resize_info; -static const resize_info _resize_infos[8] = { +static const resize_info _resize_infos_legacy[8] = { { "elm.event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_TOP, 1 XDIR(SIZE_T) }, { "elm.event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_BOTTOM, 2 XDIR(SIZE_B) }, { "elm.event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_LEFT, 4 XDIR(SIZE_L) }, @@ -3921,6 +3947,17 @@ static const resize_info _resize_infos[8] = { { "elm.event.resize.tr", ELM_CURSOR_TOP_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 9 XDIR(SIZE_TR) }, }; +static const resize_info _resize_infos[8] = { + { "event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_TOP, 1 XDIR(SIZE_T) }, + { "event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_BOTTOM, 2 XDIR(SIZE_B) }, + { "event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_LEFT, 4 XDIR(SIZE_L) }, + { "event.resize.r", ELM_CURSOR_RIGHT_SIDE, EFL_UI_WIN_MOVE_RESIZE_RIGHT, 8 XDIR(SIZE_R) }, + { "event.resize.tl", ELM_CURSOR_TOP_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_LEFT, 5 XDIR(SIZE_TL) }, + { "event.resize.bl", ELM_CURSOR_BOTTOM_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_LEFT, 6 XDIR(SIZE_BL) }, + { "event.resize.br", ELM_CURSOR_BOTTOM_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 10 XDIR(SIZE_BR) }, + { "event.resize.tr", ELM_CURSOR_TOP_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 9 XDIR(SIZE_TR) }, +}; + static inline Efl_Ui_Win_Move_Resize_Mode _move_resize_mode_rotate(int rotation, Efl_Ui_Win_Move_Resize_Mode mode) { @@ -3951,26 +3988,46 @@ _move_resize_mode_rotate(int rotation, Efl_Ui_Win_Move_Resize_Mode mode) } static const resize_info * -_resize_info_get(int rotation, Efl_Ui_Win_Move_Resize_Mode mode) +_resize_info_get(Evas_Object *obj, int rotation, Efl_Ui_Win_Move_Resize_Mode mode) { if (rotation) - return _resize_info_get(0, _move_resize_mode_rotate(rotation, mode)); + return _resize_info_get(obj, 0, _move_resize_mode_rotate(rotation, mode)); - for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++) + if (elm_widget_is_legacy(obj)) { - if (_resize_infos[k].mode == mode) - return &_resize_infos[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++) + { + if (_resize_infos[k].mode == mode) + return &_resize_infos[k]; + } } return NULL; } static Efl_Ui_Win_Move_Resize_Mode -_move_resize_mode_get(const char *source) +_move_resize_mode_get(Evas_Object *obj, const char *source) { - for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++) - if (!strcmp(source, _resize_infos[k].source)) - return _resize_infos[k].mode; + if (elm_widget_is_legacy(obj)) + { + for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos_legacy); k++) + if (!strcmp(source, _resize_infos_legacy[k].source)) + return _resize_infos_legacy[k].mode; + } + else + { + for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++) + if (!strcmp(source, _resize_infos[k].source)) + return _resize_infos[k].mode; + } return EFL_UI_WIN_MOVE_RESIZE_MOVE; } @@ -4017,8 +4074,8 @@ _elm_win_frame_cb_resize_show(void *data, #ifdef HAVE_ELEMENTARY_WL2 if (sd->pointer.obj) { - Efl_Ui_Win_Move_Resize_Mode mode = _move_resize_mode_get(source); - const resize_info *ri = _resize_info_get(sd->rot, mode); + Efl_Ui_Win_Move_Resize_Mode mode = _move_resize_mode_get(sd->obj, source); + const resize_info *ri = _resize_info_get(sd->obj, sd->rot, mode); if (ri) elm_widget_theme_object_set(sd->obj, sd->pointer.obj, "pointer", "base", ri->cursor); } #else @@ -4091,7 +4148,7 @@ _win_move_resize_start(Efl_Ui_Win_Data *sd, Efl_Ui_Win_Move_Resize_Mode mode) if (mode == EFL_UI_WIN_MOVE_RESIZE_MOVE) return _win_move_start(sd); - ri = _resize_info_get(sd->rot, mode); + ri = _resize_info_get(sd->obj, sd->rot, mode); if (!ri) { ERR("Unsupported move_resize mode %#x", (int) mode); @@ -4154,7 +4211,7 @@ _elm_win_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED, ELM_WIN_DATA_GET_OR_RETURN(data, sd); Efl_Ui_Win_Move_Resize_Mode mode; - mode = _move_resize_mode_get(source); + mode = _move_resize_mode_get(sd->obj, source); if (mode == EFL_UI_WIN_MOVE_RESIZE_MOVE) return; _win_move_resize_start(sd, mode); @@ -4356,23 +4413,16 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) if (v < FRAME_OBJ_THEME_MIN_VERSION) { - // Theme compatibility - const char *key = "elm/border/base/default"; // FIXME? - char *sys_theme; - WRN("Selected theme does not support the required border theme API " "(version = %d, requires >= %d).", v, FRAME_OBJ_THEME_MIN_VERSION); - sys_theme = _efl_system_theme_path_get(); - if (!sys_theme || - !edje_object_file_set(sd->frame_obj, sys_theme, key)) + + if (!elm_widget_theme_object_set(sd->obj, sd->frame_obj, "border", element, style)) { ERR("Failed to set main border theme for the window."); ELM_SAFE_FREE(sd->frame_obj, evas_object_del); - free(sys_theme); return; } - free(sys_theme); } /* Small hack: The special value 2 means this is the top frame object. @@ -4382,7 +4432,10 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) * the fly. */ efl_canvas_object_is_frame_object_set(sd->frame_obj, 2); - edje_object_part_swallow(sd->frame_obj, "elm.swallow.client", sd->legacy.edje); + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_swallow(sd->frame_obj, "elm.swallow.client", sd->legacy.edje); + else + edje_object_part_swallow(sd->frame_obj, "client", sd->legacy.edje); if (sd->icon) evas_object_show(sd->icon); @@ -4407,7 +4460,11 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED); } - edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); + else + edje_object_part_swallow(sd->frame_obj, "icon", sd->icon); + efl_canvas_object_is_frame_object_set(sd->icon, EINA_TRUE); evas_object_event_callback_add @@ -4452,22 +4509,40 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) if (!sd->pointer.obj) { - for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++) + if (elm_widget_is_legacy(obj)) + { + for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos_legacy); k++) + { + const resize_info *ri = &_resize_infos_legacy[k]; + _elm_object_part_cursor_set(obj, sd->frame_obj, ri->source, ri->cursor); + } + } + else { - const resize_info *ri = &_resize_infos[k]; - _elm_object_part_cursor_set(obj, sd->frame_obj, ri->source, ri->cursor); + for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(_resize_infos); k++) + { + const resize_info *ri = &_resize_infos[k]; + _elm_object_part_cursor_set(obj, sd->frame_obj, ri->source, ri->cursor); + } } } if (sd->title) { - edje_object_part_text_escaped_set - (sd->frame_obj, "elm.text.title", sd->title); + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_text_escaped_set(sd->frame_obj, "elm.text.title", sd->title); + else + edje_object_part_text_escaped_set(sd->frame_obj, "text.title", sd->title); } { // HACK: Force render mode of bg rect to COPY. This avoids render garbage. - Eo *bgrect = (Eo *) edje_object_part_object_get(sd->frame_obj, "elm.rect.background"); + Eo *bgrect; + if (elm_widget_is_legacy(sd->obj)) + bgrect = (Eo *) edje_object_part_object_get(sd->frame_obj, "elm.rect.background"); + else + bgrect = (Eo *) edje_object_part_object_get(sd->frame_obj, "rect.background"); + efl_canvas_object_render_op_set(bgrect, EFL_GFX_RENDER_OP_COPY); } @@ -4753,10 +4828,20 @@ _indicator_add(Efl_Ui_Win_Data *sd) sd->indicator = _create_indicator(obj); - if ((!sd->indicator) || - (!edje_object_part_swallow(sd->frame_obj, "elm.swallow.indicator", sd->indicator))) + if (!sd->indicator) return; + if (elm_widget_is_legacy(obj)) + { + if (!edje_object_part_swallow(sd->frame_obj, "elm.swallow.indicator", sd->indicator)) + return; + } + else + { + if (!edje_object_part_swallow(sd->frame_obj, "indicator", sd->indicator)) + return; + } + efl_event_callback_add (sd->indicator, ELM_PLUG_EVENT_IMAGE_RESIZED, _indicator_resized, obj); @@ -5386,8 +5471,13 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U elm_widget_theme_object_set(obj, o, "pointer", "base", "default"); edje_object_size_min_calc(o, &mw, &mh); evas_object_resize(o, mw, mh); - edje_object_part_geometry_get(o, "elm.swallow.hotspot", - &hx, &hy, NULL, NULL); + if (elm_widget_is_legacy(obj)) + edje_object_part_geometry_get(o, "elm.swallow.hotspot", + &hx, &hy, NULL, NULL); + else + edje_object_part_geometry_get(o, "hotspot", + &hx, &hy, NULL, NULL); + sd->pointer.hot_x = hx; sd->pointer.hot_y = hy; evas_object_show(o); @@ -5579,8 +5669,12 @@ _efl_ui_win_efl_text_text_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const ch if (sd->ee) TRAP(sd, title_set, sd->title); if (sd->frame_obj) - edje_object_part_text_escaped_set - (sd->frame_obj, "elm.text.title", sd->title); + { + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_text_escaped_set(sd->frame_obj, "elm.text.title", sd->title); + else + edje_object_part_text_escaped_set(sd->frame_obj, "text.title", sd->title); + } } EOLIAN static const char* @@ -5693,7 +5787,11 @@ _efl_ui_win_icon_object_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Object *icon) efl_event_callback_add(sd->icon, EFL_EVENT_DEL, _elm_win_on_icon_del, obj); if (sd->frame_obj) { - edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); + else + edje_object_part_swallow(sd->frame_obj, "icon", sd->icon); + evas_object_is_frame_object_set(sd->icon, EINA_TRUE); } } @@ -6003,7 +6101,12 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data) { DBG("Setting menu to local mode"); efl_event_callback_add(sd->obj, EFL_GFX_EVENT_RESIZE, _main_menu_resize_cb, NULL); - edje_object_part_swallow(swallow, "elm.swallow.menu", sd->main_menu); + + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_swallow(swallow, "elm.swallow.menu", sd->main_menu); + else + edje_object_part_swallow(swallow, "menu", sd->main_menu); + evas_object_show(sd->main_menu); if (swallow == sd->frame_obj) { @@ -7144,8 +7247,16 @@ _elm_win_bg_set(Efl_Ui_Win_Data *sd, Eo *bg) if (!elm_widget_sub_object_add(sd->obj, bg)) return EINA_FALSE; - if (!edje_object_part_swallow(sd->frame_obj, "elm.swallow.background", bg)) - return EINA_FALSE; + if (elm_widget_is_legacy(sd->obj)) + { + if (!edje_object_part_swallow(sd->frame_obj, "elm.swallow.background", bg)) + return EINA_FALSE; + } + else + { + if (!edje_object_part_swallow(sd->frame_obj, "background", bg)) + return EINA_FALSE; + } efl_gfx_visible_set(bg, 1); efl_gfx_size_hint_align_set(bg, -1, -1); efl_gfx_size_hint_weight_set(bg, 1, 1); @@ -8435,7 +8546,12 @@ _elm_win_legacy_init(Efl_Ui_Win_Data *sd) sd->legacy.box = evas_object_box_add(sd->evas); evas_object_box_layout_set(sd->legacy.box, _window_layout_stack, sd->obj, NULL); - edje_object_part_swallow(sd->legacy.edje, "elm.swallow.contents", sd->legacy.box); + + if (elm_widget_is_legacy(sd->obj)) + edje_object_part_swallow(sd->legacy.edje, "elm.swallow.contents", sd->legacy.box); + else + edje_object_part_swallow(sd->legacy.edje, "contents", sd->legacy.box); + evas_object_move(sd->legacy.edje, 0, 0); evas_object_resize(sd->legacy.edje, 1, 1); if (sd->type != ELM_WIN_FAKE) diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 9ba2feb8fc..b11c1799aa 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -800,8 +800,16 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid) double vx = 0.0, vy = 0.0, size; edje_object_calc_force(sid->edje_obj); - edje_object_part_geometry_get - (sid->edje_obj, "elm.swallow.content", NULL, NULL, &vw, &vh); + if (elm_widget_is_legacy(sid->obj)) + { + edje_object_part_geometry_get + (sid->edje_obj, "elm.swallow.content", NULL, NULL, &vw, &vh); + } + else + { + edje_object_part_geometry_get + (sid->edje_obj, "content", NULL, NULL, &vw, &vh); + } w = sid->content_info.w; if (w < 1) w = 1; size = (double)vw / (double)w; @@ -3986,7 +3994,11 @@ _elm_interface_scrollable_scrollable_content_set(Eo *obj, Elm_Scrollable_Smart_I (o, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid); evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _elm_scroll_pan_resized_cb, sid); - edje_object_part_swallow(sid->edje_obj, "elm.swallow.content", o); + + if (elm_widget_is_legacy(obj)) + edje_object_part_swallow(sid->edje_obj, "elm.swallow.content", o); + else + edje_object_part_swallow(sid->edje_obj, "content", o); } evas_object_event_callback_add @@ -4041,8 +4053,17 @@ _elm_interface_scrollable_extern_pan_set(Eo *obj, Elm_Scrollable_Smart_Interface (sid->pan_obj, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid); evas_object_event_callback_add(sid->pan_obj, EVAS_CALLBACK_RESIZE, _elm_scroll_pan_resized_cb, sid); - edje_object_part_swallow - (sid->edje_obj, "elm.swallow.content", sid->pan_obj); + + if (elm_widget_is_legacy(obj)) + { + edje_object_part_swallow + (sid->edje_obj, "elm.swallow.content", sid->pan_obj); + } + else + { + edje_object_part_swallow + (sid->edje_obj, "content", sid->pan_obj); + } } EOLIAN static void diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c index fbcde054bf..680d3df0aa 100644 --- a/src/lib/elementary/els_cursor.c +++ b/src/lib/elementary/els_cursor.c @@ -293,6 +293,10 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur) 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); else { ELM_SAFE_FREE(cur->hotobj, evas_object_del); |