summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinYong Park <j4939.park@samsung.com>2017-06-09 03:31:24 (GMT)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-07-27 06:27:28 (GMT)
commite9c3bd0bb2333862f0958c92e97286fec9dbf2ec (patch)
treed4b66f470b2d80e3504a295cbbddda732c821a5f
parent0af8cabca116833532d1dca1996f6b17894eb0f8 (diff)
downloadefl-theme-tizen-mobile-e9c3bd0bb2333862f0958c92e97286fec9dbf2ec.zip
efl-theme-tizen-mobile-e9c3bd0bb2333862f0958c92e97286fec9dbf2ec.tar.gz
efl-theme-tizen-mobile-e9c3bd0bb2333862f0958c92e97286fec9dbf2ec.tar.bz2
popup: toast style show animation move to notify from base partrefs/changes/79/133179/3
If use ALIGL_FILL option, showing base part is called by edje recalc, so show animation didn't start. So it move to notify part. Change-Id: I6d47658eec07a673224aff5210d3d46fecd0ff77 Signed-off-by: Jinyong Park <j4939.park@samsung.com>
-rw-r--r--mobile/HD-inc.edc2
-rw-r--r--mobile/widgets/popup.edc185
2 files changed, 128 insertions, 59 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc
index 911d685..77a85fa 100644
--- a/mobile/HD-inc.edc
+++ b/mobile/HD-inc.edc
@@ -752,13 +752,13 @@
#define POPUP_TOAST_TITLE_TOP_PAD_INC 9
#define POPUP_TOAST_TITLE_BOTTOM_PAD_INC 12
#define POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 28
-#define POPUP_TOAST_VI_BOTTOM_PAD_INC 69
#define POPUP_TOAST_BOTTOM_PAD_INC 72
#define POPUP_TOAST_TEXT_MIN_WIDTH_INC 50
#define POPUP_TOAST_TEXT_MIN_HEIGHT_INC 41
#define POPUP_TOAST_TEXT_MAX_WIDTH_INC 564
#define POPUP_TOAST_TEXT_MAX_HEIGHT_INC 668
#define POPUP_TOAST_TEXT_MULTI_LINE_MIN_INC 564
+#define POPUP_TOAST_VI_INC 3
#define POPUP_ITEM_BASE_DEFAULT_MIN_INC 660 120
#define POPUP_ITEM_PADDING_LEFT_RIGHT_WIDTH_INC 32
diff --git a/mobile/widgets/popup.edc b/mobile/widgets/popup.edc
index 6d71f85..5def4a3 100644
--- a/mobile/widgets/popup.edc
+++ b/mobile/widgets/popup.edc
@@ -804,29 +804,90 @@ group { "elm/notify/center/popup/toast";
desc { "default";
}
}
+ spacer { "padding_vi";
+ scale;
+ desc { "default";
+ rel.to: "base";
+ rel1.relative: 0.0 1.0;
+ align: 0.5 0.0;
+ min: 0 POPUP_TOAST_VI_INC;
+ fixed: 1 1;
+ }
+ desc { "end";
+ inherit: "default";
+ min: 0 0;
+ }
+ }
swallow { "elm.swallow.content";
mouse;
+ clip: "clipper";
desc { "default";
- rel.to: "base";
+ rel1.to: "base";
+ rel2.to: "padding_vi";
align: 0.5 0.5;
fixed: 1 1;
}
}
+ rect { "block";
+ desc { "default";
+ rel.to: "elm.swallow.content";
+ color: 0 0 0 0;
+ vis;
+ }
+ desc { "end";
+ inherit: "default";
+ hid;
+ }
+ }
+ rect { "clipper";
+ desc { "default";
+ rel.to: "elm.swallow.content";
+ color: 255 255 255 0;
+ }
+ desc { "end";
+ inherit: "default";
+ color: 255 255 255 255;
+ }
+ }
}
programs {
program { "on_visible";
+ action: STATE_SET "end";
+ target: "padding_vi";
+ target: "clipper";
+ target: "block";
}
program { "on_show_animation";
- action: SIGNAL_EMIT "elm,action,show,finished" "";
+ after: "show_start";
}
program { "on_show";
+ after: "show_start";
+ }
+ program { "show_start";
+ action: STATE_SET "default";
+ target: "padding_vi";
+ target: "clipper";
+ target: "block";
+ after: "show_animation_start";
+ }
+ program { "show_animation_start";
+ action: STATE_SET "end";
+ transition: GLIDE_EASE_OUT(0.25);
+ target: "padding_vi";
+ target: "clipper";
+ target: "block";
+ after: "show_finished";
+ }
+ program { "show_finished";
action: SIGNAL_EMIT "elm,action,show,finished" "";
}
program { "on_hide";
action: STATE_SET "default";
- transition: LINEAR 0.1;
- target: "elm.swallow.content";
+ transition: GLIDE_EASE_OUT(0.25);
+ target: "padding_vi";
+ target: "clipper";
+ target: "block";
after: "hide_finished";
}
program { "hide_finished";
@@ -848,13 +909,11 @@ group { "elm/notify/center/popup/toast";
group { "elm/notify/"direction"/popup/toast"; \
inherit: "elm/notify/center/popup/toast"; \
nomouse; \
+\
parts { \
swallow { "elm.swallow.content"; \
- mouse; \
desc { "default"; \
- rel.to: "base"; \
align: align_x align_y; \
- fixed: 1 1; \
} \
} \
} \
@@ -1404,8 +1463,11 @@ group { "elm/popup/base/toast";
}
parts {
+ spacer { "base";
+ desc { "default";
+ }
+ }
image { "bg";
- clip: "clipper";
desc { "default";
rel.to: "bg_outer";
fixed: 1 1;
@@ -1414,17 +1476,16 @@ group { "elm/popup/base/toast";
}
}
image { "bg_outer";
- clip: "clipper";
desc { "default";
rel1 {
- to_x: "padding_left_title";
- to_y: "padding_top_title";
- relative: 0.0 0.0;
+ to_x: "base";
+ to_y: "padding_top";
+ relative: 0.0 1.0;
}
rel2 {
- to_x: "padding_right_title";
- to_y: "padding_bottom_title";
- relative: 1.0 1.0;
+ to_x: "base";
+ to_y: "padding_bottom";
+ relative: 1.0 0.0;
}
fixed: 1 1;
image.normal: "core_popup_noti_bg_stroke.#";
@@ -1434,6 +1495,7 @@ group { "elm/popup/base/toast";
spacer { "padding_top";
scale;
desc { "default";
+ rel.to: "base";
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
min: 0 POPUP_TOAST_BOTTOM_PAD_INC;
@@ -1444,30 +1506,26 @@ group { "elm/popup/base/toast";
spacer { "padding_bottom";
scale;
desc { "default";
+ rel.to: "base";
rel1.relative: 0.0 1.0;
align: 0.5 1.0;
- min: 0 POPUP_TOAST_VI_BOTTOM_PAD_INC;
- max: -1 POPUP_TOAST_VI_BOTTOM_PAD_INC;
- fixed: 0 1;
- }
- desc { "show_effect";
- inherit: "default";
min: 0 POPUP_TOAST_BOTTOM_PAD_INC;
max: -1 POPUP_TOAST_BOTTOM_PAD_INC;
+ fixed: 0 1;
}
}
spacer { "padding_top_title";
scale;
desc { "default";
rel1 {
- to_y: "padding_top";
+ to: "padding_top";
relative: 0.0 1.0;
}
rel2 {
- to_y: "padding_top";
+ to: "padding_top";
relative: 1.0 1.0;
}
- align: 0.5 1.0;
+ align: 0.5 0.0;
min: 0 POPUP_TOAST_TITLE_TOP_PAD_INC;
max: -1 POPUP_TOAST_TITLE_TOP_PAD_INC;
fixed: 0 1;
@@ -1494,55 +1552,46 @@ group { "elm/popup/base/toast";
scale;
desc { "default";
rel1 {
- to: "elm.swallow.content";
+ to: "base";
relative: 0.0 0.0;
}
rel2 {
- to: "elm.swallow.content";
+ to: "base";
relative: 0.0 1.0;
}
- align: 1.0 0.5;
+ align: 0.0 0.5;
min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
- max: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
fixed: 1 0;
}
- desc { "part_text_show";
- inherit: "default";
- rel.to: "elm.text";
- }
}
spacer { "padding_right_title";
scale;
desc { "default";
rel1 {
- to: "elm.swallow.content";
+ to: "base";
relative: 1.0 0.0;
}
rel2 {
- to: "elm.swallow.content";
+ to: "base";
relative: 1.0 1.0;
}
- align: 0.0 0.5;
+ align: 1.0 0.5;
min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
- max: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
fixed: 1 0;
}
- desc { "part_text_show";
- inherit: "default";
- rel.to: "elm.text";
- }
}
textblock { "elm.text";
scale;
- clip: "clipper";
desc { "default";
rel1 {
- to: "padding_top_title";
- relative: 0.0 1.0;
+ to_x: "padding_left_title";
+ to_y: "padding_top_title";
+ relative: 1.0 1.0;
}
rel2 {
- to: "padding_bottom_title";
- relative: 1.0 0.0;
+ to_x: "padding_right_title";
+ to_y: "padding_bottom_title";
+ relative: 0.0 0.0;
}
align: 0.5 1.0;
min: POPUP_TOAST_TEXT_MIN_WIDTH_INC POPUP_TOAST_TEXT_MIN_HEIGHT_INC;
@@ -1561,7 +1610,6 @@ group { "elm/popup/base/toast";
}
swallow { "elm.swallow.content";
mouse;
- clip: "clipper";
desc { "default";
rel1 {
to: "padding_top_title";
@@ -1576,7 +1624,7 @@ group { "elm/popup/base/toast";
}
rect { "clipper";
desc { "default";
- rel.to: "bg";
+ rel.to: "base";
color: 255 255 255 0;
fixed: 1 1;
}
@@ -1619,22 +1667,11 @@ group { "elm/popup/base/toast";
set_state(PART:"elm.text", "multiline", 0.0);
else
set_state(PART:"elm.text", "default", 0.0);
-
- set_state(PART:"padding_left_title", "part_text_show", 0.0);
- set_state(PART:"padding_right_title", "part_text_show", 0.0);
}
}
program { "on_show";
- action: STATE_SET "show_effect" 0.0;
- transition: GLIDE_EASE_OUT(0.25);
- target: "clipper";
- target: "padding_bottom";
}
program { "on_hide";
- action: STATE_SET "default" 0.0;
- transition: GLIDE_EASE_OUT(0.25);
- target: "clipper";
- target: "padding_bottom";
}
program { "on_show_access_highlight";
action: STATE_SET "visible" 0.0;
@@ -1733,9 +1770,41 @@ group { "elm/popup/content/popup/toast";
desc { "default";
}
}
+ spacer { "padding_left";
+ scale;
+ desc { "default";
+ rel.to: "base";
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 1.0;
+ align: 0.0 0.5;
+ min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
+ fixed: 1 0;
+ }
+ }
+ spacer { "padding_right";
+ scale;
+ desc { "default";
+ rel.to: "base";
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 1.0;
+ align: 1.0 0.5;
+ min: POPUP_TOAST_TITLE_LEFT_RIGHT_PAD_INC 0;
+ fixed: 1 0;
+ }
+ }
swallow { "elm.swallow.content";
mouse;
desc { "default";
+ rel1 {
+ to_x: "padding_left";
+ to_y: "base";
+ relative: 1.0 0.0;
+ }
+ rel2 {
+ to_x: "padding_right";
+ to_y: "base";
+ relative: 0.0 1.0;
+ }
}
}
}