diff options
author | Jee-Yong Um <jc9.um@samsung.com> | 2015-09-17 21:04:18 +0900 |
---|---|---|
committer | Jee-Yong Um <jc9.um@samsung.com> | 2015-09-17 21:04:51 +0900 |
commit | bb5fd119b043d41457d8a0f3dd08bf6a03b565f0 (patch) | |
tree | a883e3b9db150adf02f6e6aaca2eb7fbbb723743 /mobile/widgets/hover.edc | |
parent | 91a57ccc5f19ac0c12750bf573300ec69fceed4a (diff) | |
download | efl-theme-tizen-mobile-bb5fd119b043d41457d8a0f3dd08bf6a03b565f0.tar.gz efl-theme-tizen-mobile-bb5fd119b043d41457d8a0f3dd08bf6a03b565f0.tar.bz2 efl-theme-tizen-mobile-bb5fd119b043d41457d8a0f3dd08bf6a03b565f0.zip |
[2.4][Hoversel] Fix to show dismiss animation
Change-Id: I75a16c668d9f9f006e5b48e46160544e0879f4ed
Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Diffstat (limited to 'mobile/widgets/hover.edc')
-rw-r--r-- | mobile/widgets/hover.edc | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/mobile/widgets/hover.edc b/mobile/widgets/hover.edc index 612a695c..86da7357 100644 --- a/mobile/widgets/hover.edc +++ b/mobile/widgets/hover.edc @@ -156,7 +156,6 @@ group { name: "elm/hover/base/hoversel_vertical/default"; } part { name: "clipper"; type: RECT; - mouse_events: 1; scale: 1; description { state: "default" 0.0; color: 255 255 255 0; @@ -193,11 +192,6 @@ group { name: "elm/hover/base/hoversel_vertical/default"; to_y: "elm.swallow.slot.middle"; relative: 1.0 0.0; } - color: 255 255 255 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; } } part { name: "top_border"; @@ -276,12 +270,6 @@ group { name: "elm/hover/base/hoversel_vertical/default"; offset: 0 -2; } rel2.to: "elm.swallow.slot.bottom"; - color: 255 255 255 0; - } - //description { state: "right_visible" 0.0; - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; } } part { name: "bottom_border"; @@ -354,21 +342,22 @@ group { name: "elm/hover/base/hoversel_vertical/default"; program { name: "end"; signal: "mouse,up,1"; source: "base"; - action: SIGNAL_EMIT "elm,action,dismiss" ""; + action: SIGNAL_EMIT "elm,action,dismiss" "elm"; } program { name: "show"; signal: "elm,action,show"; source: "elm"; action: STATE_SET "visible" 0.0; - transition: SIN_FAC 0.25 0.5; + transition: GLIDE_EASE_OUT(0.25); target: "clipper"; } program { name: "hide"; signal: "elm,action,hide"; source: "elm"; action: STATE_SET "default" 0.0; - transition: SIN_FAC 0.25 0.5; + transition: GLIDE_EASE_OUT(0.25); target: "clipper"; + after: "hidefinished"; } program { name: "topshow"; signal: "elm,action,slot,top,show"; @@ -393,13 +382,11 @@ group { name: "elm/hover/base/hoversel_vertical/default"; } program { name: "topshow_default"; action: STATE_SET "visible" 0.0; - target: "top_clipper"; target: "elm.swallow.slot.top"; transition: GLIDE_EASE_OUT(0.25); } program { name: "topshow_right"; action: STATE_SET "right_visible" 0.0; - target: "top_clipper"; target: "elm.swallow.slot.top"; transition: GLIDE_EASE_OUT(0.25); } @@ -414,23 +401,15 @@ group { name: "elm/hover/base/hoversel_vertical/default"; run_program(PROGRAM:"tophide_right"); } set_int(visible, 0); - run_program(PROGRAM:"tophide2"); } } - program { name: "tophide2"; - action: STATE_SET "default" 0.0; - target: "top_bg"; - target: "top_border"; - } program { name: "tophide_default"; action: STATE_SET "default" 0.0; - target: "top_clipper"; target: "elm.swallow.slot.top"; transition: GLIDE_EASE_OUT(0.25); } program { name: "tophide_right"; action: STATE_SET "right" 0.0; - target: "top_clipper"; target: "elm.swallow.slot.top"; transition: GLIDE_EASE_OUT(0.25); } @@ -457,13 +436,11 @@ group { name: "elm/hover/base/hoversel_vertical/default"; } program { name: "bottomshow_default"; action: STATE_SET "visible" 0.0; - target: "bottom_clipper"; target: "elm.swallow.slot.bottom"; transition: GLIDE_EASE_OUT(0.25); } program { name: "bottomshow_right"; action: STATE_SET "right_visible" 0.0; - target: "bottom_clipper"; target: "elm.swallow.slot.bottom"; transition: GLIDE_EASE_OUT(0.25); } @@ -478,26 +455,21 @@ group { name: "elm/hover/base/hoversel_vertical/default"; run_program(PROGRAM:"bottomhide_right"); } set_int(visible, 0); - run_program(PROGRAM:"bottomhide2"); } } - program { name: "bottomhide2"; - action: STATE_SET "default" 0.0; - target: "bottom_bg"; - target: "bottom_border"; - } program { name: "bottomhide_default"; action: STATE_SET "default" 0.0; - target: "bottom_clipper"; target: "elm.swallow.slot.bottom"; transition: GLIDE_EASE_OUT(0.25); } program { name: "bottomhide_right"; action: STATE_SET "right" 0.0; - target: "bottom_clipper"; target: "elm.swallow.slot.bottom"; transition: GLIDE_EASE_OUT(0.25); } + program { name: "hidefinished"; + action: SIGNAL_EMIT "elm,action,hide,finished" "elm"; + } program { name: "align_right"; signal: "elm,state,align,right"; source: "elm"; |