diff options
author | JunsuChoi <jsuya.choi@samsung.com> | 2016-11-08 14:47:53 +0900 |
---|---|---|
committer | JunsuChoi <jsuya.choi@samsung.com> | 2016-11-17 17:46:50 +0900 |
commit | 8dba12baa376f6cdb4694395fb91591ab801ccd5 (patch) | |
tree | 8e0abf11f66b9a7975a0eaaf817fc30465b85956 /mobile/widgets/button.edc | |
parent | 772575b971d8a716655d7e98ac649d108dd138b9 (diff) | |
download | efl-theme-tizen-mobile-8dba12baa376f6cdb4694395fb91591ab801ccd5.tar.gz efl-theme-tizen-mobile-8dba12baa376f6cdb4694395fb91591ab801ccd5.tar.bz2 efl-theme-tizen-mobile-8dba12baa376f6cdb4694395fb91591ab801ccd5.zip |
[button][naviframe] : fix to spread effect in mirror mode
add rtl part in vector effect part and modify program.
"elm/button/base/naviframe/back_btn/default"
"elm/button/base/naviframe/title_left"
"elm/button/base/naviframe/title_right"
Change-Id: I092be1e7ee5e60d30fc781c5a72a5270ae4a0e6c
Diffstat (limited to 'mobile/widgets/button.edc')
-rw-r--r-- | mobile/widgets/button.edc | 330 |
1 files changed, 286 insertions, 44 deletions
diff --git a/mobile/widgets/button.edc b/mobile/widgets/button.edc index 227b22d7..1514667d 100644 --- a/mobile/widgets/button.edc +++ b/mobile/widgets/button.edc @@ -162,6 +162,7 @@ vector { vector_base"_top_left"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ align: 0.0 0.0; \ max: (min_size)*ratio (min_size)*ratio; \ rel1.to: vector_base; \ @@ -177,10 +178,14 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ } \ vector { vector_base"_top_right"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ align: 1.0 0.0; \ max: (min_size)*ratio (min_size)*ratio; \ rel1.to: vector_base; \ @@ -196,10 +201,14 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ } \ vector { vector_base"_top_mid"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ rel1.to: vector_base"_top_left"; \ rel1.relative: 1.0 0.0; \ rel2.to: vector_base"_top_right"; \ @@ -212,10 +221,14 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ } \ vector { vector_base"_mid"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ rel1.to: vector_base"_top_left"; \ rel1.relative: 0.0 1.0; \ rel2.to: vector_base"_bottom_right"; \ @@ -228,10 +241,14 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ } \ vector { vector_base"_bottom_left"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ align: 0.0 1.0; \ max: (min_size)*ratio (min_size)*ratio; \ rel1.to: vector_base; \ @@ -247,10 +264,14 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ } \ vector { vector_base"_bottom_right"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ align: 1.0 1.0; \ max: (min_size)*ratio (min_size)*ratio; \ rel1.to: vector_base; \ @@ -266,10 +287,14 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ } \ vector { vector_base"_bottom_mid"; \ clip: clipper_vector_base; \ desc { "default"; \ + vis; \ rel1.to: vector_base"_bottom_left"; \ rel1.relative: 1.0 0.0; \ rel2.to: vector_base"_bottom_right"; \ @@ -282,6 +307,195 @@ desc { "pressed"; \ inherit: "ready"; \ } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_top_left_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + align: 0.0 0.0; \ + max: (min_size)*ratio (min_size)*ratio; \ + rel1.to: vector_base; \ + rel2.to: vector_base; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 1.0 1.0; \ + image.normal: right_top; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + min: (min_size)-1 (min_size)-1; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_top_right_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + align: 1.0 0.0; \ + max: (min_size)*ratio (min_size)*ratio; \ + rel1.to: vector_base; \ + rel2.to: vector_base; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 1.0 1.0; \ + image.normal: left_top; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + min: (min_size)-1 (min_size)-1; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_top_mid_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + rel1.to: vector_base"_top_left_rtl"; \ + rel1.relative: 1.0 0.0; \ + rel2.to: vector_base"_top_right_rtl"; \ + rel2.relative: 0.0 1.0; \ + image.normal: mid; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_mid_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + rel1.to: vector_base"_top_left_rtl"; \ + rel1.relative: 0.0 1.0; \ + rel2.to: vector_base"_bottom_right_rtl"; \ + rel2.relative: 1.0 0.0; \ + image.normal: mid; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_bottom_left_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + align: 0.0 1.0; \ + max: (min_size)*ratio (min_size)*ratio; \ + rel1.to: vector_base; \ + rel2.to: vector_base; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 1.0 1.0; \ + image.normal: right_bottom; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + min: (min_size)-1 (min_size)-1; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_bottom_right_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + align: 1.0 1.0; \ + max: (min_size)*ratio (min_size)*ratio; \ + rel1.to: vector_base; \ + rel2.to: vector_base; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 1.0 1.0; \ + image.normal: left_bottom; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + min: (min_size)-1 (min_size)-1; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } \ + vector { vector_base"_bottom_mid_rtl"; \ + clip: clipper_vector_base; \ + desc { "default"; \ + vis; \ + rel1.to: vector_base"_bottom_left_rtl"; \ + rel1.relative: 1.0 0.0; \ + rel2.to: vector_base"_bottom_right_rtl"; \ + rel2.relative: 0.0 1.0; \ + image.normal: mid; \ + } \ + desc { "ready"; \ + inherit: "default"; \ + } \ + desc { "pressed"; \ + inherit: "ready"; \ + } \ + desc { "hidden" \ + hid; \ + } \ + } + + #define BUTTON_VECTOR_PART_MIRRORED_VALUE \ + public rtl_mode = 0; + + #define BUTTON_VECTOR_PART_MIRRORED_SET_STATE(vector_base, _rtl, _state) \ + set_state(PART:vector_base"_top_left"_rtl, _state, 0.0); \ + set_state(PART:vector_base"_top_right"_rtl, _state, 0.0); \ + set_state(PART:vector_base"_bottom_left"_rtl, _state, 0.0); \ + set_state(PART:vector_base"_bottom_right"_rtl, _state, 0.0); \ + set_state(PART:vector_base"_top_mid"_rtl, _state, 0.0); \ + set_state(PART:vector_base"_mid"_rtl, _state, 0.0); \ + set_state(PART:vector_base"_bottom_mid"_rtl, _state, 0.0); + + #define BUTTON_VECTOR_PART_MIRRORED_PROGRAM( _icon ) \ + program { "rtl_mirrored"; \ + signal: "edje,state,rtl"; \ + source: "edje"; \ + script { \ + set_int(rtl_mode, 1); \ + if( strcmp(#_icon, "icon")) { \ + set_state(PART:_icon, "rtl", 0.0); \ + } \ + } \ + } \ + program { "ltr_mirrored"; \ + signal: "edje,state,ltr"; \ + source: "edje"; \ + script { \ + set_int(rtl_mode, 0); \ + if( strcmp(#_icon, "icon")) { \ + set_state(PART:_icon, "default", 0.0); \ + } \ + } \ } group { "elm/button/base/default"; @@ -2859,6 +3073,7 @@ group { "elm/button/base/contacts"; set_float(min_h, (h - w * (1 - ratio)) / h); } } + BUTTON_VECTOR_PART_MIRRORED_VALUE } program_remove: "unpressed"; program_remove: "clicked"; @@ -2933,25 +3148,36 @@ group { "elm/button/base/contacts"; } } program { "pressed_effect"; - sequence { - action: STATE_SET "default"; - target_groups: "bg_effect_vector"; - - action: STATE_SET "ready"; - target: "clipper_bg_effect"; - - action: STATE_SET "custom"; - target: "bg_effect"; - - after: "pressed_effect2"; + script { + if(get_int(rtl_mode) == 0) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","default") + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","hidden") + } + else if(get_int(rtl_mode) == 1) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","default") + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","hidden") + } + set_state(PART:"clipper_bg_effect", "ready", 0.0); + set_state(PART:"bg_effect", "custom", 0.0); + run_program(PROGRAM:"pressed_effect2"); } } program { "pressed_effect2"; + script { + if(get_int(rtl_mode) == 0) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","pressed") + } + else if(get_int(rtl_mode) == 1) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","pressed") + } + run_program(PROGRAM:"pressed_effect2_1"); + } + } + program { "pressed_effect2_1"; action: STATE_SET "pressed"; target: "clipper_bg_effect"; target: "bg_effect"; target: "elm.text"; - target_groups: "bg_effect_vector"; transition: GLIDE_EASE_OUT(0.15); after: "pressed_effect3"; } @@ -2999,9 +3225,17 @@ group { "elm/button/base/contacts"; after: "finished_animation"; } program { "finished_animation"; - action: STATE_SET "default"; - targets: "clipper_bg" "bg_effect" "clipper_bg_effect"; - target_groups: "bg_effect_vector"; + script { + if(get_int(rtl_mode) == 0) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","default") + } + else if(get_int(rtl_mode) == 1) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","default") + } + set_state(PART:"clipper_bg_effect", "default", 0.0); + set_state(PART:"clipper_bg", "default", 0.0); + set_state(PART:"bg_effect", "default", 0.0); + } } program { "play_sound"; action: RUN_PLUGIN "touch_sound"; @@ -3024,6 +3258,7 @@ group { "elm/button/base/contacts"; set_int(multi_down, 0); } } + BUTTON_VECTOR_PART_MIRRORED_PROGRAM(""); } } @@ -3298,6 +3533,7 @@ group { "elm/button/base/contacts"; set_float(min_h, (h - w * (1 - ratio)) / h); } } + BUTTON_VECTOR_PART_MIRRORED_VALUE } program_remove: "unpressed"; program_remove: "clicked"; @@ -3363,24 +3599,35 @@ group { "elm/button/base/contacts"; } } program { "pressed_effect"; - sequence { - action: STATE_SET "default"; - target_groups: "bg_effect_vector"; - - action: STATE_SET "ready"; - target: "clipper_bg_effect"; - - action: STATE_SET "custom"; - target: "bg_effect"; - - after: "pressed_effect2"; + script { + if(get_int(rtl_mode) == 0) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","default") + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","hidden") + } + else if(get_int(rtl_mode) == 1) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","default") + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","hidden") + } + set_state(PART:"clipper_bg_effect", "ready", 0.0); + set_state(PART:"bg_effect", "custom", 0.0); + run_program(PROGRAM:"pressed_effect2"); } } program { "pressed_effect2"; + script { + if(get_int(rtl_mode) == 0) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","pressed") + } + else if(get_int(rtl_mode) == 1) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","pressed") + } + run_program(PROGRAM:"pressed_effect2_1"); + } + } + program { "pressed_effect2_1"; action: STATE_SET "pressed"; target: "clipper_bg_effect"; target: "bg_effect"; - target_groups: "bg_effect_vector"; transition: GLIDE_EASE_OUT(0.15); after: "pressed_effect3"; } @@ -3406,11 +3653,17 @@ group { "elm/button/base/contacts"; after: "unpressed_effect3"; } program { "unpressed_effect3"; - action: STATE_SET "default"; - target: "bg_effect"; - target: "clipper_bg"; - target: "clipper_bg_effect"; - target_groups: "bg_effect_vector"; + script { + if(get_int(rtl_mode) == 0) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","","default") + } + else if(get_int(rtl_mode) == 1) { + BUTTON_VECTOR_PART_MIRRORED_SET_STATE("bg_effect","_rtl","default") + } + set_state(PART:"clipper_bg_effect", "default", 0.0); + set_state(PART:"clipper_bg", "default", 0.0); + set_state(PART:"bg_effect", "default", 0.0); + } } program { "play_sound"; action: RUN_PLUGIN "touch_sound"; @@ -3433,18 +3686,7 @@ group { "elm/button/base/contacts"; set_int(multi_down, 0); } } - program { "rtl_mirrored"; - signal: "edje,state,rtl"; - source: "edje"; - action: STATE_SET "rtl"; - target: "icon"; - } - program { "ltr_mirrored"; - signal: "edje,state,ltr"; - source: "edje"; - action: STATE_SET "default"; - target: "icon"; - } + BUTTON_VECTOR_PART_MIRRORED_PROGRAM("icon") } } group { "elm/button/base/naviframe/drawers"; |