efl theme: remove the elm legacy name of efl ui theme
Summary: remove the elm legacy name of efl ui theme Test Plan: run elementary_test and test efl ui widget cases Reviewers: Jaehyun_Cho, woohyun, cedric, raster, jpeg Reviewed By: Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D5934
This commit is contained in:
Taehyub Kim
parent
473e657120
commit
6e49db0739
|
|
@ -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).
|
||||
efl.rectangle: Used for elm_bg_color_set()
|
||||
efl.background: Used for elm_bg_file_set()
|
||||
efl.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: "efl.rectangle"; type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.background"; type: SWALLOW;
|
||||
part { name: "efl.background"; 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: "efl.content"; type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 { "efl.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 { "efl.spacer.content";
|
||||
required; // since 1.19
|
||||
desc {
|
||||
rel1.to: "elm.swallow.menu";
|
||||
rel1.to: "efl.menu";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel2.to: "elm.swallow.keyboard";
|
||||
rel2.to: "efl.keyboard";
|
||||
rel2.relative: 1.0 0.0;
|
||||
}
|
||||
}
|
||||
|
|
@ -76,7 +76,7 @@ group { name: "efl/border";
|
|||
rel2.to: "bottom_clip";
|
||||
}
|
||||
}
|
||||
rect { "elm.rect.background";
|
||||
rect { "efl.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 { "efl.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: "efl.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: "efl.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: "efl.menu";
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.menu";
|
||||
swallow { "efl.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: "efl.menu";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel2.to: "elm.swallow.keyboard";
|
||||
rel2.to: "efl.keyboard";
|
||||
rel2.relative: 1.0 0.0;
|
||||
}
|
||||
}
|
||||
|
|
@ -162,7 +162,7 @@ group { name: "efl/border";
|
|||
}
|
||||
|
||||
/* application contents */
|
||||
swallow { "elm.swallow.client";
|
||||
swallow { "efl.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 { "efl.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: "efl.text.title";
|
||||
text_class: "title_bar";
|
||||
align: 0.5 0.0;
|
||||
min: 0 1;
|
||||
|
|
@ -294,8 +294,8 @@ group { name: "efl/border";
|
|||
}
|
||||
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,7 +308,7 @@ group { name: "efl/border";
|
|||
rel2.relative: 1.2 1.2;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.icon"; nomouse;
|
||||
swallow { "efl.icon"; nomouse;
|
||||
clip_to: "top_clip";
|
||||
desc { "default";
|
||||
rel1.to: "icon";
|
||||
|
|
@ -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 { "efl.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 { "efl.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: "efl.event.resize.tl";
|
||||
rel2.relative: 0.0 0.0;
|
||||
rel2.to_x: "elm.event.resize.tr";
|
||||
rel2.to_x: "efl.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 { "efl.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 { "efl.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 { "efl.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 { "efl.event.resize.b";
|
||||
clip: "bottom_clip";
|
||||
desc { "default";
|
||||
rel1.relative: 1.0 1.0;
|
||||
rel1.to_x: "elm.event.resize.tl";
|
||||
rel1.to_x: "efl.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: "efl.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 { "efl.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: "efl.indicator";
|
||||
}
|
||||
desc { "bg_transparent";
|
||||
inherit: "default";
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.indicator";
|
||||
swallow { "efl.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: "efl.rect.background";
|
||||
}
|
||||
program {
|
||||
signal: "elm,state,background,solid,off"; source: "elm";
|
||||
action: STATE_SET "default";
|
||||
target: "elm.rect.background";
|
||||
target: "efl.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: "efl.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: "efl.text.title";
|
||||
target: "title2";
|
||||
target: "clip1";
|
||||
target: "clip2";
|
||||
|
|
@ -872,7 +872,7 @@ group { name: "efl/border";
|
|||
program {
|
||||
signal: "elm,state,maximize*"; source: "elm";
|
||||
action: STATE_SET "max";
|
||||
target: "elm.spacer.opaque";
|
||||
target: "efl.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: "efl.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: "efl.indicator";
|
||||
}
|
||||
program {
|
||||
signal: "elm,action,indicator,hide_effect"; source: "elm";
|
||||
action: STATE_SET "hidden";
|
||||
transition: DECELERATE 0.2;
|
||||
target: "elm.swallow.indicator";
|
||||
target: "efl.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:"efl.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:"efl.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:"efl.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:"efl.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: "efl.menu";
|
||||
}
|
||||
program { name: "hide_menu";
|
||||
signal: "elm,action,hide"; source: "elm";
|
||||
action: STATE_SET "default";
|
||||
target: "elm.swallow.menu";
|
||||
target: "efl.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: "efl.event.resize.t";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "efl.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: "efl.event.resize.t";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "efl.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: "efl.event.resize.t";
|
||||
action: SIGNAL_EMIT "elm,action,resize,start" "efl.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: "efl.event.resize.b";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "efl.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: "efl.event.resize.b";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "efl.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: "efl.event.resize.b";
|
||||
action: SIGNAL_EMIT "elm,action,resize,start" "efl.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: "efl.event.resize.tl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "efl.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: "efl.event.resize.tl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "efl.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: "efl.event.resize.tl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,start" "efl.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: "efl.event.resize.tr";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "efl.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: "efl.event.resize.tr";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "efl.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: "efl.event.resize.tr";
|
||||
action: SIGNAL_EMIT "elm,action,resize,start" "efl.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: "efl.event.resize.bl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "efl.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: "efl.event.resize.bl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "efl.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: "efl.event.resize.bl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,start" "efl.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: "efl.event.resize.br";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "efl.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: "efl.event.resize.br";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "efl.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: "efl.event.resize.br";
|
||||
action: SIGNAL_EMIT "elm,action,resize,start" "efl.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 { "efl.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
|
||||
|
||||
|
|
|
|||
|
|
@ -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:"efl.background", "visible", 0.0);
|
||||
} else {
|
||||
set_state(PART:"elm.swallow.background", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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:"efl.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:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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:"efl.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:"efl.content", "icononly", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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:"efl.text", "textonly", 0.0);
|
||||
else
|
||||
set_state(PART:"elm.text", "pressed_textonly", 0.0);
|
||||
set_state(PART:"efl.text", "pressed_textonly", 0.0);
|
||||
} else {
|
||||
set_state(PART:"elm.swallow.content", "default", 0.0);
|
||||
set_state(PART:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_textonly", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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:"efl.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 { "efl.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 { "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.content";
|
||||
rel2.to: "efl.content";
|
||||
text {
|
||||
min: 1 1;
|
||||
ellipsis: -1;
|
||||
|
|
@ -212,14 +212,14 @@ group { name: "efl/button";
|
|||
}
|
||||
}
|
||||
}
|
||||
text { "elm.text"; nomouse;
|
||||
text { "efl.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: "efl.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: "elm,state,text,set"; source: "elm";
|
||||
script {
|
||||
new m = get_int(btmode);
|
||||
m |= LABEL; set_int(btmode, m);
|
||||
|
|
@ -344,7 +344,7 @@ group { name: "efl/button";
|
|||
}
|
||||
}
|
||||
program { name: "button_text_hidden";
|
||||
signal: "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);
|
||||
|
|
@ -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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "icononly", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "icononly", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "textonly", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_textonly", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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:"efl.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 { "efl.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 { "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.content";
|
||||
rel2.to: "efl.content";
|
||||
text {
|
||||
min: 1 1;
|
||||
ellipsis: -1;
|
||||
|
|
@ -566,13 +566,13 @@ group { name: "efl/button:anchor";
|
|||
}
|
||||
}
|
||||
}
|
||||
text { "elm.text"; nomouse;
|
||||
text { "efl.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: "efl.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: "efl.text";
|
||||
rel2.to: "efl.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: "efl.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: "elm,state,text,set"; source: "elm";
|
||||
script {
|
||||
new m = get_int(btmode);
|
||||
m |= LABEL; set_int(btmode, m);
|
||||
|
|
@ -726,7 +726,7 @@ group { name: "efl/button:anchor";
|
|||
}
|
||||
}
|
||||
program { name: "button_text_hidden";
|
||||
signal: "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);
|
||||
|
|
@ -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: "efl.background";
|
||||
}
|
||||
program { name: "button_background_hidden";
|
||||
signal: "elm,state,background,unset"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.background";
|
||||
target: "efl.background";
|
||||
}
|
||||
program { name: "button_state_disabled";
|
||||
signal: "elm,state,disabled"; source: "elm";
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
color: 0 0 0 0;\
|
||||
}\
|
||||
}\
|
||||
part { name: "elm,calendar,button"#_sufix",left";\
|
||||
part { name: "efl.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: "efl.calendar.button"#_sufix".right";\
|
||||
type: SWALLOW;\
|
||||
scale: 1;\
|
||||
description { state: "default" 0.0;\
|
||||
|
|
@ -446,7 +446,7 @@ group { "efl/calendar";
|
|||
rel2.offset: -2 -2;
|
||||
}
|
||||
}
|
||||
part { name: "background"; type: SWALLOW;
|
||||
part { name: "efl.background"; type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "bg";
|
||||
rel2.to: "bg";
|
||||
|
|
|
|||
|
|
@ -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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "disabled", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.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,105 +347,105 @@ 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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "default", 0.0);
|
||||
set_state(PART:"elm.ontext", "default", 0.0);
|
||||
set_state(PART:"elm.offtext", "default", 0.0);
|
||||
set_state(PART:"efl.ontext", "default", 0.0);
|
||||
set_state(PART:"efl.offtext", "default", 0.0);
|
||||
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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "disabled", 0.0);
|
||||
set_state(PART:"elm.ontext", "disabled", 0.0);
|
||||
set_state(PART:"elm.offtext", "disabled", 0.0);
|
||||
set_state(PART:"efl.ontext", "disabled", 0.0);
|
||||
set_state(PART:"efl.offtext", "disabled", 0.0);
|
||||
set_state(PART:"onrect", "disabled", 0.0);
|
||||
set_state(PART:"offrect", "disabled", 0.0);
|
||||
}
|
||||
} else if (m1 == (ICON)) {
|
||||
if (!d) {
|
||||
set_state(PART:"elm.swallow.content", "visible", 0.0);
|
||||
set_state(PART:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "default", 0.0);
|
||||
set_state(PART:"elm.ontext", "default", 0.0);
|
||||
set_state(PART:"elm.offtext", "default", 0.0);
|
||||
set_state(PART:"efl.ontext", "default", 0.0);
|
||||
set_state(PART:"efl.offtext", "default", 0.0);
|
||||
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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "disabled", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "disabled", 0.0);
|
||||
set_state(PART:"elm.ontext", "disabled", 0.0);
|
||||
set_state(PART:"elm.offtext", "disabled", 0.0);
|
||||
set_state(PART:"efl.ontext", "disabled", 0.0);
|
||||
set_state(PART:"efl.offtext", "disabled", 0.0);
|
||||
set_state(PART:"onrect", "disabled", 0.0);
|
||||
set_state(PART:"offrect", "disabled", 0.0);
|
||||
}
|
||||
} else if (m1 == (LABEL)) {
|
||||
if (!d) {
|
||||
set_state(PART:"elm.swallow.content", "default", 0.0);
|
||||
set_state(PART:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "default", 0.0);
|
||||
set_state(PART:"elm.ontext", "default", 0.0);
|
||||
set_state(PART:"elm.offtext", "default", 0.0);
|
||||
set_state(PART:"efl.ontext", "default", 0.0);
|
||||
set_state(PART:"efl.offtext", "default", 0.0);
|
||||
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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "disabled", 0.0);
|
||||
set_state(PART:"elm.ontext", "disabled", 0.0);
|
||||
set_state(PART:"elm.offtext", "disabled", 0.0);
|
||||
set_state(PART:"efl.ontext", "disabled", 0.0);
|
||||
set_state(PART:"efl.offtext", "disabled", 0.0);
|
||||
set_state(PART:"onrect", "disabled", 0.0);
|
||||
set_state(PART:"offrect", "disabled", 0.0);
|
||||
}
|
||||
} else {
|
||||
if (!d) {
|
||||
set_state(PART:"elm.swallow.content", "default", 0.0);
|
||||
set_state(PART:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "default", 0.0);
|
||||
set_state(PART:"elm.ontext", "default", 0.0);
|
||||
set_state(PART:"elm.offtext", "default", 0.0);
|
||||
set_state(PART:"efl.ontext", "default", 0.0);
|
||||
set_state(PART:"efl.offtext", "default", 0.0);
|
||||
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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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);
|
||||
set_state(PART:"event2", "disabled", 0.0);
|
||||
set_state(PART:"elm.ontext", "disabled", 0.0);
|
||||
set_state(PART:"elm.offtext", "disabled", 0.0);
|
||||
set_state(PART:"efl.ontext", "disabled", 0.0);
|
||||
set_state(PART:"efl.offtext", "disabled", 0.0);
|
||||
set_state(PART:"onrect", "disabled", 0.0);
|
||||
set_state(PART:"offrect", "disabled", 0.0);
|
||||
}
|
||||
|
|
@ -495,7 +495,7 @@ group { "efl/check:toggle";
|
|||
color: 64 64 64 255;
|
||||
}
|
||||
}
|
||||
part { name: "elm.offtext"; type: TEXT; mouse_events: 0;
|
||||
part { name: "efl.offtext"; type: TEXT; mouse_events: 0;
|
||||
effect: SHADOW BOTTOM;
|
||||
scale: 1;
|
||||
clip_to: "tog_clip";
|
||||
|
|
@ -519,7 +519,7 @@ group { "efl/check:toggle";
|
|||
color3: 255 255 255 255;
|
||||
}
|
||||
}
|
||||
part { name: "elm.ontext"; type: TEXT; mouse_events: 0;
|
||||
part { name: "efl.ontext"; type: TEXT; mouse_events: 0;
|
||||
effect: GLOW;
|
||||
scale: 1;
|
||||
clip_to: "tog_clip";
|
||||
|
|
@ -661,7 +661,7 @@ group { "efl/check:toggle";
|
|||
color: 255 255 255 64;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.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: "efl.content";
|
||||
rel2.to_x: "efl.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: "elm,state,text,set"; source: "elm";
|
||||
script {
|
||||
new m = get_int(btmode);
|
||||
m |= LABEL; set_int(btmode, m);
|
||||
|
|
@ -878,7 +878,7 @@ group { "efl/check:toggle";
|
|||
}
|
||||
}
|
||||
program {
|
||||
signal: "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);
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ group { name: "efl/cursor/hand1";
|
|||
image.normal: "pointer_hand1.png";
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.hotspot"; type: SWALLOW;
|
||||
part { name: "efl.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";
|
||||
/* efl.content.hotspot is the old name for the above part */
|
||||
alias: "efl.content.hotspot" "efl.hotspot";
|
||||
}
|
||||
}
|
||||
|
||||
group { name: "efl/cursor/blank";
|
||||
parts {
|
||||
part { name: "elm.swallow.hotspot"; type: SWALLOW;
|
||||
part { name: "efl.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";
|
||||
/* efl.content.hotspot is the old name for the above part */
|
||||
alias: "efl.content.hotspot" "efl.hotspot";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ group { name: "efl/cursor/xterm";
|
|||
rel2.offset: -1 -3;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.hotspot"; type: SWALLOW;
|
||||
part { name: "efl.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";
|
||||
/* efl.content.hotspot is the old name for the above part */
|
||||
alias: "efl.content.hotspot" "efl.hotspot";
|
||||
part { name: "shine";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "base";
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ group { "efl/datepicker";
|
|||
align: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
swallow { "field0";
|
||||
swallow { "efl.field0";
|
||||
mouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
@ -119,13 +119,13 @@ group { "efl/datepicker";
|
|||
max: 10 -1;
|
||||
rel1 {
|
||||
relative: 1.0 0.0;
|
||||
to: "field0";
|
||||
to: "efl.field0";
|
||||
}
|
||||
rel2.to: "field0";
|
||||
rel2.to: "efl.field0";
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
}
|
||||
swallow { "field1";
|
||||
swallow { "efl.field1";
|
||||
mouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
@ -148,15 +148,15 @@ group { "efl/datepicker";
|
|||
fixed: 1 0;
|
||||
min: 10 0;
|
||||
max: 10 -1;
|
||||
rel1.to: "field2";
|
||||
rel1.to: "efl.field2";
|
||||
rel2 {
|
||||
relative: 0.0 1.0;
|
||||
to: "field2";
|
||||
to: "efl.field2";
|
||||
}
|
||||
align: 1.0 0.5;
|
||||
}
|
||||
}
|
||||
swallow { "field2";
|
||||
swallow { "efl.field2";
|
||||
mouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
@ -186,7 +186,7 @@ group { "efl/datepicker/spin_button";
|
|||
parts {
|
||||
rect { "clip";
|
||||
desc { "default";
|
||||
rel.to: "elm.swallow.text_button";
|
||||
rel.to: "efl.text_button";
|
||||
}
|
||||
}
|
||||
spacer { "base";
|
||||
|
|
@ -215,7 +215,7 @@ group { "efl/datepicker/spin_button";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.inc_button";
|
||||
swallow { "efl.inc_button";
|
||||
scale;
|
||||
desc { "default";
|
||||
align: 0.5 0.0;
|
||||
|
|
@ -224,7 +224,7 @@ group { "efl/datepicker/spin_button";
|
|||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.dec_button";
|
||||
swallow { "efl.dec_button";
|
||||
scale;
|
||||
desc { "default";
|
||||
align: 0.5 1.0;
|
||||
|
|
@ -233,12 +233,12 @@ group { "efl/datepicker/spin_button";
|
|||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.entry";
|
||||
swallow { "efl.entry";
|
||||
clip: "clip";
|
||||
desc { "default";
|
||||
fixed: 1 1;
|
||||
rel1.to: "elm.swallow.text_button";
|
||||
rel2.to: "elm.swallow.text_button";
|
||||
rel1.to: "efl.text_button";
|
||||
rel2.to: "efl.text_button";
|
||||
hid;
|
||||
}
|
||||
desc { "active";
|
||||
|
|
@ -246,16 +246,16 @@ group { "efl/datepicker/spin_button";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.text_button";
|
||||
swallow { "efl.text_button";
|
||||
scale;
|
||||
desc { "default";
|
||||
rel.to_x: "base";
|
||||
rel1 {
|
||||
to_y: "elm.swallow.inc_button";
|
||||
to_y: "efl.inc_button";
|
||||
relative: 0.0 1.0;
|
||||
}
|
||||
rel2 {
|
||||
to_y: "elm.swallow.dec_button";
|
||||
to_y: "efl.dec_button";
|
||||
relative: 1.0 0.0;
|
||||
}
|
||||
min: 0 70;
|
||||
|
|
@ -285,25 +285,25 @@ group { "efl/datepicker/spin_button";
|
|||
signal: "elm,state,entry,active";
|
||||
source: "elm";
|
||||
action: STATE_SET "active";
|
||||
target: "elm.swallow.entry";
|
||||
target: "efl.entry";
|
||||
}
|
||||
program { "entry_inactive";
|
||||
signal: "elm,state,entry,inactive";
|
||||
source: "elm";
|
||||
action: STATE_SET "default";
|
||||
target: "elm.swallow.entry";
|
||||
target: "efl.entry";
|
||||
}
|
||||
program { "text_button_active";
|
||||
signal: "elm,state,button,active";
|
||||
source: "elm";
|
||||
action: STATE_SET "default";
|
||||
target: "elm.swallow.text_button";
|
||||
target: "efl.text_button";
|
||||
}
|
||||
program { "text_button_inactive";
|
||||
signal: "elm,state,button,inactive";
|
||||
source: "elm";
|
||||
action: STATE_SET "inactive";
|
||||
target: "elm.swallow.text_button";
|
||||
target: "efl.text_button";
|
||||
}
|
||||
program { "access_activate";
|
||||
signal: "elm,state,access,active";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ group { name: "efl/frame";
|
|||
description { state: "default" 0.0;
|
||||
image.normal: "vgrad_med_curved.png";
|
||||
rel1.offset: 2 2;
|
||||
rel2.to_y: "elm.text";
|
||||
rel2.to_y: "efl.text";
|
||||
rel2.offset: -3 -1;
|
||||
fill.smooth: 0;
|
||||
TILED_HORIZ(120)
|
||||
|
|
@ -36,10 +36,10 @@ group { name: "efl/frame";
|
|||
description { state: "default" 0.0;
|
||||
image.normal: "holes_tiny_vert.png";
|
||||
rel1.offset: 4 0;
|
||||
rel1.to_y: "elm.text";
|
||||
rel1.to_y: "efl.text";
|
||||
rel2.offset: 4 -1;
|
||||
rel2.relative: 0.0 1.0;
|
||||
rel2.to_y: "elm.text";
|
||||
rel2.to_y: "efl.text";
|
||||
align: 0.0 0.5;
|
||||
FIXED_SIZE(3, 11)
|
||||
}
|
||||
|
|
@ -48,16 +48,16 @@ group { name: "efl/frame";
|
|||
description { state: "default" 0.0;
|
||||
image.normal: "holes_tiny_vert.png";
|
||||
rel1.offset: -5 0;
|
||||
rel1.to_y: "elm.text";
|
||||
rel1.to_y: "efl.text";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel2.offset: -5 -1;
|
||||
rel2.relative: 1.0 1.0;
|
||||
rel2.to_y: "elm.text";
|
||||
rel2.to_y: "efl.text";
|
||||
align: 1.0 0.5;
|
||||
FIXED_SIZE(3, 11)
|
||||
}
|
||||
}
|
||||
part { name: "elm.text"; type: TEXT;
|
||||
part { name: "efl.text"; type: TEXT;
|
||||
scale: 1;
|
||||
effect: SHADOW BOTTOM;
|
||||
description { state: "default" 0.0;
|
||||
|
|
@ -82,17 +82,17 @@ group { name: "efl/frame";
|
|||
description { state: "default" 0.0;
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel1.offset: 5 0;
|
||||
rel1.to_y: "elm.text";
|
||||
rel1.to_y: "efl.text";
|
||||
rel2.offset: -7 -7;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content"; type: SWALLOW;
|
||||
part { name: "efl.content"; type: SWALLOW;
|
||||
clip_to: "clip";
|
||||
description { state: "default" 0.0;
|
||||
align: 0.0 1.0;
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel1.offset: 5 0;
|
||||
rel1.to_y: "elm.text";
|
||||
rel1.to_y: "efl.text";
|
||||
rel2.offset: -7 -7;
|
||||
}
|
||||
description { state: "collapsed" 0.0;
|
||||
|
|
@ -113,21 +113,21 @@ group { name: "efl/frame";
|
|||
part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
|
||||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
rel1.to_y: "elm.text";
|
||||
rel2.to_y: "elm.text";
|
||||
rel1.to_y: "efl.text";
|
||||
rel2.to_y: "efl.text";
|
||||
}
|
||||
}
|
||||
}
|
||||
programs {
|
||||
program { name: "collapse";
|
||||
action: STATE_SET "collapsed" 0.0;
|
||||
target: "elm.swallow.content";
|
||||
target: "efl.content";
|
||||
transition: ACCELERATE 0.3;
|
||||
after: "signal";
|
||||
}
|
||||
program { name: "expand";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.content";
|
||||
target: "efl.content";
|
||||
transition: DECELERATE 0.3;
|
||||
after: "signal";
|
||||
}
|
||||
|
|
@ -140,7 +140,7 @@ group { name: "efl/frame";
|
|||
script {
|
||||
new st[31];
|
||||
new Float:vl;
|
||||
get_state(PART:"elm.swallow.content", st, 30, vl);
|
||||
get_state(PART:"efl.content", st, 30, vl);
|
||||
if (!strcmp(st, "default"))
|
||||
run_program(PROGRAM:"collapse");
|
||||
else
|
||||
|
|
@ -152,15 +152,15 @@ group { name: "efl/frame";
|
|||
script {
|
||||
new st[31];
|
||||
new Float:vl;
|
||||
get_state(PART:"elm.swallow.content", st, 30, vl);
|
||||
get_state(PART:"efl.content", st, 30, vl);
|
||||
if (!strcmp(st, "default"))
|
||||
set_state(PART:"elm.swallow.content", "collapsed", 0.0);
|
||||
set_state(PART:"efl.content", "collapsed", 0.0);
|
||||
else
|
||||
set_state(PART:"elm.swallow.content", "default", 0.0);
|
||||
set_state(PART:"efl.content", "default", 0.0);
|
||||
}
|
||||
}
|
||||
program { name: "signal";
|
||||
action: SIGNAL_EMIT "elm,anim,done" "elm";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ group { "efl/navigation_bar";
|
|||
desc { "default";
|
||||
}
|
||||
}
|
||||
swallow { "back_button";
|
||||
swallow { "efl.back_button";
|
||||
desc { "default";
|
||||
fixed: 1 0;
|
||||
min: 0 0;
|
||||
|
|
@ -32,14 +32,14 @@ group { "efl/navigation_bar";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
swallow { "left_content";
|
||||
swallow { "efl.left_content";
|
||||
desc { "default";
|
||||
rel.to: "base";
|
||||
rel2.relative: 0.0 1.0;
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
}
|
||||
swallow { "right_content";
|
||||
swallow { "efl.right_content";
|
||||
desc { "default";
|
||||
rel.to: "base";
|
||||
rel1.relative: 1.0 0.0;
|
||||
|
|
@ -49,23 +49,23 @@ group { "efl/navigation_bar";
|
|||
spacer { "text_base";
|
||||
desc { "default";
|
||||
rel1 {
|
||||
to: "back_button";
|
||||
to: "efl.back_button";
|
||||
relative: 1.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to: "right_content";
|
||||
to: "efl.right_content";
|
||||
relative: 0.0 1.0;
|
||||
}
|
||||
}
|
||||
desc { "left_content";
|
||||
inherit: "default";
|
||||
rel1 {
|
||||
to: "left_content";
|
||||
to: "efl.left_content";
|
||||
relative: 1.0 0.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
textblock { "text";
|
||||
textblock { "efl.text";
|
||||
scale;
|
||||
desc { "default";
|
||||
text {
|
||||
|
|
@ -78,12 +78,12 @@ group { "efl/navigation_bar";
|
|||
program {
|
||||
signal: "elm,state,back_button,visible"; source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "back_button";
|
||||
target: "efl.back_button";
|
||||
}
|
||||
program {
|
||||
signal: "elm,state,back_button,hidden"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "back_button";
|
||||
target: "efl.back_button";
|
||||
}
|
||||
program {
|
||||
signal: "elm,state,left_content,visible"; source: "elm";
|
||||
|
|
@ -104,7 +104,7 @@ group { name: "efl/navigation_bar/back_button";
|
|||
images.image: "icon_arrow_left.png" COMP;
|
||||
parts {
|
||||
image { name: "icon_arrow_left";
|
||||
insert_before: "elm.swallow.content";
|
||||
insert_before: "efl.content";
|
||||
desc { "default";
|
||||
image.normal: "icon_arrow_left.png";
|
||||
fill.smooth: 0;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ group { "efl/navigation_layout";
|
|||
desc { "default";
|
||||
}
|
||||
}
|
||||
swallow { "bar";
|
||||
swallow { "efl.bar";
|
||||
desc { "default";
|
||||
fixed: 0 1;
|
||||
min: 0 40;
|
||||
|
|
@ -13,11 +13,11 @@ group { "efl/navigation_layout";
|
|||
align: 0.5 0.0;
|
||||
}
|
||||
}
|
||||
swallow { "content";
|
||||
swallow { "efl.content";
|
||||
desc { "default";
|
||||
rel1 {
|
||||
to_x: "base";
|
||||
to_y: "bar";
|
||||
to_y: "efl.bar";
|
||||
relative: 0.0 1.0;
|
||||
}
|
||||
rel2.to_x: "base";
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@ group { "efl/pager";
|
|||
desc { "default";
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.background";
|
||||
swallow { "efl.background";
|
||||
scale;
|
||||
desc { "default";
|
||||
}
|
||||
}
|
||||
swallow { "page_root";
|
||||
swallow { "efl.page_root";
|
||||
scale;
|
||||
desc { "default";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel1.to: "indicator";
|
||||
rel1.to: "efl.indicator";
|
||||
}
|
||||
}
|
||||
swallow { "indicator";
|
||||
swallow { "efl.indicator";
|
||||
scale;
|
||||
desc { "default";
|
||||
rel2.relative: 1.0 0.0;
|
||||
|
|
@ -25,7 +25,7 @@ group { "efl/pager";
|
|||
min: 0 50;
|
||||
}
|
||||
}
|
||||
swallow { "event";
|
||||
swallow { "efl.event";
|
||||
scale;
|
||||
repeat_events: 1;
|
||||
desc { "default";
|
||||
|
|
|
|||
|
|
@ -18,9 +18,11 @@
|
|||
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" "efl.left";
|
||||
alias: "second" "efl.right";
|
||||
alias: "left" "efl.left";
|
||||
alias: "right" "efl.right";
|
||||
|
||||
part { name: "whole"; type: SPACER;
|
||||
description { state: "default" 0.0;
|
||||
|
|
@ -54,35 +56,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: "efl.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: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel1.offset: 3 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.left"; type: SWALLOW;
|
||||
part { name: "efl.left"; type: SWALLOW;
|
||||
clip_to: "whole_left";
|
||||
description { state: "default" 0.0;
|
||||
rel2.to_x: "elm.bar";
|
||||
rel2.to_x: "efl.bar";
|
||||
rel2.relative: 1.0 1.0;
|
||||
rel2.offset: -4 -1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.right"; type: SWALLOW;
|
||||
part { name: "efl.right"; type: SWALLOW;
|
||||
clip_to: "whole_right";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to_x: "elm.bar";
|
||||
rel1.to_x: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel1.offset: 3 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.bar"; type: SPACER;
|
||||
part { name: "efl.bar"; type: SPACER;
|
||||
dragable { confine: "sub_whole";
|
||||
x: 1 1 1;
|
||||
y: 0 0 0;
|
||||
|
|
@ -98,28 +100,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: "efl.bar";
|
||||
rel2.to: "efl.bar";
|
||||
FIXED_SIZE(4, 14)
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.event"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.bar";
|
||||
rel2.to: "efl.bar";
|
||||
}
|
||||
}
|
||||
part { name: "bar"; type: RECT;
|
||||
dragable.events: "elm.bar";
|
||||
dragable.events: "efl.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: "efl.event";
|
||||
rel2.to_x: "efl.event";
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
|
|
@ -157,9 +159,11 @@ 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" "efl.left";
|
||||
alias: "second" "efl.right";
|
||||
alias: "left" "efl.left";
|
||||
alias: "right" "efl.right";
|
||||
|
||||
part { name: "whole"; type: SPACER;
|
||||
description { state: "default" 0.0;
|
||||
|
|
@ -193,35 +197,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: "efl.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: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel1.offset: 0 3;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.left"; type: SWALLOW;
|
||||
part { name: "efl.left"; type: SWALLOW;
|
||||
clip_to: "whole_left";
|
||||
description { state: "default" 0.0;
|
||||
rel2.to_y: "elm.bar";
|
||||
rel2.to_y: "efl.bar";
|
||||
rel2.relative: 1.0 1.0;
|
||||
rel2.offset: -1 -4;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.right"; type: SWALLOW;
|
||||
part { name: "efl.right"; type: SWALLOW;
|
||||
clip_to: "whole_right";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to_y: "elm.bar";
|
||||
rel1.to_y: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel1.offset: 0 3;
|
||||
}
|
||||
}
|
||||
part { name: "elm.bar"; type: SPACER;
|
||||
part { name: "efl.bar"; type: SPACER;
|
||||
dragable { confine: "sub_whole";
|
||||
x: 0 0 0;
|
||||
y: 1 1 1;
|
||||
|
|
@ -237,28 +241,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: "efl.bar";
|
||||
rel2.to: "efl.bar";
|
||||
FIXED_SIZE(14, 4)
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.event"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.bar";
|
||||
rel2.to: "efl.bar";
|
||||
}
|
||||
}
|
||||
part { name: "bar"; type: RECT;
|
||||
dragable.events: "elm.bar";
|
||||
dragable.events: "efl.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: "efl.event";
|
||||
rel2.to_y: "efl.event";
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
|
|
@ -329,33 +333,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: "efl.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: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.left"; type: SWALLOW;
|
||||
part { name: "efl.left"; type: SWALLOW;
|
||||
clip_to: "whole_left";
|
||||
description { state: "default" 0.0;
|
||||
rel2.to_x: "elm.bar";
|
||||
rel2.to_x: "efl.bar";
|
||||
rel2.relative: 1.0 1.0;
|
||||
fixed: 1 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.right"; type: SWALLOW;
|
||||
part { name: "efl.right"; type: SWALLOW;
|
||||
clip_to: "whole_right";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to_x: "elm.bar";
|
||||
rel1.to_x: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
fixed: 1 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.bar"; type: SPACER;
|
||||
part { name: "efl.bar"; type: SPACER;
|
||||
dragable { confine: "sub_whole";
|
||||
x: 1 1 1;
|
||||
y: 0 0 0;
|
||||
|
|
@ -368,24 +372,24 @@ group { name: "efl/panes/vertical:flush";
|
|||
rel2.relative: 1.0 0.5;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.event"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.bar";
|
||||
rel2.to: "efl.bar";
|
||||
}
|
||||
}
|
||||
part { name: "bar"; type: RECT;
|
||||
dragable.events: "elm.bar";
|
||||
dragable.events: "efl.bar";
|
||||
description { state: "default" 0.0;
|
||||
min: PANEMIN PANEWID;
|
||||
max: 99999 99999;
|
||||
fixed: 1 1;
|
||||
rel1.to_x: "elm.swallow.event";
|
||||
rel1.to_x: "efl.event";
|
||||
rel1.relative: 0.0 0.25;
|
||||
rel2.to_x: "elm.swallow.event";
|
||||
rel2.to_x: "efl.event";
|
||||
rel2.relative: 1.0 0.75;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
|
|
@ -399,7 +403,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 1.0 0.5;
|
||||
}
|
||||
|
|
@ -412,7 +416,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
|
|
@ -425,7 +429,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 1.0 0.5;
|
||||
}
|
||||
|
|
@ -439,7 +443,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
|
|
@ -557,33 +561,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: "efl.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: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.left"; type: SWALLOW;
|
||||
part { name: "efl.left"; type: SWALLOW;
|
||||
clip_to: "whole_left";
|
||||
description { state: "default" 0.0;
|
||||
rel2.to_y: "elm.bar";
|
||||
rel2.to_y: "efl.bar";
|
||||
rel2.relative: 1.0 1.0;
|
||||
fixed: 0 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.right"; type: SWALLOW;
|
||||
part { name: "efl.right"; type: SWALLOW;
|
||||
clip_to: "whole_right";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to_y: "elm.bar";
|
||||
rel1.to_y: "efl.bar";
|
||||
rel1.relative: 0.0 0.0;
|
||||
fixed: 0 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.bar"; type: SPACER;
|
||||
part { name: "efl.bar"; type: SPACER;
|
||||
dragable { confine: "sub_whole";
|
||||
x: 0 0 0;
|
||||
y: 1 1 1;
|
||||
|
|
@ -596,24 +600,24 @@ group { name: "efl/panes/horizontal:flush";
|
|||
rel2.relative: 0.5 1.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.event"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.bar";
|
||||
rel2.to: "efl.bar";
|
||||
}
|
||||
}
|
||||
part { name: "bar"; type: RECT;
|
||||
dragable.events: "elm.bar";
|
||||
dragable.events: "efl.bar";
|
||||
description { state: "default" 0.0;
|
||||
min: PANEWID PANEMIN;
|
||||
max: 99999 99999;
|
||||
fixed: 1 1;
|
||||
rel1.to_y: "elm.swallow.event";
|
||||
rel1.to_y: "efl.event";
|
||||
rel1.relative: 0.25 0.0;
|
||||
rel2.to_y: "elm.swallow.event";
|
||||
rel2.to_y: "efl.event";
|
||||
rel2.relative: 0.75 1.0;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
|
|
@ -627,7 +631,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 0.5 1.0;
|
||||
}
|
||||
|
|
@ -640,7 +644,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 0.5 0.0;
|
||||
}
|
||||
|
|
@ -653,7 +657,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 0.5 1.0;
|
||||
}
|
||||
|
|
@ -667,7 +671,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: "efl.bar";
|
||||
color: 255 255 255 0;
|
||||
align: 0.5 0.0;
|
||||
}
|
||||
|
|
@ -796,15 +800,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:"efl.bar", dx, dy);
|
||||
set_float(drag_x, dx);
|
||||
set_drag(PART:"elm.bar", 0.0, 0.5);
|
||||
set_drag(PART:"efl.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:"efl.bar", get_float(drag_x), 0.5);
|
||||
set_state(PART:"dots", "default", 0.0);
|
||||
}
|
||||
}
|
||||
|
|
@ -859,15 +863,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:"efl.bar", dx, dy);
|
||||
set_float(drag_x, dx);
|
||||
set_drag(PART:"elm.bar", 1.0, 0.5);
|
||||
set_drag(PART:"efl.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:"efl.bar", get_float(drag_x), 0.5);
|
||||
set_state(PART:"dots", "default", 0.0);
|
||||
}
|
||||
}
|
||||
|
|
@ -922,15 +926,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:"efl.bar", dx, dy);
|
||||
set_float(drag_y, dy);
|
||||
set_drag(PART:"elm.bar", 0.5, 0.0);
|
||||
set_drag(PART:"efl.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:"efl.bar", 0.5, get_float(drag_y));
|
||||
set_state(PART:"dots", "default", 0.0);
|
||||
}
|
||||
}
|
||||
|
|
@ -985,15 +989,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:"efl.bar", dx, dy);
|
||||
set_float(drag_y, dy);
|
||||
set_drag(PART:"elm.bar", 0.5, 1.0);
|
||||
set_drag(PART:"efl.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:"efl.bar", 0.5, get_float(drag_y));
|
||||
set_state(PART:"dots", "default", 0.0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ group { name: "efl/pointer";
|
|||
}
|
||||
}
|
||||
part {
|
||||
name: "elm.swallow.hotspot";
|
||||
name: "efl.hotspot";
|
||||
/* this is a "fake" swallow part
|
||||
* that is used by e to determine
|
||||
* the pointer hotspot - or where
|
||||
|
|
@ -218,4 +218,4 @@ group { name: "efl/pointer:top_side";
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ group { "efl/popup";
|
|||
image.normal: "rounded_square.png";
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.content";
|
||||
swallow { "efl.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" "efl.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 { "efl.text.title";
|
||||
scale;
|
||||
desc { "default";
|
||||
fixed: 1 1;
|
||||
|
|
@ -72,7 +72,7 @@ group { "efl/popup_alert";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
swallow { "buttons";
|
||||
swallow { "efl.buttons";
|
||||
desc { "default";
|
||||
fixed: 0 1;
|
||||
rel.to: "base";
|
||||
|
|
@ -85,12 +85,12 @@ group { "efl/popup_alert";
|
|||
min: 0 30;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.content";
|
||||
swallow { "efl.content";
|
||||
desc { "default";
|
||||
rel1.to_x: "base";
|
||||
rel1.to_y: "title_bg";
|
||||
rel2.to_x: "base";
|
||||
rel2.to_y: "buttons";
|
||||
rel2.to_y: "efl.buttons";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel2.relative: 1.0 0.0;
|
||||
}
|
||||
|
|
@ -101,12 +101,12 @@ 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: "efl.text.title";
|
||||
}
|
||||
program {
|
||||
signal: "elm,buttons,show"; source: "elm";
|
||||
action: STATE_SET "button_visible" 0.0;
|
||||
target: "buttons";
|
||||
target: "efl.buttons";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -125,17 +125,17 @@ group { "efl/popup/backwall";
|
|||
desc { "default";
|
||||
color: 0 0 0 64;
|
||||
}
|
||||
desc { "show_image";
|
||||
desc { "content_visible";
|
||||
inherit: "default";
|
||||
hid;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.image";
|
||||
swallow { "efl.content";
|
||||
desc { "default";
|
||||
rel.to: "base";
|
||||
hid;
|
||||
}
|
||||
desc { "show_image";
|
||||
desc { "content_visible";
|
||||
inherit: "default";
|
||||
vis;
|
||||
}
|
||||
|
|
@ -150,16 +150,16 @@ group { "efl/popup/backwall";
|
|||
|
||||
programs {
|
||||
program {
|
||||
signal: "elm,state,image,visible"; source: "elm";
|
||||
action: STATE_SET "show_image" 0.0;
|
||||
signal: "elm,state,content,set"; source: "elm";
|
||||
action: STATE_SET "content_visible" 0.0;
|
||||
target: "base";
|
||||
target: "elm.swallow.image";
|
||||
target: "efl.content";
|
||||
}
|
||||
program {
|
||||
signal: "elm,state,image,hidden"; source: "elm";
|
||||
signal: "elm,state,content,unset"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "base";
|
||||
target: "elm.swallow.image";
|
||||
target: "efl.content";
|
||||
}
|
||||
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 { "efl.button1";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -188,13 +188,13 @@ group { "efl/popup_alert/button_layout2";
|
|||
min: 5 5;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.button1";
|
||||
swallow { "efl.button1";
|
||||
desc { "default";
|
||||
rel2.to_x: "div1";
|
||||
rel2.relative: 0.0 1.0;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.button2";
|
||||
swallow { "efl.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 { "efl.button1";
|
||||
desc { "default";
|
||||
rel2.to_x: "div1";
|
||||
rel2.relative: 0.0 1.0;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.button2";
|
||||
swallow { "efl.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 { "efl.button3";
|
||||
desc { "default";
|
||||
rel1.to_x: "div2";
|
||||
rel1.relative: 1.0 0.0;
|
||||
|
|
@ -250,24 +250,24 @@ group { "efl/popup_alert/button";
|
|||
alias: "efl/popup_alert_text/button";
|
||||
}
|
||||
|
||||
group { name: "efl/popup_alert_scroll/scroller";
|
||||
group { "efl/popup_alert_scroll/scroller";
|
||||
inherit: "efl/scroller";
|
||||
alias: "efl/popup_alert_text/scroller";
|
||||
parts {
|
||||
part { name: "elm.swallow.content"; type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
swallow { "efl.content";
|
||||
desc { "default";
|
||||
rel1.offset: 0 0;
|
||||
rel2.offset: 0 0;
|
||||
}
|
||||
}
|
||||
part { name: "inset";
|
||||
description { state: "default" 0.0;
|
||||
visible: 0;
|
||||
spacer { "inset";
|
||||
desc { "default";
|
||||
hid;
|
||||
}
|
||||
}
|
||||
part { name: "shadow";
|
||||
description { state: "default" 0.0;
|
||||
visible: 0;
|
||||
spacer { "shadow";
|
||||
desc { "default";
|
||||
hid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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:"efl.text", "visible", 0.0);
|
||||
} else {
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.text", "disabled_visible", 0.0);
|
||||
}
|
||||
} else {
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.text", "default", 0.0);
|
||||
}
|
||||
if (ic) {
|
||||
set_state(PART:"elm.swallow.content", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.content";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.offset: -1 2;
|
||||
rel2.to_x: "elm.swallow.content";
|
||||
rel2.to_x: "efl.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: "efl.text";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.offset: 3 3;
|
||||
rel2.offset: -4 -4;
|
||||
|
|
@ -222,13 +222,13 @@ group { "efl/progressbar/horizontal";
|
|||
image.border_scale_by: 0.25; image.border_scale: 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
|
||||
part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "inside";
|
||||
rel2.to: "inside";
|
||||
}
|
||||
}
|
||||
part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
|
||||
part { name: "efl.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: "efl.cur.progressbar";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel2.to_x: "elm.cur.progressbar";
|
||||
rel2.to_x: "efl.cur.progressbar";
|
||||
rel2.relative: 1.0 1.0;
|
||||
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: "efl.text.status"; type: TEXT; mouse_events: 0;
|
||||
scale: 1;
|
||||
effect: GLOW;
|
||||
description { state: "default" 0.0;
|
||||
|
|
@ -414,11 +414,11 @@ group { "efl/progressbar/horizontal";
|
|||
target: "light";
|
||||
}
|
||||
program { name: "drag-set";
|
||||
signal: "drag,set"; source: "elm.cur.progressbar";
|
||||
signal: "drag,set"; source: "efl.cur.progressbar";
|
||||
script {
|
||||
new a, Float:dx, Float:dy, Float:vl, st[20];
|
||||
|
||||
get_drag(PART:"elm.cur.progressbar", dx, dy);
|
||||
get_drag(PART:"efl.cur.progressbar", dx, dy);
|
||||
get_state(PART:"bar", st, 19, vl);
|
||||
if (!strcmp(st, "inv")) {
|
||||
a = round(((1.0 - dx) * 255) / 0.2);
|
||||
|
|
@ -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: "efl.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: "efl.text.status";
|
||||
after: "pulse-stop";
|
||||
}
|
||||
program { name: "elmpulse-stop";
|
||||
|
|
@ -496,15 +496,15 @@ 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: "efl.text.status";
|
||||
}
|
||||
program { name: "units-hidden";
|
||||
signal: "elm,state,units,hidden"; source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "elm.text.status";
|
||||
target: "efl.text.status";
|
||||
}
|
||||
program { name: "text-visible";
|
||||
signal: "elm,state,elm.text,set"; source: "elm";
|
||||
signal: "elm,state,text,set"; source: "elm";
|
||||
script {
|
||||
new m = get_int(slmode);
|
||||
m |= LABEL; set_int(slmode, m);
|
||||
|
|
@ -512,7 +512,7 @@ group { "efl/progressbar/horizontal";
|
|||
}
|
||||
}
|
||||
program { name: "text-hidden";
|
||||
signal: "elm,state,elm.text,unset"; source: "elm";
|
||||
signal: "elm,state,text,unset"; source: "elm";
|
||||
script {
|
||||
new m = get_int(slmode);
|
||||
m &= ~LABEL; set_int(slmode, m);
|
||||
|
|
@ -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:"efl.text", "visible", 0.0);
|
||||
} else {
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.text", "disabled_visible", 0.0);
|
||||
}
|
||||
} else {
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.text", "default", 0.0);
|
||||
}
|
||||
if (ic) {
|
||||
set_state(PART:"elm.swallow.content", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.content";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel1.offset: 2 -1;
|
||||
rel2.to_y: "elm.swallow.content";
|
||||
rel2.to_y: "efl.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: "efl.text";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel1.offset: 3 3;
|
||||
rel2.offset: -4 -4;
|
||||
|
|
@ -782,13 +782,13 @@ group { "efl/progressbar/vertical";
|
|||
image.border_scale_by: 0.25; image.border_scale: 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
|
||||
part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "inside";
|
||||
rel2.to: "inside";
|
||||
}
|
||||
}
|
||||
part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
|
||||
part { name: "efl.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: "efl.cur.progressbar";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel2.to_y: "elm.cur.progressbar";
|
||||
rel2.to_y: "efl.cur.progressbar";
|
||||
rel2.relative: 1.0 1.0;
|
||||
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: "efl.text.status"; type: TEXT; mouse_events: 0;
|
||||
scale: 1;
|
||||
effect: GLOW;
|
||||
description { state: "default" 0.0;
|
||||
|
|
@ -987,11 +987,11 @@ group { "efl/progressbar/vertical";
|
|||
target: "light";
|
||||
}
|
||||
program { name: "drag-set";
|
||||
signal: "drag,set"; source: "elm.cur.progressbar";
|
||||
signal: "drag,set"; source: "efl.cur.progressbar";
|
||||
script {
|
||||
new a, Float:dx, Float:dy, Float:vl, st[20];
|
||||
|
||||
get_drag(PART:"elm.cur.progressbar", dx, dy);
|
||||
get_drag(PART:"efl.cur.progressbar", dx, dy);
|
||||
get_state(PART:"bar", st, 19, vl);
|
||||
if (!strcmp(st, "inv")) {
|
||||
a = round(((1.0 - dy) * 255) / 0.2);
|
||||
|
|
@ -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: "efl.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: "efl.text.status";
|
||||
after: "pulse-stop";
|
||||
}
|
||||
program { name: "elmpulsestop";
|
||||
|
|
@ -1069,15 +1069,15 @@ 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: "efl.text.status";
|
||||
}
|
||||
program { name: "unit-hidden";
|
||||
signal: "elm,state,units,hidden"; source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "elm.text.status";
|
||||
target: "efl.text.status";
|
||||
}
|
||||
program { name: "text-visible";
|
||||
signal: "elm,state,elm.text,set"; source: "elm";
|
||||
signal: "elm,state,text,set"; source: "elm";
|
||||
script {
|
||||
new m = get_int(slmode);
|
||||
m |= LABEL; set_int(slmode, m);
|
||||
|
|
@ -1085,7 +1085,7 @@ group { "efl/progressbar/vertical";
|
|||
}
|
||||
}
|
||||
program { name: "text-hidden";
|
||||
signal: "elm,state,elm.text,unset"; source: "elm";
|
||||
signal: "elm,state,text,unset"; source: "elm";
|
||||
script {
|
||||
new m = get_int(slmode);
|
||||
m &= ~LABEL; set_int(slmode, m);
|
||||
|
|
@ -1136,14 +1136,14 @@ group { "efl/progressbar/horizontal:wheel";
|
|||
images.image: "knob_round_busy.png" COMP;
|
||||
images.image: "glow_round_corners.png" COMP;
|
||||
parts {
|
||||
part { name: "elm.swallow.bar" ; type: SWALLOW; mouse_events: 0;
|
||||
part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
min: 0 0;
|
||||
max: 0 0;
|
||||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.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: "efl.cur.progressbar1";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel2.to_x: "elm.cur.progressbar1";
|
||||
rel2.to_x: "efl.cur.progressbar1";
|
||||
rel2.relative: 1.0 1.0;
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
|
|
@ -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: "efl.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: "efl.cur.progressbar1";
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel2.to_y: "elm.cur.progressbar1";
|
||||
rel2.to_y: "efl.cur.progressbar1";
|
||||
rel2.relative: 1.0 1.0;
|
||||
align: 0.5 0.0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "visible", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "visible", 0.0);
|
||||
set_state(PART:"sizer.content", "icononly", 0.0);
|
||||
set_state(PART:"elm.text", "disabled", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "disabled_visible", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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:"efl.content", "default", 0.0);
|
||||
set_state(PART:"sizer.content", "default", 0.0);
|
||||
set_state(PART:"elm.text", "default", 0.0);
|
||||
set_state(PART:"efl.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: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.content";
|
||||
rel2.to: "efl.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: "efl.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: "efl.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: "elm,state,text,set"; source: "elm";
|
||||
script {
|
||||
new m = get_int(btmode);
|
||||
m |= LABEL; set_int(btmode, m);
|
||||
|
|
@ -245,7 +245,7 @@ group { "efl/radio";
|
|||
}
|
||||
}
|
||||
program {
|
||||
signal: "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);
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ group { name: "efl/scroller";
|
|||
rel1.relative: 0.0 1.0;
|
||||
rel1.to: "sb_vbar_a1";
|
||||
rel2.relative: 1.0 0.0;
|
||||
rel2.to: "elm.dragable.vbar";
|
||||
rel2.to: "efl.dragable.vbar";
|
||||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -164,13 +164,13 @@ group { name: "efl/scroller";
|
|||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
rel1.relative: 0.0 1.0;
|
||||
rel1.to: "elm.dragable.vbar";
|
||||
rel1.to: "efl.dragable.vbar";
|
||||
rel2.relative: 1.0 0.0;
|
||||
rel2.to: "sb_vbar_a2";
|
||||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.dragable.vbar"; type: RECT;
|
||||
part { name: "efl.dragable.vbar"; type: RECT;
|
||||
clip_to: "sb_vbar";
|
||||
scale: 1;
|
||||
dragable.x: 0 0 0;
|
||||
|
|
@ -218,8 +218,8 @@ group { name: "efl/scroller";
|
|||
max: 4 2;
|
||||
fixed: 1 1;
|
||||
align: 0.0 0.0;
|
||||
rel1.to: "elm.dragable.vbar";
|
||||
rel2.to: "elm.dragable.vbar";
|
||||
rel1.to: "efl.dragable.vbar";
|
||||
rel2.to: "efl.dragable.vbar";
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
|
|
@ -252,8 +252,8 @@ group { name: "efl/scroller";
|
|||
max: 4 2;
|
||||
fixed: 1 1;
|
||||
align: 0.0 1.0;
|
||||
rel1.to: "elm.dragable.vbar";
|
||||
rel2.to: "elm.dragable.vbar";
|
||||
rel1.to: "efl.dragable.vbar";
|
||||
rel2.to: "efl.dragable.vbar";
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
|
|
@ -304,7 +304,7 @@ group { name: "efl/scroller";
|
|||
action: STATE_SET "default" 0.0;
|
||||
target: "sb_vbar";
|
||||
target: "sb_vbar_show";
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
target: "sb_vbar_a1";
|
||||
target: "sb_vbar_a2";
|
||||
target: "y_vbar_up_mapper";
|
||||
|
|
@ -320,7 +320,7 @@ group { name: "efl/scroller";
|
|||
action: STATE_SET "hidden" 0.0;
|
||||
target: "sb_vbar";
|
||||
target: "sb_vbar_show";
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
target: "sb_vbar_a1";
|
||||
target: "sb_vbar_a2";
|
||||
target: "y_vbar_up_mapper";
|
||||
|
|
@ -344,7 +344,7 @@ group { name: "efl/scroller";
|
|||
}
|
||||
program { name: "drag_up";
|
||||
action: DRAG_VAL_STEP 0.0 -1.0;
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
|
||||
|
|
@ -360,17 +360,17 @@ group { name: "efl/scroller";
|
|||
}
|
||||
program { name: "drag_down";
|
||||
action: DRAG_VAL_STEP 0.0 1.0;
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "sb_vbar_p1";
|
||||
action: DRAG_VAL_PAGE 0.0 -1.0;
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "sb_vbar_p2";
|
||||
action: DRAG_VAL_PAGE 0.0 1.0;
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
}
|
||||
program {
|
||||
signal: "elm,action,scroll"; source: "elm";
|
||||
|
|
@ -442,7 +442,7 @@ group { name: "efl/scroller";
|
|||
rel1.relative: 1.0 0.0;
|
||||
rel1.to: "sb_hbar_a1";
|
||||
rel2.relative: 0.0 1.0;
|
||||
rel2.to: "elm.dragable.hbar";
|
||||
rel2.to: "efl.dragable.hbar";
|
||||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -451,13 +451,13 @@ group { name: "efl/scroller";
|
|||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.to: "elm.dragable.hbar";
|
||||
rel1.to: "efl.dragable.hbar";
|
||||
rel2.relative: 0.0 1.0;
|
||||
rel2.to: "sb_hbar_a2";
|
||||
fixed: 1 1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.dragable.hbar"; type: RECT;
|
||||
part { name: "efl.dragable.hbar"; type: RECT;
|
||||
clip_to: "sb_hbar";
|
||||
scale: 1;
|
||||
dragable.x: 1 1 0;
|
||||
|
|
@ -505,8 +505,8 @@ group { name: "efl/scroller";
|
|||
max: 2 4;
|
||||
fixed: 1 1;
|
||||
align: 0.0 1.0;
|
||||
rel1.to: "elm.dragable.hbar";
|
||||
rel2.to: "elm.dragable.hbar";
|
||||
rel1.to: "efl.dragable.hbar";
|
||||
rel2.to: "efl.dragable.hbar";
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
|
|
@ -539,8 +539,8 @@ group { name: "efl/scroller";
|
|||
max: 2 4;
|
||||
fixed: 1 1;
|
||||
align: 1.0 1.0;
|
||||
rel1.to: "elm.dragable.hbar";
|
||||
rel2.to: "elm.dragable.hbar";
|
||||
rel1.to: "efl.dragable.hbar";
|
||||
rel2.to: "efl.dragable.hbar";
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
|
|
@ -591,7 +591,7 @@ group { name: "efl/scroller";
|
|||
action: STATE_SET "default" 0.0;
|
||||
target: "sb_hbar";
|
||||
target: "sb_hbar_show";
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
target: "sb_hbar_a1";
|
||||
target: "sb_hbar_a2";
|
||||
target: "x_hbar_left_mapper";
|
||||
|
|
@ -607,7 +607,7 @@ group { name: "efl/scroller";
|
|||
action: STATE_SET "hidden" 0.0;
|
||||
target: "sb_hbar";
|
||||
target: "sb_hbar_show";
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
target: "sb_hbar_a1";
|
||||
target: "sb_hbar_a2";
|
||||
target: "x_hbar_left_mapper";
|
||||
|
|
@ -631,7 +631,7 @@ group { name: "efl/scroller";
|
|||
}
|
||||
program { name: "drag_left";
|
||||
action: DRAG_VAL_STEP -1.0 0.0;
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "sb_hbar_a2";
|
||||
|
|
@ -647,18 +647,18 @@ group { name: "efl/scroller";
|
|||
}
|
||||
program { name: "drag_right";
|
||||
action: DRAG_VAL_STEP 1.0 0.0;
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "sb_hbar_p1";
|
||||
action: DRAG_VAL_PAGE -1.0 0.0;
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
after: "check_pos_hbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "sb_hbar_p2";
|
||||
action: DRAG_VAL_PAGE 1.0 0.0;
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
after: "check_pos_hbar";
|
||||
}
|
||||
program {
|
||||
|
|
@ -688,8 +688,8 @@ group { name: "efl/scroller";
|
|||
}
|
||||
part { name: "bg"; type: RECT;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.swallow.background";
|
||||
rel2.to: "elm.swallow.background";
|
||||
rel1.to: "efl.background";
|
||||
rel2.to: "efl.background";
|
||||
// color: 64 64 64 200;
|
||||
color: 0 0 0 0;
|
||||
color_class: "scroller_bg";
|
||||
|
|
@ -697,11 +697,11 @@ group { name: "efl/scroller";
|
|||
}
|
||||
part { name: "clipper"; type: RECT;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.swallow.background";
|
||||
rel2.to: "elm.swallow.background";
|
||||
rel1.to: "efl.background";
|
||||
rel2.to: "efl.background";
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.background"; type: SWALLOW;
|
||||
part { name: "efl.background"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 1 1;
|
||||
|
|
@ -711,7 +711,7 @@ group { name: "efl/scroller";
|
|||
rel2.to_y: "sb_hbar";
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content"; type: SWALLOW;
|
||||
part { name: "efl.content"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 1 1;
|
||||
|
|
@ -744,11 +744,11 @@ group { name: "efl/scroller";
|
|||
color: 255 255 255 128;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.overlay"; type: SWALLOW;
|
||||
part { name: "efl.overlay"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.swallow.content";
|
||||
rel2.to: "elm.swallow.content";
|
||||
rel1.to: "efl.content";
|
||||
rel2.to: "efl.content";
|
||||
}
|
||||
}
|
||||
part { name: "runner_vbar"; mouse_events: 0;
|
||||
|
|
@ -915,9 +915,9 @@ group { name: "efl/scroller";
|
|||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
rel1.offset: 2 0;
|
||||
rel1.to: "elm.dragable.vbar";
|
||||
rel1.to: "efl.dragable.vbar";
|
||||
rel2.offset: -3 -1;
|
||||
rel2.to: "elm.dragable.vbar";
|
||||
rel2.to: "efl.dragable.vbar";
|
||||
image.normal: "vgrad_med_lighter.png";
|
||||
fill.smooth: 0;
|
||||
min: 3 13;
|
||||
|
|
@ -1076,9 +1076,9 @@ group { name: "efl/scroller";
|
|||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
rel1.offset: 0 2;
|
||||
rel1.to: "elm.dragable.hbar";
|
||||
rel1.to: "efl.dragable.hbar";
|
||||
rel2.offset: -1 -3;
|
||||
rel2.to: "elm.dragable.hbar";
|
||||
rel2.to: "efl.dragable.hbar";
|
||||
image.normal: "vgrad_med_lighter.png";
|
||||
fill.smooth: 0;
|
||||
min: 13 3;
|
||||
|
|
@ -1133,51 +1133,51 @@ group { name: "efl/scroller";
|
|||
}
|
||||
programs {
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "elm.dragable.vbar";
|
||||
signal: "mouse,down,1*"; source: "efl.dragable.vbar";
|
||||
action: STATE_SET "clicked" 0.0;
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
target: "shadow_vbar";
|
||||
target: "glow_vbar";
|
||||
target: "center_glow_vbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,*"; source: "elm.dragable.vbar";
|
||||
signal: "mouse,down,*"; source: "efl.dragable.vbar";
|
||||
action: SIGNAL_EMIT "elm,vbar,press" "elm";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,up,1"; source: "elm.dragable.vbar";
|
||||
signal: "mouse,up,1"; source: "efl.dragable.vbar";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.dragable.vbar";
|
||||
target: "efl.dragable.vbar";
|
||||
target: "shadow_vbar";
|
||||
target: "glow_vbar";
|
||||
target: "center_glow_vbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,up,*"; source: "elm.dragable.vbar";
|
||||
signal: "mouse,up,*"; source: "efl.dragable.vbar";
|
||||
action: SIGNAL_EMIT "elm,vbar,unpress" "elm";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,1*"; source: "elm.dragable.hbar";
|
||||
signal: "mouse,down,1*"; source: "efl.dragable.hbar";
|
||||
action: STATE_SET "clicked" 0.0;
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
target: "shadow_hbar";
|
||||
target: "glow_hbar";
|
||||
target: "center_glow_hbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,down,*"; source: "elm.dragable.hbar";
|
||||
signal: "mouse,down,*"; source: "efl.dragable.hbar";
|
||||
action: SIGNAL_EMIT "elm,hbar,press" "elm";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,up,1"; source: "elm.dragable.hbar";
|
||||
signal: "mouse,up,1"; source: "efl.dragable.hbar";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.dragable.hbar";
|
||||
target: "efl.dragable.hbar";
|
||||
target: "shadow_hbar";
|
||||
target: "glow_hbar";
|
||||
target: "center_glow_hbar";
|
||||
}
|
||||
program {
|
||||
signal: "mouse,up,*"; source: "elm.dragable.hbar";
|
||||
signal: "mouse,up,*"; source: "efl.dragable.hbar";
|
||||
action: SIGNAL_EMIT "elm,hbar,unpress" "elm";
|
||||
}
|
||||
program {
|
||||
|
|
@ -1256,13 +1256,13 @@ group { name: "efl/scroller:noclip";
|
|||
rel2.offset: 999999 999999;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.background";
|
||||
part { name: "efl.background";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 0 0;
|
||||
rel2.offset: -1 -1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content";
|
||||
part { name: "efl.content";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 0 1;
|
||||
rel2.offset: -1 -1;
|
||||
|
|
@ -1283,50 +1283,50 @@ group { name: "efl/scroller:noclip";
|
|||
|
||||
group { name: "efl/scroller/contents";
|
||||
parts {
|
||||
part { name: "elm.swallow.content";
|
||||
part { name: "efl.content";
|
||||
type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content_r";
|
||||
part { name: "efl.content_r";
|
||||
type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
rel1 {
|
||||
relative: 1.0 0.0;
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
}
|
||||
rel2 {
|
||||
relative: 2.0 1.0;
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content_b";
|
||||
part { name: "efl.content_b";
|
||||
type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
rel1 {
|
||||
relative: 0.0 1.0;
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
}
|
||||
rel2 {
|
||||
relative: 1.0 2.0;
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content_rb";
|
||||
part { name: "efl.content_rb";
|
||||
type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
rel1 {
|
||||
relative: 1.0 1.0;
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
}
|
||||
rel2 {
|
||||
relative: 2.0 2.0;
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ group { "efl/spin";
|
|||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
text { "elm.text";
|
||||
text { "efl.text";
|
||||
nomouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ group { "efl/spin_button";
|
|||
parts {
|
||||
rect { "clip";
|
||||
desc { "default";
|
||||
rel.to: "elm.swallow.text_button";
|
||||
rel.to: "efl.text_button";
|
||||
}
|
||||
}
|
||||
rect { "bg";
|
||||
|
|
@ -36,12 +36,12 @@ group { "efl/spin_button";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.entry";
|
||||
swallow { "efl.entry";
|
||||
clip: "clip";
|
||||
desc { "default";
|
||||
fixed: 1 1;
|
||||
rel1.to: "elm.swallow.text_button";
|
||||
rel2.to: "elm.swallow.text_button";
|
||||
rel1.to: "efl.text_button";
|
||||
rel2.to: "efl.text_button";
|
||||
hid;
|
||||
}
|
||||
desc { "active";
|
||||
|
|
@ -49,7 +49,7 @@ group { "efl/spin_button";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
swallow { "elm.swallow.dec_button";
|
||||
swallow { "efl.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 { "efl.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 { "efl.text_button";
|
||||
scale;
|
||||
desc { "default";
|
||||
vis;
|
||||
rel1.to_y: "inset";
|
||||
rel1.to_x: "elm.swallow.dec_button";
|
||||
rel1.to_x: "efl.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: "efl.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: "efl.entry";
|
||||
}
|
||||
program { "entry_inactive";
|
||||
signal: "elm,state,entry,inactive";
|
||||
source: "elm";
|
||||
action: STATE_SET "default";
|
||||
target: "elm.swallow.entry";
|
||||
target: "efl.entry";
|
||||
}
|
||||
program { "text_button_active";
|
||||
signal: "elm,state,button,active";
|
||||
source: "elm";
|
||||
action: STATE_SET "default";
|
||||
target: "elm.swallow.text_button";
|
||||
target: "efl.text_button";
|
||||
}
|
||||
program { "text_button_inactive";
|
||||
signal: "elm,state,button,inactive";
|
||||
source: "elm";
|
||||
action: STATE_SET "inactive";
|
||||
target: "elm.swallow.text_button";
|
||||
target: "efl.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 { "efl.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 { "efl.text_button";
|
||||
scale;
|
||||
desc { "default";
|
||||
vis;
|
||||
rel1.to_y: "inset";
|
||||
rel1.to_x: "elm.swallow.dec_button";
|
||||
rel1.to_x: "efl.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: "efl.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 { "efl.dec_button";
|
||||
scale;
|
||||
desc { "default";
|
||||
rel1.to: "inset";
|
||||
|
|
@ -206,308 +206,308 @@ 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");
|
||||
}
|
||||
}
|
||||
part { name: "over";
|
||||
type: RECT;
|
||||
repeat_events: 1;
|
||||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
program { name: "button_press2";
|
||||
action: SIGNAL_EMIT "elm,action,press" "";
|
||||
after: "button_press_anim";
|
||||
}
|
||||
part { name: "disabler";
|
||||
type: RECT;
|
||||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
visible: 0;
|
||||
}
|
||||
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: "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);
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
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");
|
||||
}
|
||||
}
|
||||
}
|
||||
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 { "efl/spin_button/entry";
|
||||
inherit: "efl/text";
|
||||
}
|
||||
|
||||
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";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
description { state: "pressed" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
image.normal: "sym_left_glow_normal.png";
|
||||
}
|
||||
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: "over";
|
||||
type: RECT;
|
||||
repeat_events: 1;
|
||||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
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";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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 { 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";
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
image.normal: "sym_left_dark_normal.png";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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: "efl.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: "over";
|
||||
type: RECT;
|
||||
repeat_events: 1;
|
||||
description { state: "default" 0.0;
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
}
|
||||
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: "efl.text";
|
||||
}
|
||||
program { name: "enable";
|
||||
signal: "elm,state,enabled";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "disabler";
|
||||
target: "efl.text";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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 { "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";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
|
||||
group { "efl/text/scroller";
|
||||
inherit: "efl/scroller";
|
||||
image: "bg_glow_in.png" COMP;
|
||||
parts {
|
||||
part { name: "elm.swallow.background"; type: SWALLOW;
|
||||
part { name: "efl.background"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 1 1;
|
||||
|
|
@ -28,17 +29,17 @@ group { "efl/text/scroller";
|
|||
color: DARK_GREY_BG_COLOR;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content";
|
||||
part { name: "efl.content"; type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.swallow.icon";
|
||||
rel1.to: "efl.icon";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.offset: 0 0;
|
||||
rel2.to: "elm.swallow.end";
|
||||
rel2.to: "efl.end";
|
||||
rel2.relative: 0.0 1.0;
|
||||
rel2.offset: -1 -1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.icon"; type: SWALLOW;
|
||||
part { name: "efl.icon"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
|
@ -59,14 +60,14 @@ group { "efl/text/scroller";
|
|||
program {
|
||||
signal: "elm,action,show,icon"; source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "elm.swallow.icon";
|
||||
target: "efl.icon";
|
||||
}
|
||||
program {
|
||||
signal: "elm,action,hide,icon"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.icon";
|
||||
target: "efl.icon";
|
||||
}
|
||||
part { name: "elm.swallow.end"; type: SWALLOW;
|
||||
part { name: "efl.end"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
|
@ -87,12 +88,12 @@ group { "efl/text/scroller";
|
|||
program {
|
||||
signal: "elm,action,show,end"; source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "elm.swallow.end";
|
||||
target: "efl.end";
|
||||
}
|
||||
program {
|
||||
signal: "elm,action,hide,end"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.end";
|
||||
target: "efl.end";
|
||||
}
|
||||
part { name: "glow";
|
||||
insert_after: "shadow";
|
||||
|
|
@ -182,7 +183,7 @@ group { "efl/text/single/scroller";
|
|||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.dragable.vbar"; type: RECT;
|
||||
part { name: "efl.dragable.vbar"; type: RECT;
|
||||
dragable.x: 0 0 0;
|
||||
dragable.y: 1 1 0;
|
||||
dragable.confine: "sb_vbar_base";
|
||||
|
|
@ -202,7 +203,7 @@ group { "efl/text/single/scroller";
|
|||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.dragable.hbar"; type: RECT;
|
||||
part { name: "efl.dragable.hbar"; type: RECT;
|
||||
dragable.x: 1 1 0;
|
||||
dragable.y: 0 0 0;
|
||||
dragable.confine: "sb_hbar_base";
|
||||
|
|
@ -217,35 +218,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: "efl.background";
|
||||
rel2.to: "efl.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: "efl.background";
|
||||
rel2.to: "efl.background";
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.background"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.content"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.swallow.icon";
|
||||
rel1.to: "efl.icon";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel2.to: "elm.swallow.end";
|
||||
rel2.to: "efl.end";
|
||||
rel2.relative: 0.0 1.0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.icon"; type: SWALLOW;
|
||||
part { name: "efl.icon"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
|
@ -264,14 +265,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: "efl.icon";
|
||||
}
|
||||
program {
|
||||
signal: "elm,action,hide,icon"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.icon";
|
||||
target: "efl.icon";
|
||||
}
|
||||
part { name: "elm.swallow.end"; type: SWALLOW;
|
||||
part { name: "efl.end"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
|
@ -290,12 +291,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: "efl.end";
|
||||
}
|
||||
program {
|
||||
signal: "elm,action,hide,end"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.end";
|
||||
target: "efl.end";
|
||||
}
|
||||
part { name: "inset"; mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
|
|
@ -320,7 +321,7 @@ group { "efl/text/single/scroller";
|
|||
color: 255 255 255 128;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.overlay"; type: SWALLOW;
|
||||
part { name: "efl.overlay"; type: SWALLOW;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 1 1;
|
||||
|
|
@ -422,17 +423,17 @@ group { "efl/text/cursor";
|
|||
}
|
||||
programs {
|
||||
program {
|
||||
signal: "selection,changed"; source: "elm.text";
|
||||
signal: "selection,changed"; source: "efl.text";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "clipper";
|
||||
}
|
||||
program {
|
||||
signal: "selection,cleared"; source: "elm.text";
|
||||
signal: "selection,cleared"; source: "efl.text";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "clipper";
|
||||
}
|
||||
program {
|
||||
signal: "selection,reset"; source: "elm.text";
|
||||
signal: "selection,reset"; source: "efl.text";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "clipper";
|
||||
}
|
||||
|
|
@ -541,17 +542,17 @@ group { "efl/text";
|
|||
}
|
||||
}
|
||||
parts {
|
||||
part { name: "elm.swallow.background"; type: SWALLOW;
|
||||
part { name: "efl.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: "efl.guide"; type: TEXTBLOCK; mouse_events: 0;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.text";
|
||||
rel2.to: "elm.text";
|
||||
rel1.to: "efl.text";
|
||||
rel2.to: "efl.text";
|
||||
text { style: "efl_ui_text_guide_style";
|
||||
min: 0 1;
|
||||
align: 0.0 0.0;
|
||||
|
|
@ -562,7 +563,7 @@ group { "efl/text";
|
|||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.text"; type: SWALLOW;
|
||||
part { name: "efl.text"; type: SWALLOW;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
/* we gotta use 0 0 here, because of scrolled entries */
|
||||
|
|
@ -579,32 +580,32 @@ group { "efl/text";
|
|||
program {
|
||||
signal: "load"; source: "";
|
||||
action: FOCUS_SET;
|
||||
target: "elm.text";
|
||||
target: "efl.text";
|
||||
}
|
||||
program {
|
||||
signal: "elm,state,disabled"; source: "elm";
|
||||
action: STATE_SET "disabled" 0.0;
|
||||
target: "elm.text";
|
||||
target: "efl.text";
|
||||
}
|
||||
program {
|
||||
signal: "elm,state,enabled"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.text";
|
||||
target: "efl.text";
|
||||
}
|
||||
#if 0
|
||||
program {
|
||||
signal: "elm,guide,disabled"; source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "elm.guide";
|
||||
target: "efl.guide";
|
||||
}
|
||||
program {
|
||||
signal: "elm,guide,enabled"; source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.guide";
|
||||
target: "efl.guide";
|
||||
}
|
||||
#endif
|
||||
program { name: "key-down";
|
||||
signal: "entry,keydown"; source: "elm.text";
|
||||
signal: "entry,keydown"; source: "efl.text";
|
||||
script {
|
||||
new buf[32];
|
||||
snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
|
||||
|
|
@ -645,7 +646,7 @@ group { "efl/text/magnifier";
|
|||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
|
||||
part { name: "efl.content"; type: SWALLOW; mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 10 10;
|
||||
rel1.to: "over";
|
||||
|
|
@ -677,14 +678,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: "efl.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: "efl.content";
|
||||
target: "bg";
|
||||
target: "over";
|
||||
}
|
||||
|
|
@ -913,4 +914,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"; } } } }
|
||||
//------------------------------------------------------------
|
||||
//------------------------------------------------------------
|
||||
|
|
@ -8,7 +8,7 @@ group { name: "efl/textpath";
|
|||
}
|
||||
}
|
||||
parts {
|
||||
part { name: "elm.text";
|
||||
part { name: "efl.text";
|
||||
type: TEXTBLOCK;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ group { "efl/timepicker";
|
|||
align: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
swallow { "field0";
|
||||
swallow { "efl.field0";
|
||||
mouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
@ -127,9 +127,9 @@ group { "efl/timepicker";
|
|||
max: 3 -1;
|
||||
rel1 {
|
||||
relative: 1.0 0.0;
|
||||
to: "field0";
|
||||
to: "efl.field0";
|
||||
}
|
||||
rel2.to: "field0";
|
||||
rel2.to: "efl.field0";
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
desc { "invisible";
|
||||
|
|
@ -197,7 +197,7 @@ group { "efl/timepicker";
|
|||
max: 0 0;
|
||||
}
|
||||
}
|
||||
swallow { "field1";
|
||||
swallow { "efl.field1";
|
||||
mouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
@ -219,9 +219,9 @@ group { "efl/timepicker";
|
|||
max: 3 -1;
|
||||
rel1 {
|
||||
relative: 1.0 0.0;
|
||||
to: "field1";
|
||||
to: "efl.field1";
|
||||
}
|
||||
rel2.to: "field1";
|
||||
rel2.to: "efl.field1";
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
desc { "invisible";
|
||||
|
|
@ -289,7 +289,7 @@ group { "efl/timepicker";
|
|||
max: 0 0;
|
||||
}
|
||||
}
|
||||
swallow { "field2";
|
||||
swallow { "efl.field2";
|
||||
mouse;
|
||||
scale;
|
||||
desc { "default";
|
||||
|
|
@ -326,7 +326,7 @@ group { "efl/timepicker";
|
|||
script {
|
||||
set_state(PART:"base", "default", 0.0);
|
||||
set_state(PART:"bg", "default", 0.0);
|
||||
set_state(PART:"field2", "default", 0.0);
|
||||
set_state(PART:"efl.field2", "default", 0.0);
|
||||
}
|
||||
}
|
||||
program { "invisible_ampm";
|
||||
|
|
@ -335,7 +335,7 @@ group { "efl/timepicker";
|
|||
script {
|
||||
set_state(PART:"base", "24layout", 0.0);
|
||||
set_state(PART:"bg", "24layout", 0.0);
|
||||
set_state(PART:"field2", "24layout", 0.0);
|
||||
set_state(PART:"efl.field2", "24layout", 0.0);
|
||||
}
|
||||
}
|
||||
program { "visible_colon_field0";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ group { name: "efl/label/tooltip";
|
|||
}
|
||||
}
|
||||
parts {
|
||||
part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
|
||||
part { name: "efl.text"; type: TEXTBLOCK; mouse_events: 0;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
text {
|
||||
|
|
@ -161,11 +161,11 @@ group { name: "efl/tooltip";
|
|||
description { state: "default" 0.0;
|
||||
min: 30 30;
|
||||
rel1 {
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
offset: -5 -4;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.content";
|
||||
to: "efl.content";
|
||||
offset: 4 5;
|
||||
}
|
||||
image {
|
||||
|
|
@ -217,12 +217,12 @@ group { name: "efl/tooltip";
|
|||
rel1 { \
|
||||
relative: rx 0.0; \
|
||||
offset: ox 0; \
|
||||
to: "elm.swallow.content"; \
|
||||
to: "efl.content"; \
|
||||
} \
|
||||
rel2 { \
|
||||
relative: rx 1.0; \
|
||||
offset: ox 0; \
|
||||
to: "elm.swallow.content"; \
|
||||
to: "efl.content"; \
|
||||
} \
|
||||
} \
|
||||
description { state: "visible" 0.0; \
|
||||
|
|
@ -241,12 +241,12 @@ group { name: "efl/tooltip";
|
|||
rel1 { \
|
||||
relative: rx 0.0; \
|
||||
offset: ox 0; \
|
||||
to: "elm.swallow.content"; \
|
||||
to: "efl.content"; \
|
||||
} \
|
||||
rel2 { \
|
||||
relative: rx 1.0; \
|
||||
offset: ox 0; \
|
||||
to: "elm.swallow.content"; \
|
||||
to: "efl.content"; \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
|
|
@ -291,12 +291,12 @@ group { name: "efl/tooltip";
|
|||
rel1 { \
|
||||
relative: 0.0 ry; \
|
||||
offset: 0 oy; \
|
||||
to: "elm.swallow.content"; \
|
||||
to: "efl.content"; \
|
||||
} \
|
||||
rel2 { \
|
||||
relative: 1.0 ry; \
|
||||
offset: 0 oy; \
|
||||
to: "elm.swallow.content"; \
|
||||
to: "efl.content"; \
|
||||
} \
|
||||
} \
|
||||
description { state: "visible" 0.0; \
|
||||
|
|
@ -348,15 +348,15 @@ group { name: "efl/tooltip";
|
|||
part { name: "clipper_content"; type: RECT;
|
||||
description { state: "default" 0.0;
|
||||
color: 255 255 255 0;
|
||||
rel1.to: "elm.swallow.content";
|
||||
rel2.to: "elm.swallow.content";
|
||||
rel1.to: "efl.content";
|
||||
rel2.to: "efl.content";
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
color: 255 255 255 255;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content"; type: SWALLOW;
|
||||
part { name: "efl.content"; type: SWALLOW;
|
||||
clip_to: "clipper_content";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 10 10;
|
||||
|
|
@ -421,7 +421,7 @@ group { name: "efl/tooltip:transparent";
|
|||
data.item: "pad_y" "10";
|
||||
data.item: "transparent" "enabled";
|
||||
parts {
|
||||
part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
|
||||
part { name: "efl.content"; type: SWALLOW; mouse_events: 0;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ group { "efl/uiclock";
|
|||
vis;
|
||||
}
|
||||
}
|
||||
rect { "elm.access";
|
||||
rect { "efl.access";
|
||||
repeat;
|
||||
desc { "default";
|
||||
color: 0 0 0 0;
|
||||
|
|
|
|||
|
|
@ -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: "efl.video"; type: SWALLOW; mouse_events: 1;
|
||||
clip_to: "clipper";
|
||||
description { state: "default" 0.0;
|
||||
aspect: 1.0 1.0; aspect_preference: BOTH;
|
||||
|
|
|
|||
|
|
@ -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 { "efl.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 { "efl.contents";
|
||||
clip_to: "client_clip";
|
||||
desc { "default";
|
||||
}
|
||||
desc { "with_menu";
|
||||
rel1.to: "elm.swallow.menu";
|
||||
rel1.to: "efl.menu";
|
||||
rel1.relative: 0 1;
|
||||
link.base: "elm,action,show_menu" "elm";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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_gfx_image_scale_type_set(efl_added, EFL_GFX_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_gfx_image_scale_type_set(efl_added, EFL_GFX_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, "efl.rectangle"), efl_added));
|
||||
|
||||
pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj,
|
||||
efl_gfx_image_scale_type_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE),
|
||||
efl_content_set(efl_part(obj, "efl.background"), efl_added));
|
||||
}
|
||||
pd->file = NULL;
|
||||
pd->key = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -330,7 +330,15 @@ _efl_ui_button_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSE
|
|||
|
||||
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
|
||||
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 "efl.content";
|
||||
}
|
||||
|
||||
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
|
||||
|
||||
EAPI void
|
||||
|
|
|
|||
|
|
@ -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 "efl.calendar.button.left"
|
||||
#define EFL_UI_CALENDAR_BUTTON_RIGHT "efl.calendar.button.right"
|
||||
#define EFL_UI_CALENDAR_BUTTON_YEAR_LEFT "efl.calendar.button_year.left"
|
||||
#define EFL_UI_CALENDAR_BUTTON_YEAR_RIGHT "efl.calendar.button_year.right"
|
||||
|
||||
static const char PART_NAME_DEC_BUTTON[] = "dec_button";
|
||||
static const char PART_NAME_INC_BUTTON[] = "inc_button";
|
||||
|
|
|
|||
|
|
@ -895,7 +895,7 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
|
|||
Elm_Access_Info *ai;
|
||||
|
||||
priv->access_obj = _elm_access_edje_object_part_object_register
|
||||
(obj, elm_layout_edje_get(obj), "elm.access");
|
||||
(obj, elm_layout_edje_get(obj), "efl.access");
|
||||
if (!priv->access_obj)
|
||||
priv->access_obj = _elm_access_edje_object_part_object_register
|
||||
(obj, elm_layout_edje_get(obj), "access");
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ _fields_init(Eo *obj)
|
|||
{
|
||||
if (strchr(fmt_char[i], ch))
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "field%d", field++);
|
||||
snprintf(buf, sizeof(buf), "efl.field%d", field++);
|
||||
if (i == DATEPICKER_YEAR)
|
||||
efl_content_set(efl_part(obj, buf), pd->year);
|
||||
else if (i == DATEPICKER_MONTH)
|
||||
|
|
|
|||
|
|
@ -1366,10 +1366,20 @@ _efl_ui_image_zoomable_bar_read_and_update(Eo *obj)
|
|||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
||||
double vx, vy;
|
||||
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
|
||||
}
|
||||
efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
|
||||
}
|
||||
|
||||
|
|
@ -1496,8 +1506,17 @@ _efl_ui_image_zoomable_bar_size_changed_cb(void *data, const Efl_Event *event EI
|
|||
double width = 0.0, height = 0.0;
|
||||
|
||||
efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
|
||||
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
|
||||
}
|
||||
else
|
||||
{
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1510,8 +1529,17 @@ _efl_ui_image_zoomable_bar_pos_changed_cb(void *data, const Efl_Event *event EIN
|
|||
double posx = 0.0, posy = 0.0;
|
||||
|
||||
efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
|
||||
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
|
||||
}
|
||||
else
|
||||
{
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1543,111 +1571,223 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
|
|||
static void
|
||||
_efl_ui_image_zoomable_edje_object_attach(Eo *obj)
|
||||
{
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
_efl_ui_image_zoomable_vbar_press_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
_efl_ui_image_zoomable_hbar_press_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_hbar_unpress_cb, obj);
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_vbar_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
_efl_ui_image_zoomable_vbar_press_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_hbar_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
_efl_ui_image_zoomable_hbar_press_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_hbar_unpress_cb, obj);
|
||||
}
|
||||
else
|
||||
{
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
_efl_ui_image_zoomable_vbar_press_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
_efl_ui_image_zoomable_hbar_press_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_hbar_unpress_cb, obj);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
|
||||
{
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
_efl_ui_image_zoomable_vbar_press_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
_efl_ui_image_zoomable_hbar_press_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_hbar_unpress_cb, obj);
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_vbar_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "elm.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
_efl_ui_image_zoomable_vbar_press_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_hbar_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "elm.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
_efl_ui_image_zoomable_hbar_press_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_hbar_unpress_cb, obj);
|
||||
}
|
||||
else
|
||||
{
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "efl.dragable.vbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
_efl_ui_image_zoomable_vbar_press_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "efl.dragable.hbar",
|
||||
_efl_ui_image_zoomable_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
_efl_ui_image_zoomable_hbar_press_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,unpress", "elm",
|
||||
_efl_ui_image_zoomable_hbar_unpress_cb, obj);
|
||||
}
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
@ -1678,7 +1818,10 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable
|
|||
priv->pan_obj = efl_add(MY_PAN_CLASS, obj);
|
||||
|
||||
efl_ui_scroll_manager_pan_set(priv->smanager, priv->pan_obj);
|
||||
edje_object_part_swallow(edje, "elm.swallow.content", priv->pan_obj);
|
||||
if (elm_widget_is_legacy(obj))
|
||||
edje_object_part_swallow(edje, "elm.swallow.content", priv->pan_obj);
|
||||
else
|
||||
edje_object_part_swallow(edje, "efl.content", priv->pan_obj);
|
||||
|
||||
pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
|
||||
efl_data_ref(obj, MY_CLASS);
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
|
|||
{NULL, NULL}
|
||||
};
|
||||
|
||||
static const char efl_ui_default_text[] = "efl.text";
|
||||
static const char efl_ui_default_content[] = "efl.content";
|
||||
|
||||
static const Elm_Layout_Part_Alias_Description _text_aliases[] =
|
||||
{
|
||||
{"default", "elm.text"},
|
||||
|
|
@ -50,13 +53,22 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
|
|||
{NULL, NULL}
|
||||
};
|
||||
|
||||
static const char *_efl_ui_layout_swallow_parts[] = {
|
||||
static const char *_elm_legacy_layout_swallow_parts[] = {
|
||||
"elm.swallow.icon",
|
||||
"elm.swallow.end",
|
||||
"elm.swallow.background",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *_efl_ui_layout_swallow_parts[] = {
|
||||
"efl.content",
|
||||
"efl.icon",
|
||||
"efl.end",
|
||||
"efl.background",
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
/* these are data operated by layout's class functions internally, and
|
||||
* should not be messed up by inhering classes */
|
||||
typedef struct _Efl_Ui_Layout_Sub_Object_Data Efl_Ui_Layout_Sub_Object_Data;
|
||||
|
|
@ -193,6 +205,14 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
|
|||
// send signals for all contents after elm 2.0
|
||||
if (sub_d->type != SWALLOW) return;
|
||||
if (elm_widget_is_legacy(sd->obj))
|
||||
{
|
||||
for (i = 0;; i++)
|
||||
{
|
||||
if (!_elm_legacy_layout_swallow_parts[i]) return;
|
||||
if (!strcmp(sub_d->part, _elm_legacy_layout_swallow_parts[i])) break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0;; i++)
|
||||
{
|
||||
|
|
@ -201,10 +221,20 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
|
|||
}
|
||||
}
|
||||
|
||||
if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
|
||||
type = sub_d->part + strlen("elm.swallow.");
|
||||
if (elm_widget_is_legacy(sd->obj))
|
||||
{
|
||||
if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
|
||||
type = sub_d->part + strlen("elm.swallow.");
|
||||
else
|
||||
type = sub_d->part;
|
||||
}
|
||||
else
|
||||
type = sub_d->part;
|
||||
{
|
||||
if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
|
||||
type = sub_d->part + strlen("efl.");
|
||||
else
|
||||
type = sub_d->part;
|
||||
}
|
||||
|
||||
_signals_emit(sd->obj, type, visible);
|
||||
|
||||
|
|
@ -222,17 +252,37 @@ _text_signal_emit(Efl_Ui_Layout_Object_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) return;
|
||||
|
||||
if (elm_widget_is_legacy(sd->obj))
|
||||
{
|
||||
if (!((!strcmp("elm.text", sub_d->part)) ||
|
||||
(!strncmp("elm.text.", sub_d->part, 9))))
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!((!strcmp("efl.text", sub_d->part)) ||
|
||||
(!strncmp("efl.text.", sub_d->part, 9))))
|
||||
return;
|
||||
}
|
||||
|
||||
ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
|
||||
|
||||
if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
|
||||
type = sub_d->part + strlen("elm.text.");
|
||||
if (elm_widget_is_legacy(sd->obj))
|
||||
{
|
||||
if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
|
||||
type = sub_d->part + strlen("elm.text.");
|
||||
else
|
||||
type = sub_d->part;
|
||||
}
|
||||
else
|
||||
type = sub_d->part;
|
||||
{
|
||||
if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
|
||||
type = sub_d->part + strlen("efl.");
|
||||
else
|
||||
type = sub_d->part;
|
||||
}
|
||||
|
||||
_signals_emit(sd->obj, type, visible);
|
||||
|
||||
|
|
@ -509,6 +559,18 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj,
|
|||
{
|
||||
const Elm_Layout_Part_Alias_Description *aliases = NULL;
|
||||
|
||||
if (!elm_widget_is_legacy(obj))
|
||||
{
|
||||
if (!*part)
|
||||
{
|
||||
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
|
||||
|
|
@ -2161,8 +2223,8 @@ _efl_ui_layout_object_efl_part_part(const Eo *obj, Efl_Ui_Layout_Object_Data *sd
|
|||
|
||||
if (eina_streq(part, "background"))
|
||||
{
|
||||
if (efl_layout_group_part_exist_get(wd->resize_obj, part))
|
||||
type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, part));
|
||||
if (efl_layout_group_part_exist_get(wd->resize_obj, "efl.background"))
|
||||
type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, "efl.background"));
|
||||
if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW)
|
||||
{
|
||||
if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST &&
|
||||
|
|
@ -2341,7 +2403,7 @@ _efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED)
|
|||
pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
|
||||
sd = efl_data_scope_get(pd->obj, MY_CLASS);
|
||||
bg = _efl_ui_widget_bg_get(pd->obj);
|
||||
if (!_efl_ui_layout_content_set(pd->obj, sd, "background", bg))
|
||||
if (!_efl_ui_layout_content_set(pd->obj, sd, "efl.background", bg))
|
||||
{
|
||||
ERR("Failed to swallow new background object!");
|
||||
// Shouldn't happen. What now? del bg? call super? return null?
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
|
|||
|
||||
/* Standard widget overrides */
|
||||
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
|
||||
ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "text")
|
||||
ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "efl.text")
|
||||
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
|
||||
|
||||
#define EFL_UI_NAVIGATION_BAR_EXTRA_OPS \
|
||||
|
|
@ -75,13 +75,23 @@ _efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA
|
|||
else
|
||||
efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm");
|
||||
efl_layout_signal_process(obj, EINA_FALSE);
|
||||
|
||||
return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"), content);
|
||||
}
|
||||
else if (eina_streq(part, "right_content"))
|
||||
return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"), content);
|
||||
|
||||
return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
|
||||
}
|
||||
|
||||
static Efl_Gfx_Entity *
|
||||
_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
|
||||
{
|
||||
if (eina_streq(part, "left_content"))
|
||||
efl_content_get(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
|
||||
else if (eina_streq(part, "right_content"))
|
||||
efl_content_get(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
|
||||
|
||||
return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
|
||||
}
|
||||
|
||||
|
|
@ -92,8 +102,12 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
|
|||
{
|
||||
efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm");
|
||||
efl_layout_signal_process(obj, EINA_FALSE);
|
||||
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
|
||||
}
|
||||
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
|
||||
else if (eina_streq(part, "right_content"))
|
||||
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
|
||||
|
||||
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -119,14 +133,14 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_set(Eo *obj, void
|
|||
|
||||
if (visible)
|
||||
{
|
||||
if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"), ppd->back_button))
|
||||
if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"), ppd->back_button))
|
||||
ERR("Part for back button(i.e. \"back_button\") does not exist!");
|
||||
else
|
||||
efl_layout_signal_emit(pd->obj, "elm,state,back_button,visible", "elm");
|
||||
}
|
||||
else
|
||||
{
|
||||
efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"));
|
||||
efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"));
|
||||
efl_gfx_entity_visible_set(ppd->back_button, visible);
|
||||
efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ _efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Ef
|
|||
{
|
||||
EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_OBJECT_CLASS));
|
||||
|
||||
efl_content_set(efl_part(obj, "bar"), bar);
|
||||
efl_content_set(efl_part(obj, "efl.bar"), bar);
|
||||
pd->bar = bar;
|
||||
}
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ _efl_ui_navigation_layout_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Layo
|
|||
}
|
||||
|
||||
/* Standard widget overrides */
|
||||
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "content")
|
||||
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "efl.content")
|
||||
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_layout, Efl_Ui_Navigation_Layout_Data)
|
||||
|
||||
/* Internal EO APIs and hidden overrides */
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
|
|||
evas_object_color_set(pd->event, 0, 0, 0, 0);
|
||||
evas_object_repeat_events_set(pd->event, EINA_TRUE);
|
||||
|
||||
efl_content_set(efl_part(obj, "event"), pd->event);
|
||||
efl_content_set(efl_part(obj, "efl.event"), pd->event);
|
||||
|
||||
efl_event_callback_add(pd->event, EFL_EVENT_POINTER_DOWN,
|
||||
_mouse_down_cb, obj);
|
||||
|
|
@ -264,7 +264,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
|
|||
static void
|
||||
_event_handler_del(Eo *obj, Efl_Ui_Pager_Data *pd)
|
||||
{
|
||||
efl_content_unset(efl_part(obj, "event"));
|
||||
efl_content_unset(efl_part(obj, "efl.event"));
|
||||
efl_del(pd->event);
|
||||
pd->event = NULL;
|
||||
}
|
||||
|
|
@ -352,7 +352,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
|
|||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||
|
||||
pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
|
||||
efl_content_set(efl_part(obj, "page_root"), pd->page_root);
|
||||
efl_content_set(efl_part(obj, "efl.page_root"), pd->page_root);
|
||||
|
||||
efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd);
|
||||
efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd);
|
||||
|
|
@ -671,7 +671,7 @@ _efl_ui_pager_indicator_set(Eo *obj EINA_UNUSED,
|
|||
if (!pd->idbox)
|
||||
{
|
||||
pd->idbox = efl_add(EFL_UI_BOX_CLASS, obj);
|
||||
efl_content_set(efl_part(obj, "indicator"), pd->idbox);
|
||||
efl_content_set(efl_part(obj, "efl.indicator"), pd->idbox);
|
||||
}
|
||||
|
||||
efl_page_indicator_bind(pd->indicator, obj, pd->idbox);
|
||||
|
|
|
|||
|
|
@ -446,14 +446,30 @@ _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"))
|
||||
{
|
||||
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);
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (edje_object_part_exists
|
||||
(wd->resize_obj, "efl.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, "efl.event", sd->event);
|
||||
}
|
||||
}
|
||||
elm_widget_sub_object_add(obj, sd->event);
|
||||
|
||||
|
|
@ -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, "efl.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, "efl.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, "efl.bar", ratio, 0.0);
|
||||
}
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
|
|||
|
|
@ -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, "efl.content")
|
||||
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data)
|
||||
|
||||
EOLIAN static Eo *
|
||||
|
|
@ -364,9 +364,10 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
|
|||
|
||||
if (eina_streq(pd->part, "backwall"))
|
||||
{
|
||||
Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "elm.swallow.image");
|
||||
Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "efl.content");
|
||||
if (prev_obj)
|
||||
{
|
||||
edje_object_signal_emit(sd->backwall, "elm,state,content,unset", "elm");
|
||||
edje_object_part_unswallow(sd->backwall, prev_obj);
|
||||
efl_del(prev_obj);
|
||||
}
|
||||
|
|
@ -375,12 +376,11 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
|
|||
Eina_Bool ret = elm_image_file_set(image, file, group);
|
||||
if (!ret)
|
||||
{
|
||||
edje_object_signal_emit(sd->backwall, "elm,state,image,hidden", "elm");
|
||||
efl_del(image);
|
||||
return EINA_FALSE;
|
||||
}
|
||||
edje_object_part_swallow(sd->backwall, "elm.swallow.image", image);
|
||||
edje_object_signal_emit(sd->backwall, "elm,state,image,visible", "elm");
|
||||
edje_object_part_swallow(sd->backwall, "efl.content", image);
|
||||
edje_object_signal_emit(sd->backwall, "elm,state,content,set", "elm");
|
||||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"};
|
||||
{"efl.button1",
|
||||
"efl.button2",
|
||||
"efl.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, "efl.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, "efl.text.title"))
|
||||
{
|
||||
if (pd->title_text)
|
||||
return pd->title_text;
|
||||
|
|
@ -132,7 +132,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
|
|||
}
|
||||
efl_text_set(pd->button[type], text);
|
||||
|
||||
cur_content = efl_content_get(efl_part(obj, "buttons"));
|
||||
cur_content = efl_content_get(efl_part(obj, "efl.buttons"));
|
||||
if (cur_content)
|
||||
{
|
||||
for (i = 0; i < EFL_UI_POPUP_ALERT_BUTTON_COUNT; i++)
|
||||
|
|
@ -141,7 +141,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
|
|||
else
|
||||
{
|
||||
cur_content = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj,
|
||||
efl_content_set(efl_part(obj, "buttons"), efl_added));
|
||||
efl_content_set(efl_part(obj, "efl.buttons"), efl_added));
|
||||
}
|
||||
|
||||
int btn_count = !!pd->button[EFL_UI_POPUP_ALERT_BUTTON_POSITIVE] +
|
||||
|
|
@ -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, "efl.text.title"));
|
||||
}
|
||||
|
||||
/* Efl.Part begin */
|
||||
|
|
|
|||
|
|
@ -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, "efl.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, "efl.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, "efl.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), "efl.content"),
|
||||
pd->scroller);
|
||||
|
||||
pd->size = EINA_SIZE2D(0, 0);
|
||||
|
|
|
|||
|
|
@ -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, "efl.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, "efl.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, "efl.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, "efl.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), "efl.content"),
|
||||
pd->scroller);
|
||||
|
||||
pd->size = EINA_SIZE2D(0, 0);
|
||||
|
|
|
|||
|
|
@ -111,12 +111,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, "efl.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, "efl.text.status", NULL);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -291,7 +300,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, "efl.text.status");
|
||||
|
||||
if (txt) eina_strbuf_append(buf, txt);
|
||||
|
||||
if (elm_widget_disabled_get(obj))
|
||||
|
|
@ -338,7 +352,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, "efl.bar", priv->spacer);
|
||||
|
||||
_units_set(obj);
|
||||
_val_set(obj);
|
||||
|
|
@ -454,10 +471,21 @@ _progress_part_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *par
|
|||
WRN("min is greater than max.");
|
||||
}
|
||||
|
||||
if (!strcmp(part_name, "elm.cur.progressbar"))
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
sd->val_min = min;
|
||||
sd->val_max = max;
|
||||
if (!strcmp(part_name, "elm.cur.progressbar"))
|
||||
{
|
||||
sd->val_min = min;
|
||||
sd->val_max = max;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!strcmp(part_name, "efl.cur.progressbar"))
|
||||
{
|
||||
sd->val_min = min;
|
||||
sd->val_max = max;
|
||||
}
|
||||
}
|
||||
|
||||
EINA_LIST_FOREACH(sd->progress_status, l, ps)
|
||||
|
|
@ -493,8 +521,16 @@ _progressbar_part_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *pa
|
|||
if (val < min) val = min;
|
||||
if (val > max) val = max;
|
||||
|
||||
if (!strcmp(part_name, "elm.cur.progressbar"))
|
||||
sd->val = val;
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
if (!strcmp(part_name, "elm.cur.progressbar"))
|
||||
sd->val = val;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!strcmp(part_name, "efl.cur.progressbar"))
|
||||
sd->val = val;
|
||||
}
|
||||
|
||||
EINA_LIST_FOREACH(sd->progress_status, l, ps)
|
||||
{
|
||||
|
|
@ -541,13 +577,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, "efl.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, "efl.cur.progressbar"));
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
@ -596,7 +638,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, "efl.cur.progressbar", min, max);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
@ -681,7 +726,15 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_get(const Eo *obj, void *_pd
|
|||
/* Internal EO APIs and hidden overrides */
|
||||
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 "efl.content";
|
||||
}
|
||||
|
||||
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
|
||||
|
||||
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
|
||||
|
|
|
|||
|
|
@ -72,9 +72,9 @@ _efl_ui_scroller_bar_read_and_update(Eo *obj)
|
|||
double vx, vy;
|
||||
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "elm.dragable.vbar", NULL, &vy);
|
||||
(wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
|
||||
edje_object_part_drag_value_get
|
||||
(wd->resize_obj, "elm.dragable.hbar", &vx, NULL);
|
||||
(wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
|
||||
|
||||
efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
|
||||
}
|
||||
|
|
@ -206,8 +206,8 @@ _efl_ui_scroller_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UNU
|
|||
|
||||
edje_object_calc_force(wd->resize_obj);
|
||||
efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0);
|
||||
edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -220,8 +220,8 @@ _efl_ui_scroller_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNUS
|
|||
double posx = 0.0, posy = 0.0;
|
||||
|
||||
efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0);
|
||||
edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -260,22 +260,22 @@ _scroll_edje_object_attach(Eo *obj)
|
|||
efl_layout_signal_callback_add
|
||||
(obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
|
||||
(obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "elm.dragable.vbar",
|
||||
(obj, "drag,set", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "elm.dragable.vbar",
|
||||
(obj, "drag,start", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "elm.dragable.vbar",
|
||||
(obj, "drag,stop", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "elm.dragable.vbar",
|
||||
(obj, "drag,step", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "elm.dragable.vbar",
|
||||
(obj, "drag,page", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
|
|
@ -284,22 +284,22 @@ _scroll_edje_object_attach(Eo *obj)
|
|||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_scroller_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
|
||||
(obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,set", "elm.dragable.hbar",
|
||||
(obj, "drag,set", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,start", "elm.dragable.hbar",
|
||||
(obj, "drag,start", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,stop", "elm.dragable.hbar",
|
||||
(obj, "drag,stop", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,step", "elm.dragable.hbar",
|
||||
(obj, "drag,step", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "drag,page", "elm.dragable.hbar",
|
||||
(obj, "drag,page", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_add
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
|
|
@ -317,22 +317,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
|
|||
efl_layout_signal_callback_del
|
||||
(obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "elm.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
|
||||
(obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "elm.dragable.vbar",
|
||||
(obj, "drag,set", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "elm.dragable.vbar",
|
||||
(obj, "drag,start", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "elm.dragable.vbar",
|
||||
(obj, "drag,stop", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "elm.dragable.vbar",
|
||||
(obj, "drag,step", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "elm.dragable.vbar",
|
||||
(obj, "drag,page", "efl.dragable.vbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,vbar,press", "elm",
|
||||
|
|
@ -341,22 +341,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
|
|||
(obj, "elm,vbar,unpress", "elm",
|
||||
_efl_ui_scroller_vbar_unpress_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag", "elm.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
|
||||
(obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
|
||||
obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,set", "elm.dragable.hbar",
|
||||
(obj, "drag,set", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,start", "elm.dragable.hbar",
|
||||
(obj, "drag,start", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_start_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,stop", "elm.dragable.hbar",
|
||||
(obj, "drag,stop", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_stop_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,step", "elm.dragable.hbar",
|
||||
(obj, "drag,step", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "drag,page", "elm.dragable.hbar",
|
||||
(obj, "drag,page", "efl.dragable.hbar",
|
||||
_efl_ui_scroller_edje_drag_cb, obj);
|
||||
efl_layout_signal_callback_del
|
||||
(obj, "elm,hbar,press", "elm",
|
||||
|
|
@ -409,7 +409,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
|
|||
sd->pan_obj = efl_add(EFL_UI_PAN_CLASS, obj);
|
||||
|
||||
efl_ui_scroll_manager_pan_set(sd->smanager, sd->pan_obj);
|
||||
edje_object_part_swallow(wd->resize_obj, "elm.swallow.content", sd->pan_obj);
|
||||
edje_object_part_swallow(wd->resize_obj, "efl.content", sd->pan_obj);
|
||||
|
||||
_scroll_edje_object_attach(obj);
|
||||
|
||||
|
|
|
|||
|
|
@ -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, "efl.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, "efl.text", buf);
|
||||
evas_object_show(obj);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -366,7 +366,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, "efl.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)
|
||||
|
|
@ -757,7 +757,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, "efl.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),
|
||||
|
|
@ -765,12 +765,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, "efl.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, "efl.dec_button"), efl_added));
|
||||
|
||||
{
|
||||
Eina_List *items = NULL;
|
||||
|
|
@ -883,7 +883,7 @@ _efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_B
|
|||
const char *name;
|
||||
name = efl_access_object_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, "efl.text");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -244,8 +244,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
|
|||
|
||||
/* static const Elm_Layout_Part_Alias_Description _content_aliases[] = */
|
||||
/* { */
|
||||
/* {"icon", "elm.swallow.icon"}, */
|
||||
/* {"end", "elm.swallow.end"}, */
|
||||
/* {"icon", "efl.icon"}, */
|
||||
/* {"end", "efl.end"}, */
|
||||
/* {NULL, NULL} */
|
||||
/* }; */
|
||||
|
||||
|
|
@ -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, "efl.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, "efl.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, "efl.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, "efl.text", EDJE_CURSOR_USER);
|
||||
edje_object_part_text_cursor_pos_set(sd->entry_edje, "efl.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, "efl.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, "efl.background") &&
|
||||
edje_object_part_exists(to_edje, "efl.background") &&
|
||||
!edje_object_part_swallow_get(to_edje, "efl.background"))
|
||||
{
|
||||
bg_obj = edje_object_part_swallow_get(from_edje, "elm.swallow.background");
|
||||
bg_obj = edje_object_part_swallow_get(from_edje, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.text", EINA_FALSE);
|
||||
edje_object_part_text_select_abort(sd->entry_edje, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.text"),
|
||||
&x, &y, NULL, NULL);
|
||||
evas_pointer_canvas_xy_get
|
||||
(evas_object_evas_get(sd->entry_edje), &px, &py);
|
||||
|
|
@ -2575,10 +2575,10 @@ _efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char
|
|||
|
||||
/* too bad entry does not follow the pattern
|
||||
* "elm,state,{icon,end},visible", we have to repeat ourselves */
|
||||
if (!part || !strcmp(part, "icon") || !strcmp(part, "elm.swallow.icon"))
|
||||
if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon"))
|
||||
efl_ui_text_icon_visible_set(obj, EINA_TRUE);
|
||||
|
||||
if (!part || !strcmp(part, "end") || !strcmp(part, "elm.swallow.end"))
|
||||
if (!part || !strcmp(part, "end") || !strcmp(part, "efl.end"))
|
||||
efl_ui_text_end_visible_set(obj, EINA_TRUE);
|
||||
|
||||
return EINA_TRUE;
|
||||
|
|
@ -2594,10 +2594,10 @@ _efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const cha
|
|||
|
||||
/* too bad entry does not follow the pattern
|
||||
* "elm,state,{icon,end},hidden", we have to repeat ourselves */
|
||||
if (!part || !strcmp(part, "icon") || !strcmp(part, "elm.swallow.icon"))
|
||||
if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon"))
|
||||
efl_ui_text_icon_visible_set(obj, EINA_FALSE);
|
||||
|
||||
if (!part || !strcmp(part, "end") || !strcmp(part, "elm.swallow.end"))
|
||||
if (!part || !strcmp(part, "end") || !strcmp(part, "efl.end"))
|
||||
efl_ui_text_end_visible_set(obj, EINA_FALSE);
|
||||
|
||||
return ret;
|
||||
|
|
@ -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, "efl.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, "efl.text");
|
||||
|
||||
efl_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, "efl.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, "efl.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", "efl.text",
|
||||
_entry_changed_user_signal_cb, obj);
|
||||
edje_object_signal_callback_add
|
||||
(sd->entry_edje, "preedit,changed", "elm.text",
|
||||
(sd->entry_edje, "preedit,changed", "efl.text",
|
||||
_entry_preedit_changed_signal_cb, obj);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(sd->entry_edje, "cursor,changed", "elm.text",
|
||||
(sd->entry_edje, "cursor,changed", "efl.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", "efl.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,*", "efl.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,*", "efl.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,*", "efl.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,*", "efl.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,*", "efl.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", "efl.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", "efl.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", "efl.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", "efl.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", "efl.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", "efl.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", "efl.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", "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.text");
|
||||
|
||||
if (!text_obj) return EINA_FALSE;
|
||||
|
||||
|
|
@ -4477,14 +4477,14 @@ _efl_ui_text_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd
|
|||
const char *name;
|
||||
name = efl_access_object_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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.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", "efl.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", "efl.text");
|
||||
}
|
||||
_edje_signal_emit(sd, "selection,changed", "elm.text");
|
||||
_edje_signal_emit(sd, "selection,changed", "efl.text");
|
||||
sd->have_selection = EINA_TRUE;
|
||||
}
|
||||
if (text) free(text);
|
||||
|
|
|
|||
|
|
@ -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, "efl.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, "efl.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, "efl.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, "efl.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, "efl.text");
|
||||
}
|
||||
|
||||
EOLIAN static Efl_Ui_Theme_Apply
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ _fields_init(Eo *obj)
|
|||
{
|
||||
if (strchr(fmt_char[i], ch))
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "field%d", field);
|
||||
snprintf(buf, sizeof(buf), "efl.field%d", field);
|
||||
if (i == TIMEPICKER_HOUR)
|
||||
efl_content_set(efl_part(obj, buf), pd->hour);
|
||||
else if (i == TIMEPICKER_MIN)
|
||||
|
|
|
|||
|
|
@ -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, "efl.video", priv->emotion);
|
||||
|
||||
efl_event_callback_array_add(priv->emotion, _video_cb(), obj);
|
||||
|
||||
|
|
|
|||
|
|
@ -1458,8 +1458,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, "efl.spacer.opaque",
|
||||
&ox, &oy, &ow, &oh);
|
||||
l = ox;
|
||||
t = oy;
|
||||
r = fw - ow - l;
|
||||
|
|
@ -1490,7 +1494,11 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool force)
|
|||
if (!sd->frame_obj) return;
|
||||
_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, "efl.spacer.content", &cx, &cy, &cw, &ch);
|
||||
|
||||
if (!_elm_win_framespace_set(sd, cx, cy, ow - cw, oh - ch) && (!force)) return;
|
||||
_elm_win_frame_geometry_adjust(sd);
|
||||
if (sd->first_draw)
|
||||
|
|
@ -3135,9 +3143,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,
|
||||
"efl.hotspot",
|
||||
&hx, &hy, NULL, NULL);
|
||||
|
||||
sd->pointer.hot_x = hx;
|
||||
sd->pointer.hot_y = hy;
|
||||
|
||||
|
|
@ -3836,7 +3850,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) },
|
||||
|
|
@ -3847,6 +3861,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] = {
|
||||
{ "efl.event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_TOP, 1 XDIR(SIZE_T) },
|
||||
{ "efl.event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_BOTTOM, 2 XDIR(SIZE_B) },
|
||||
{ "efl.event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_LEFT, 4 XDIR(SIZE_L) },
|
||||
{ "efl.event.resize.r", ELM_CURSOR_RIGHT_SIDE, EFL_UI_WIN_MOVE_RESIZE_RIGHT, 8 XDIR(SIZE_R) },
|
||||
{ "efl.event.resize.tl", ELM_CURSOR_TOP_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_LEFT, 5 XDIR(SIZE_TL) },
|
||||
{ "efl.event.resize.bl", ELM_CURSOR_BOTTOM_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_LEFT, 6 XDIR(SIZE_BL) },
|
||||
{ "efl.event.resize.br", ELM_CURSOR_BOTTOM_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 10 XDIR(SIZE_BR) },
|
||||
{ "efl.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)
|
||||
{
|
||||
|
|
@ -3877,26 +3902,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;
|
||||
}
|
||||
|
|
@ -3943,8 +3988,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
|
||||
|
|
@ -4017,7 +4062,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);
|
||||
|
|
@ -4080,7 +4125,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);
|
||||
|
|
@ -4207,29 +4252,14 @@ _elm_win_wl_configure(void *data, int t EINA_UNUSED, void *event)
|
|||
|
||||
#endif
|
||||
|
||||
static char *
|
||||
_efl_system_theme_path_get(void)
|
||||
static inline void
|
||||
_elm_object_part_cursor_set(Evas_Object *obj, Evas_Object *edj,
|
||||
const char *part, const char *cursor)
|
||||
{
|
||||
// Find the default theme from EFL install. Quite ugly.
|
||||
const char *sysdir;
|
||||
char *version;
|
||||
char path[PATH_MAX];
|
||||
int v;
|
||||
Evas_Object *sub = (Evas_Object *) edje_object_part_object_get(edj, part);
|
||||
if (!sub) return;
|
||||
|
||||
sysdir = elm_theme_system_dir_get();
|
||||
if (!sysdir) return NULL;
|
||||
|
||||
eina_file_path_join(path, PATH_MAX, sysdir, "default.edj");
|
||||
version = edje_file_data_get(path, "version");
|
||||
v = version ? atoi(version) : 0;
|
||||
free(version);
|
||||
if (v < FRAME_OBJ_THEME_MIN_VERSION)
|
||||
{
|
||||
ERR("Default system theme is too old, something is wrong with your installation of EFL.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return strdup(path);
|
||||
elm_object_sub_cursor_set(sub, obj, cursor);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -4263,23 +4293,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);
|
||||
}
|
||||
|
||||
edje_object_freeze(sd->frame_obj);
|
||||
|
|
@ -4290,7 +4313,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, "efl.client", sd->legacy.edje);
|
||||
|
||||
if (sd->icon)
|
||||
evas_object_show(sd->icon);
|
||||
|
|
@ -4315,7 +4341,11 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
|
|||
efl_access_object_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, "efl.icon", sd->icon);
|
||||
|
||||
efl_canvas_object_is_frame_object_set(sd->icon, EINA_TRUE);
|
||||
|
||||
evas_object_event_callback_add
|
||||
|
|
@ -4351,24 +4381,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))
|
||||
{
|
||||
const resize_info *ri = &_resize_infos[k];
|
||||
Evas_Object *sub = (Evas_Object *)edje_object_part_object_get(sd->frame_obj, ri->source);
|
||||
if (sub)
|
||||
elm_object_sub_cursor_set(sub, obj, ri->cursor);
|
||||
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
|
||||
{
|
||||
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, "efl.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, "efl.rect.background");
|
||||
|
||||
efl_canvas_object_render_op_set(bgrect, EFL_GFX_RENDER_OP_COPY);
|
||||
}
|
||||
|
||||
|
|
@ -4653,10 +4699,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, "efl.indicator", sd->indicator))
|
||||
return;
|
||||
}
|
||||
|
||||
efl_event_callback_add
|
||||
(sd->indicator, ELM_PLUG_EVENT_IMAGE_RESIZED, _indicator_resized, obj);
|
||||
|
||||
|
|
@ -5280,8 +5336,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, "efl.hotspot",
|
||||
&hx, &hy, NULL, NULL);
|
||||
|
||||
sd->pointer.hot_x = hx;
|
||||
sd->pointer.hot_y = hy;
|
||||
evas_object_show(o);
|
||||
|
|
@ -5474,8 +5535,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, "efl.text.title", sd->title);
|
||||
}
|
||||
}
|
||||
|
||||
EOLIAN static const char*
|
||||
|
|
@ -5588,7 +5653,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, "efl.icon", sd->icon);
|
||||
|
||||
evas_object_is_frame_object_set(sd->icon, EINA_TRUE);
|
||||
}
|
||||
}
|
||||
|
|
@ -5898,7 +5967,12 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
|
|||
{
|
||||
DBG("Setting menu to local mode");
|
||||
efl_event_callback_add(sd->obj, EFL_GFX_ENTITY_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, "efl.menu", sd->main_menu);
|
||||
|
||||
evas_object_show(sd->main_menu);
|
||||
if (swallow == sd->frame_obj)
|
||||
{
|
||||
|
|
@ -7039,8 +7113,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, "efl.background", bg))
|
||||
return EINA_FALSE;
|
||||
}
|
||||
efl_gfx_entity_visible_set(bg, 1);
|
||||
efl_gfx_size_hint_align_set(bg, -1, -1);
|
||||
efl_gfx_size_hint_weight_set(bg, 1, 1);
|
||||
|
|
@ -8330,7 +8412,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, "efl.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)
|
||||
|
|
|
|||
|
|
@ -67,6 +67,11 @@ static void _elm_scroll_bounce_y_animator(void *data, const Efl_Event *event);
|
|||
static void _elm_scroll_bounce_x_animator(void *data, const Efl_Event *event);
|
||||
static void _elm_scroll_momentum_animator(void *data, const Efl_Event *event);
|
||||
|
||||
static const char iface_scr_legacy_dragable_hbar[] = "elm.dragable.hbar";
|
||||
static const char iface_scr_legacy_dragable_vbar[] = "elm.dragable.vbar";
|
||||
static const char iface_scr_efl_ui_dragable_hbar[] = "efl.dragable.hbar";
|
||||
static const char iface_scr_efl_ui_dragable_vbar[] = "efl.dragable.vbar";
|
||||
|
||||
static double
|
||||
_round(double value, int pos)
|
||||
{
|
||||
|
|
@ -793,6 +798,20 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
|
|||
return;
|
||||
}
|
||||
sid->size_adjust_recurse++;
|
||||
|
||||
const char *iface_scr_dragable_hbar = NULL;
|
||||
const char *iface_scr_dragable_vbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_legacy_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_legacy_dragable_vbar;
|
||||
}
|
||||
else
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_efl_ui_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_efl_ui_dragable_vbar;
|
||||
}
|
||||
|
||||
if ((sid->content) || (sid->extern_pan))
|
||||
{
|
||||
Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0,
|
||||
|
|
@ -800,8 +819,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, "efl.content", NULL, NULL, &vw, &vh);
|
||||
}
|
||||
w = sid->content_info.w;
|
||||
if (w < 1) w = 1;
|
||||
size = (double)vw / (double)w;
|
||||
|
|
@ -810,10 +837,10 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
|
|||
{
|
||||
size = 1.0;
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", 0.0, 0.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, 0.0, 0.0);
|
||||
}
|
||||
edje_object_part_drag_size_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", size, 1.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, size, 1.0);
|
||||
|
||||
h = sid->content_info.h;
|
||||
if (h < 1) h = 1;
|
||||
|
|
@ -822,15 +849,15 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
|
|||
{
|
||||
size = 1.0;
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0, 0.0);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0, 0.0);
|
||||
}
|
||||
edje_object_part_drag_size_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 1.0, size);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 1.0, size);
|
||||
|
||||
edje_object_part_drag_value_get
|
||||
(sid->edje_obj, "elm.dragable.hbar", &vx, NULL);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, &vx, NULL);
|
||||
edje_object_part_drag_value_get
|
||||
(sid->edje_obj, "elm.dragable.vbar", NULL, &vy);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, NULL, &vy);
|
||||
|
||||
elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
|
||||
elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
|
||||
|
|
@ -838,26 +865,26 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
|
|||
y = vy * my + miny;
|
||||
|
||||
edje_object_part_drag_step_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", (double)sid->step.x /
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, (double)sid->step.x /
|
||||
(double)w, 0.0);
|
||||
edje_object_part_drag_step_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0, (double)sid->step.y /
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0, (double)sid->step.y /
|
||||
(double)h);
|
||||
if (sid->page.x > 0)
|
||||
edje_object_part_drag_page_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", (double)sid->page.x /
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, (double)sid->page.x /
|
||||
(double)w, 0.0);
|
||||
else
|
||||
edje_object_part_drag_page_set
|
||||
(sid->edje_obj, "elm.dragable.hbar",
|
||||
(sid->edje_obj, iface_scr_dragable_hbar,
|
||||
-((double)sid->page.x * ((double)vw / (double)w)) / 100.0, 0.0);
|
||||
if (sid->page.y > 0)
|
||||
edje_object_part_drag_page_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0,
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0,
|
||||
(double)sid->page.y / (double)h);
|
||||
else
|
||||
edje_object_part_drag_page_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0,
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0,
|
||||
-((double)sid->page.y * ((double)vh / (double)h)) / 100.0);
|
||||
|
||||
elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
|
||||
|
|
@ -880,18 +907,18 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
|
|||
vy = 1.0;
|
||||
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0, vy);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0, vy);
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", vx, 0.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, vx, 0.0);
|
||||
}
|
||||
else
|
||||
{
|
||||
Evas_Coord px = 0, py = 0, minx = 0, miny = 0;
|
||||
|
||||
edje_object_part_drag_size_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 1.0, 1.0);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 1.0, 1.0);
|
||||
edje_object_part_drag_size_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", 1.0, 1.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, 1.0, 1.0);
|
||||
elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
|
||||
elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
|
||||
elm_obj_pan_pos_set(sid->pan_obj, minx, miny);
|
||||
|
|
@ -920,10 +947,24 @@ _elm_scroll_scroll_bar_read_and_update(
|
|||
|| (sid->down.bounce_y_animator) || (sid->down.momentum_animator)
|
||||
|| (sid->scrollto.x.animator) || (sid->scrollto.y.animator))
|
||||
return;
|
||||
|
||||
const char *iface_scr_dragable_hbar = NULL;
|
||||
const char *iface_scr_dragable_vbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_legacy_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_legacy_dragable_vbar;
|
||||
}
|
||||
else
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_efl_ui_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_efl_ui_dragable_vbar;
|
||||
}
|
||||
|
||||
edje_object_part_drag_value_get
|
||||
(sid->edje_obj, "elm.dragable.vbar", NULL, &vy);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, NULL, &vy);
|
||||
edje_object_part_drag_value_get
|
||||
(sid->edje_obj, "elm.dragable.hbar", &vx, NULL);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, &vx, NULL);
|
||||
elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
|
||||
elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
|
||||
x = _round(vx * (double)mx + minx, 1);
|
||||
|
|
@ -1577,10 +1618,23 @@ _elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Scrollable_Smart_Interfac
|
|||
else if (vy > 1.0)
|
||||
vy = 1.0;
|
||||
|
||||
const char *iface_scr_dragable_hbar = NULL;
|
||||
const char *iface_scr_dragable_vbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_legacy_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_legacy_dragable_vbar;
|
||||
}
|
||||
else
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_efl_ui_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_efl_ui_dragable_vbar;
|
||||
}
|
||||
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0, vy);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0, vy);
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", vx, 0.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, vx, 0.0);
|
||||
|
||||
if (!sid->loop_h && !sid->down.bounce_x_animator)
|
||||
{
|
||||
|
|
@ -3682,48 +3736,62 @@ _scroll_edje_object_attach(Evas_Object *obj)
|
|||
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "reload", "elm", _elm_scroll_reload_cb, sid);
|
||||
|
||||
const char *iface_scr_dragable_vbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
iface_scr_dragable_vbar = iface_scr_legacy_dragable_vbar;
|
||||
else
|
||||
iface_scr_dragable_vbar = iface_scr_efl_ui_dragable_vbar;
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag", "elm.dragable.vbar", _elm_scroll_vbar_drag_cb,
|
||||
(sid->edje_obj, "drag", iface_scr_dragable_vbar, _elm_scroll_vbar_drag_cb,
|
||||
sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,set", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,set", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,start", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,start", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_start_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,stop", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,stop", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_stop_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,step", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,step", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,page", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,page", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_cb, sid);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "elm,vbar,press", "elm",
|
||||
_elm_scroll_vbar_press_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "elm,vbar,unpress", "elm",
|
||||
_elm_scroll_vbar_unpress_cb, sid);
|
||||
|
||||
const char *iface_scr_dragable_hbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
iface_scr_dragable_hbar = iface_scr_legacy_dragable_hbar;
|
||||
else
|
||||
iface_scr_dragable_hbar = iface_scr_efl_ui_dragable_hbar;
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag", "elm.dragable.hbar", _elm_scroll_hbar_drag_cb,
|
||||
(sid->edje_obj, "drag", iface_scr_dragable_hbar, _elm_scroll_hbar_drag_cb,
|
||||
sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,set", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,set", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,start", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,start", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_start_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,stop", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,stop", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_stop_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,step", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,step", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_cb, sid);
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "drag,page", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,page", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_cb, sid);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(sid->edje_obj, "elm,hbar,press", "elm",
|
||||
_elm_scroll_hbar_press_cb, sid);
|
||||
|
|
@ -3761,49 +3829,62 @@ _scroll_edje_object_detach(Evas_Object *obj)
|
|||
evas_object_event_callback_del_full
|
||||
(sid->edje_obj, EVAS_CALLBACK_MOVE, _on_edje_move, sid);
|
||||
|
||||
const char *iface_scr_dragable_vbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
iface_scr_dragable_vbar = iface_scr_legacy_dragable_vbar;
|
||||
else
|
||||
iface_scr_dragable_vbar = iface_scr_efl_ui_dragable_vbar;
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag", "elm.dragable.vbar", _elm_scroll_vbar_drag_cb,
|
||||
(sid->edje_obj, "drag", iface_scr_dragable_vbar, _elm_scroll_vbar_drag_cb,
|
||||
sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,set", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,set", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,start", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,start", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_start_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,stop", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,stop", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_stop_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,step", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,step", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,page", "elm.dragable.vbar",
|
||||
(sid->edje_obj, "drag,page", iface_scr_dragable_vbar,
|
||||
_elm_scroll_edje_drag_v_cb, sid);
|
||||
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "elm,vbar,press", "elm",
|
||||
_elm_scroll_vbar_press_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "elm,vbar,unpress", "elm",
|
||||
_elm_scroll_vbar_unpress_cb, sid);
|
||||
|
||||
const char *iface_scr_dragable_hbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
iface_scr_dragable_hbar = iface_scr_legacy_dragable_hbar;
|
||||
else
|
||||
iface_scr_dragable_hbar = iface_scr_efl_ui_dragable_hbar;
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag", "elm.dragable.hbar", _elm_scroll_hbar_drag_cb,
|
||||
(sid->edje_obj, "drag", iface_scr_dragable_hbar, _elm_scroll_hbar_drag_cb,
|
||||
sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,set", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,set", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,start", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,start", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_start_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,stop", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,stop", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_stop_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,step", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,step", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "drag,page", "elm.dragable.hbar",
|
||||
(sid->edje_obj, "drag,page", iface_scr_dragable_hbar,
|
||||
_elm_scroll_edje_drag_h_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
|
||||
edje_object_signal_callback_del_full
|
||||
(sid->edje_obj, "elm,hbar,press", "elm",
|
||||
_elm_scroll_hbar_press_cb, sid);
|
||||
edje_object_signal_callback_del_full
|
||||
|
|
@ -3853,22 +3934,46 @@ _elm_interface_scrollable_objects_set(Eo *obj, Elm_Scrollable_Smart_Interface_Da
|
|||
|
||||
mw = mh = -1;
|
||||
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
|
||||
if (edje_object_part_exists(sid->edje_obj, "elm.scrollbar.base"))
|
||||
{
|
||||
Evas_Object *base;
|
||||
|
||||
base = edje_object_part_swallow_get
|
||||
(sid->edje_obj, "elm.scrollbar.base");
|
||||
if (!base)
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
{
|
||||
if (edje_object_part_exists(sid->edje_obj, "elm.scrollbar.base"))
|
||||
{
|
||||
base = evas_object_rectangle_add
|
||||
(evas_object_evas_get(sid->edje_obj));
|
||||
evas_object_color_set(base, 0, 0, 0, 0);
|
||||
edje_object_part_swallow
|
||||
(sid->edje_obj, "elm.scrollbar.base", base);
|
||||
Evas_Object *base;
|
||||
|
||||
base = edje_object_part_swallow_get
|
||||
(sid->edje_obj, "elm.scrollbar.base");
|
||||
if (!base)
|
||||
{
|
||||
base = evas_object_rectangle_add
|
||||
(evas_object_evas_get(sid->edje_obj));
|
||||
evas_object_color_set(base, 0, 0, 0, 0);
|
||||
edje_object_part_swallow
|
||||
(sid->edje_obj, "elm.scrollbar.base", base);
|
||||
}
|
||||
if (!_elm_config->thumbscroll_enable)
|
||||
evas_object_size_hint_min_set(base, mw, mh);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (edje_object_part_exists(sid->edje_obj, "efl.scrollbar.base"))
|
||||
{
|
||||
Evas_Object *base;
|
||||
|
||||
base = edje_object_part_swallow_get
|
||||
(sid->edje_obj, "efl.scrollbar.base");
|
||||
if (!base)
|
||||
{
|
||||
base = evas_object_rectangle_add
|
||||
(evas_object_evas_get(sid->edje_obj));
|
||||
evas_object_color_set(base, 0, 0, 0, 0);
|
||||
edje_object_part_swallow
|
||||
(sid->edje_obj, "efl.scrollbar.base", base);
|
||||
}
|
||||
if (!_elm_config->thumbscroll_enable)
|
||||
evas_object_size_hint_min_set(base, mw, mh);
|
||||
}
|
||||
if (!_elm_config->thumbscroll_enable)
|
||||
evas_object_size_hint_min_set(base, mw, mh);
|
||||
}
|
||||
|
||||
_elm_scroll_scroll_bar_visibility_adjust(sid);
|
||||
|
|
@ -3881,16 +3986,29 @@ _elm_scroll_scroll_bar_reset(Elm_Scrollable_Smart_Interface_Data *sid)
|
|||
|
||||
if (!sid->edje_obj) return;
|
||||
|
||||
const char *iface_scr_dragable_hbar = NULL;
|
||||
const char *iface_scr_dragable_vbar = NULL;
|
||||
if (elm_widget_is_legacy(sid->obj))
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_legacy_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_legacy_dragable_vbar;
|
||||
}
|
||||
else
|
||||
{
|
||||
iface_scr_dragable_hbar = iface_scr_efl_ui_dragable_hbar;
|
||||
iface_scr_dragable_vbar = iface_scr_efl_ui_dragable_vbar;
|
||||
}
|
||||
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 0.0, 0.0);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 0.0, 0.0);
|
||||
edje_object_part_drag_value_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", 0.0, 0.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, 0.0, 0.0);
|
||||
if ((!sid->content) && (!sid->extern_pan))
|
||||
{
|
||||
edje_object_part_drag_size_set
|
||||
(sid->edje_obj, "elm.dragable.vbar", 1.0, 1.0);
|
||||
(sid->edje_obj, iface_scr_dragable_vbar, 1.0, 1.0);
|
||||
edje_object_part_drag_size_set
|
||||
(sid->edje_obj, "elm.dragable.hbar", 1.0, 1.0);
|
||||
(sid->edje_obj, iface_scr_dragable_hbar, 1.0, 1.0);
|
||||
}
|
||||
if (sid->pan_obj)
|
||||
{
|
||||
|
|
@ -3986,7 +4104,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, "efl.content", o);
|
||||
}
|
||||
|
||||
evas_object_event_callback_add
|
||||
|
|
@ -4041,8 +4163,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, "efl.content", sid->pan_obj);
|
||||
}
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
|
|||
|
|
@ -306,15 +306,32 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur)
|
|||
_elm_cursor_hot_change, cur);
|
||||
evas_object_event_callback_add(cur->hotobj, EVAS_CALLBACK_RESIZE,
|
||||
_elm_cursor_hot_change, cur);
|
||||
if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot"))
|
||||
edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
|
||||
else if (edje_object_part_exists(cur->obj, "elm.content.hotspot"))
|
||||
edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj);
|
||||
|
||||
if (elm_widget_is_legacy(obj))
|
||||
{
|
||||
if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot"))
|
||||
edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
|
||||
else if (edje_object_part_exists(cur->obj, "elm.content.hotspot"))
|
||||
edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj);
|
||||
else
|
||||
{
|
||||
ELM_SAFE_FREE(cur->hotobj, evas_object_del);
|
||||
ELM_SAFE_FREE(cur->obj, evas_object_del);
|
||||
return EINA_FALSE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ELM_SAFE_FREE(cur->hotobj, evas_object_del);
|
||||
ELM_SAFE_FREE(cur->obj, evas_object_del);
|
||||
return EINA_FALSE;
|
||||
if (edje_object_part_exists(cur->obj, "efl.hotspot"))
|
||||
edje_object_part_swallow(cur->obj, "efl.hotspot", cur->hotobj);
|
||||
else if (edje_object_part_exists(cur->obj, "efl.content.hotspot"))
|
||||
edje_object_part_swallow(cur->obj, "efl.content.hotspot", cur->hotobj);
|
||||
else
|
||||
{
|
||||
ELM_SAFE_FREE(cur->hotobj, evas_object_del);
|
||||
ELM_SAFE_FREE(cur->obj, evas_object_del);
|
||||
return EINA_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
evas_object_event_callback_add(cur->obj, EVAS_CALLBACK_DEL,
|
||||
|
|
|
|||
|
|
@ -491,8 +491,14 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
|
|||
|
||||
tt->changed_style = EINA_FALSE;
|
||||
if (tt->tooltip)
|
||||
edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
|
||||
tt->content);
|
||||
{
|
||||
if (elm_widget_is_legacy(tt->owner))
|
||||
edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
|
||||
tt->content);
|
||||
else
|
||||
edje_object_part_swallow(tt->tooltip, "efl.content",
|
||||
tt->content);
|
||||
}
|
||||
|
||||
edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
|
||||
}
|
||||
|
|
@ -519,8 +525,13 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
|
|||
tt->tooltip = NULL;
|
||||
return;
|
||||
}
|
||||
edje_object_part_swallow
|
||||
(tt->tooltip, "elm.swallow.content", tt->content);
|
||||
|
||||
if (elm_widget_is_legacy(tt->owner))
|
||||
edje_object_part_swallow
|
||||
(tt->tooltip, "elm.swallow.content", tt->content);
|
||||
else
|
||||
edje_object_part_swallow
|
||||
(tt->tooltip, "efl.content", tt->content);
|
||||
new_content = EINA_TRUE;
|
||||
evas_object_event_callback_add(tt->content, EVAS_CALLBACK_DEL,
|
||||
_elm_tooltip_content_del_cb, tt);
|
||||
|
|
|
|||
Loading…
Reference in New Issue