From 4da6bab370e9ed844ee4335cdadd2e8ccc7dc81c Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Fri, 2 Jun 2017 16:35:06 +0900 Subject: Revert "[Spinner] Modify effect size calculation of increase/decrease button" This reverts commit cd9b4da21dd8ad56b305bba82d25c1c0facc4f23. Change-Id: I79fabf867ebfe4003ac547f4835c56ed8b6cc5f0 --- mobile/widgets/datetime.edc | 54 +-- mobile/widgets/spinner.edc | 781 ++++++++++++++++---------------------------- 2 files changed, 285 insertions(+), 550 deletions(-) diff --git a/mobile/widgets/datetime.edc b/mobile/widgets/datetime.edc index f0fa6f26..f6cdb64f 100644 --- a/mobile/widgets/datetime.edc +++ b/mobile/widgets/datetime.edc @@ -934,18 +934,13 @@ group { "elm/button/base/spinner/increase/datetime/default"; desc { "default"; color: 255 255 255 0; color_class: "datetime/default/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } - rect { "clipper_icon"; + image { "icon"; desc { "default"; color_class: "datetime/default/icon"; } @@ -967,18 +962,13 @@ group { "elm/button/base/spinner/increase/datetime/time_layout"; desc { "default"; color: 255 255 255 0; color_class: "datetime/time_layout/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } - rect { "clipper_icon"; + image { "icon"; desc { "default"; color_class: "datetime/time_layout/icon"; } @@ -999,18 +989,13 @@ group { "elm/button/base/spinner/increase/datetime/time_layout_24hr"; desc { "default"; color: 255 255 255 0; color_class: "datetime/time_layout_24hr/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } - rect { "clipper_icon"; + image { "icon"; desc { "default"; color_class: "datetime/time_layout_24hr/icon"; } @@ -1034,18 +1019,13 @@ group { "elm/button/base/spinner/decrease/datetime/default"; desc { "default"; color: 255 255 255 0; color_class: "datetime/default/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } - rect { "clipper_icon"; + image { "icon"; desc { "default"; color_class: "datetime/default/icon"; } @@ -1067,18 +1047,13 @@ group { "elm/button/base/spinner/decrease/datetime/time_layout"; desc { "default"; color: 255 255 255 0; color_class: "datetime/time_layout/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } - rect { "clipper_icon"; + image { "icon"; desc { "default"; color_class: "datetime/time_layout/icon"; } @@ -1099,18 +1074,13 @@ group { "elm/button/base/spinner/decrease/datetime/time_layout_24hr"; desc { "default"; color: 255 255 255 0; color_class: "datetime/time_layout_24hr/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } - rect { "clipper_icon"; + image { "icon"; desc { "default"; color_class: "datetime/time_layout_24hr/icon"; } diff --git a/mobile/widgets/spinner.edc b/mobile/widgets/spinner.edc index b1290759..7acd9030 100644 --- a/mobile/widgets/spinner.edc +++ b/mobile/widgets/spinner.edc @@ -522,348 +522,103 @@ group { "elm/spinner/base/vertical"; } } - - #define BUTTON_VECTOR_PART(min_size, ratio, vector_base, clipper_vector_base, left_top, right_top, mid, left_bottom, right_bottom) \ - 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; \ - 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 min_size; \ - } \ - 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; \ - 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 min_size; \ - } \ - 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"; \ - rel2.relative: 0.0 1.0; \ - image.normal: mid; \ - } \ - desc { "ready"; \ - inherit: "default"; \ - } \ - 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"; \ - rel2.relative: 1.0 0.0; \ - image.normal: mid; \ - } \ - desc { "ready"; \ - inherit: "default"; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ +#define BUTTON_SPINNER_BG_EFFECT_PARTS(corner_size, ratio, sizer_bg_effect, clipper_bg_effect, top_left, top_right, mid, bottom_left, bottom_right) \ + vector { "bg_effect_top_left"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + align: 0.0 0.0; \ + max: corner_size*ratio corner_size*ratio; \ + rel.to: sizer_bg_effect; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 0.5 0.5; \ + image.normal: top_left; \ } \ - 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; \ - 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 min_size; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + desc { "pressed"; \ + inherit: "default"; \ + max: corner_size corner_size; \ } \ - 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; \ - 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 min_size; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + } \ + vector { "bg_effect_top_right"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + align: 1.0 0.0; \ + max: corner_size*ratio corner_size*ratio; \ + rel.to: sizer_bg_effect; \ + rel1.relative: 0.5 0.0; \ + rel2.relative: 1.0 0.5; \ + image.normal: top_right; \ } \ - 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"; \ - rel2.relative: 0.0 1.0; \ - image.normal: mid; \ - } \ - desc { "ready"; \ - inherit: "default"; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + desc { "pressed"; \ + inherit: "default"; \ + max: corner_size corner_size; \ } \ - 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 min_size; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + } \ + vector { "bg_effect_top_mid"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + rel1.to: "bg_effect_top_left"; \ + rel1.relative: 1.0 0.0; \ + rel2.to: "bg_effect_top_right"; \ + rel2.relative: 0.0 1.0; \ + image.normal: mid; \ } \ - 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 min_size; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + } \ + vector { "bg_effect_mid"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + rel1.to: "bg_effect_top_left"; \ + rel1.relative: 0.0 1.0; \ + rel2.to: "bg_effect_bottom_right"; \ + rel2.relative: 1.0 0.0; \ + image.normal: mid; \ } \ - 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 { "bg_effect_bottom_left"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + align: 0.0 1.0; \ + max: corner_size*ratio corner_size*ratio; \ + rel.to: sizer_bg_effect; \ + rel1.relative: 0.0 0.5; \ + rel2.relative: 0.5 1.0; \ + image.normal: bottom_left; \ } \ - 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; \ - } \ + desc { "pressed"; \ + inherit: "default"; \ + max: corner_size corner_size; \ } \ - 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 min_size; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + } \ + vector { "bg_effect_bottom_right"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + align: 1.0 1.0; \ + max: corner_size*ratio corner_size*ratio; \ + rel.to: sizer_bg_effect; \ + rel1.relative: 0.5 0.5; \ + rel2.relative: 1.0 1.0; \ + image.normal: bottom_right; \ } \ - 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 min_size; \ - } \ - desc { "pressed"; \ - inherit: "ready"; \ - } \ - desc { "hidden" \ - hid; \ - } \ + desc { "pressed"; \ + inherit: "default"; \ + max: corner_size corner_size; \ } \ - 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_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); \ - } \ - } \ + } \ + vector { "bg_effect_bottom_mid"; \ + clip: clipper_bg_effect; \ + desc { "default"; \ + rel1.to: "bg_effect_bottom_left"; \ + rel1.relative: 1.0 0.0; \ + rel2.to: "bg_effect_bottom_right"; \ + rel2.relative: 0.0 1.0; \ + image.normal: mid; \ } \ - 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/spinner/increase/default"; alias: "elm/button/base/spinner/increase/horizontal"; inherit: "elm/button/base/spinner/increase/template"; + //data.item: "focus_highlight" "on"; // We need to set data item after applying focus_image properly. + target_group: "bg_effect_group" "bg_effect_top_left" "bg_effect_top_right" "bg_effect_bottom_left" "bg_effect_bottom_right"; images { vector: "core_press_top_left.svg"; vector: "core_press_top_right.svg"; @@ -872,42 +627,20 @@ group { "elm/button/base/spinner/increase/default"; vector: "core_press_center.svg"; image: "core_icon_picker_arrow_right.png" COMP; } - target_group: "bg_effect_vector" "bg_effect_top_left" "bg_effect_top_right" "bg_effect_bottom_left" "bg_effect_bottom_right"; - + script { + public disabled = 0; + public animate = 0; + } parts { - spacer { "base"; - scale; - nomouse; - desc { "default"; - min: SPINNER_LEFT_RIGHT_BG_IMAGE_SIZE_INC; - max: SPINNER_LEFT_RIGHT_BG_IMAGE_SIZE_INC; - fixed: 1 1; - } - } - spacer { "effect_spacer"; - scale; - desc { "default"; - rel.to: "base"; - } - } - BUTTON_VECTOR_PART(BUTTON_NAVIFRAME_BACK_CORNER_RADIUS - , 0.7 - , "bg_effect", "clipper_bg_effect" - , "core_press_top_left.svg", "core_press_top_right.svg" - , "core_press_center.svg" - , "core_press_bottom_left.svg", "core_press_bottom_right.svg"); //Effect Shape Part - swallow { "bg_effect"; - clip: "clipper_bg_effect"; + spacer { "sizer_bg_effect"; scale; desc { "default"; - fixed: 1 1; - rel.to: "effect_spacer"; + rel.to: "base"; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - } - desc { "ready"; - inherit: "default"; + min: SPINNER_LEFT_RIGHT_EFFECT_MIN_SIZE_INC; + fixed: 1 1; } desc { "pressed"; inherit: "default"; @@ -915,212 +648,158 @@ group { "elm/button/base/spinner/increase/default"; rel2.relative: 1.0 1.0; } } + BUTTON_SPINNER_BG_EFFECT_PARTS(SPINNER_BUTTON_CORNER_RADIUS, + 0.7, + "sizer_bg_effect", + "clipper_bg_effect", + "core_press_top_left.svg", + "core_press_top_right.svg", + "core_press_center.svg", + "core_press_bottom_left.svg", + "core_press_bottom_right.svg") + rect { "clipper_bg_effect"; desc { "default"; fixed: 1 1; - rel.to: "bg_effect"; + rel.to: "sizer_bg_effect"; color: 255 255 255 0; color_class: "spinner/default/effect_icon"; - hid; - } - desc { "ready"; - inherit: "default"; - vis; } desc { "pressed"; - inherit: "ready"; + inherit: "default"; color: 255 255 255 255; } } image { "icon"; scale; - nomouse; - clip: "clipper_icon"; - after: "bg_effect"; + after: "clipper_bg_effect"; desc { "default"; image.normal: "core_icon_picker_arrow_right.png"; + rel.to: "base"; min: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC; max: SPINNER_LEFT_RIGHT_ARROW_IMAGE_SIZE_INC; fixed: 1 1; - } - desc { "rtl"; - inherit: "default"; - map.on: 1; - map.rotation.y: 180.0; - } - } - rect { "clipper_icon"; - scale; - desc { "default"; color_class: "spinner/default/icon"; } desc { "pressed"; + inherit: "default"; color_class: "spinner/default/icon_pressed"; } desc { "disabled"; + inherit: "default"; color_class: "spinner/default/icon_disabled"; } } - rect { "event"; - after: "clipper_icon"; - mouse; + spacer { "focus_image"; + after: "icon"; + scale: 1; desc { "default"; - color: 0 0 0 0; - rel.to: "base"; + align: 0.5 0.0; + rel.to: "icon"; } - } - } - script { - public mouse_down = 0; - public animate = 0; - public disabled = 0; - public minw = 0; - public minh = 0; - public rtl_mode = 0; - public get_effect_min_size(base_effect, Float:ratio, min_w, min_h) { - new x, y, w, h; - get_geometry(base_effect, x, y, w, h); - if (w > h) { - set_float(min_w, (w - h * (1 - ratio)) / w); - set_float(min_h, ratio); - } else { - set_float(min_w, ratio); - set_float(min_h, (h - w * (1 - ratio)) / h); + desc { "focused"; + inherit: "default"; } } + rect { "event"; + after: "focus_image"; + mouse; + } } program_remove: "unpressed"; program_remove: "clicked"; programs { program { "on_pressed"; script { - if ((get_int(mouse_down) == 0) && (get_int(disabled) == 0)) { - new Float:rel_w, Float:rel_h; - stop_program(PROGRAM:"delay_unpressed_effect"); - set_int(mouse_down, 1); + if (get_int(disabled) == 0) { + stop_program(PROGRAM:"delay_effect_unpressed"); set_int(animate, 1); - custom_state(PART:"bg_effect", "ready", 0.0); - get_effect_min_size(PART:"effect_spacer", 0.7, minw, minh); - rel_w = (1 - get_float(minw)) / 2; - rel_h = (1 - get_float(minh)) / 2; - set_state_val(PART:"bg_effect", STATE_REL1, rel_w, rel_h); - set_state_val(PART:"bg_effect", STATE_REL2, 1 - rel_w, 1 - rel_h); - run_program(PROGRAM:"pressed_effect"); + run_program(PROGRAM:"anim_effect_pressed"); } } } - program { "unpressed"; - signal: "mouse,up,1"; - source: "event"; - script { - if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - if (get_int(disabled) == 0) { - if (get_int(animate) == 0) { - run_program(PROGRAM:"unpressed_effect"); - } else { - set_state(PART:"bg_effect", "pressed", 0.0); - set_int(animate, 0); - run_program(PROGRAM:"delay_unpressed_effect"); - } - emit("elm,action,unpress", ""); - } + program { "anim_effect_pressed"; + action: STATE_SET "default"; + target: "sizer_bg_effect"; + target_groups: "bg_effect_group"; + + sequence { + action: STATE_SET "pressed"; + target: "sizer_bg_effect"; + target: "clipper_bg_effect"; + target: "icon"; + target_groups: "bg_effect_group"; + transition: GLIDE_EASE_OUT(0.15); + + script { + set_int(animate, 0); } } } - program { "clicked"; - signal: "mouse,clicked,1"; + program { "unpressed"; + signal: "mouse,up,1"; source: "event"; script { if (get_int(disabled) == 0) { - run_program(PROGRAM:"play_sound"); - run_program(PROGRAM:"clicked_signal"); - } - } - } - program { "on_enabled"; - script { - set_int(disabled, 0); - set_state(PART:"clipper_icon", "default", 0.0); - } - } - program { "on_disabled"; - script { - set_int(disabled, 1); - if (get_int(animate) == 1) return; - set_state(PART:"clipper_icon", "disabled", 0.0); - } - } - program { "pressed_effect"; - 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") + if (get_int(animate) == 0) { + run_program(PROGRAM:"anim_effect_unpressed"); + } else { + run_program(PROGRAM:"set_effect_pressed"); + } + emit("elm,action,unpress", ""); } - run_program(PROGRAM:"pressed_effect2_1"); } } - program { "pressed_effect2_1"; + program { "set_effect_pressed"; action: STATE_SET "pressed"; + target_groups: "bg_effect_group"; + target: "sizer_bg_effect"; target: "clipper_bg_effect"; - target: "bg_effect"; - target: "clipper_icon"; - transition: GLIDE_EASE_OUT(0.15); - after: "pressed_effect3"; - } - program { "pressed_effect3"; - script { - set_int(animate, 0); - } + target: "icon"; + after: "delay_effect_unpressed"; } - program { "delay_unpressed_effect"; + program { "delay_effect_unpressed"; in: 0.1 0.0; - after: "unpressed_effect"; + after: "anim_effect_unpressed"; } - program { "unpressed_effect"; + program { "anim_effect_unpressed"; script { - run_program(PROGRAM:"unpressed_effect2"); - run_program(PROGRAM:"unpressed_effect2_1"); + if (get_int(disabled) == 0) { + run_program(PROGRAM:"anim_effect_unpressed2"); + } else { + run_program(PROGRAM:"anim_effect_disabled"); + } + run_program(PROGRAM:"anim_effect_unpressed3"); } } - program { "unpressed_effect2"; - action: STATE_SET "ready"; - target: "clipper_bg_effect"; + program { "anim_effect_unpressed2"; + action: STATE_SET "default"; + target: "icon"; + transition: GLIDE_EASE_OUT(0.45); + } + program { "anim_effect_disabled"; + action: STATE_SET "disabled"; + target: "icon"; transition: GLIDE_EASE_OUT(0.45); - after: "unpressed_effect3"; } - program { "unpressed_effect2_1"; + program { "anim_effect_unpressed3"; action: STATE_SET "default"; - target: "clipper_icon"; + target: "clipper_bg_effect"; transition: GLIDE_EASE_OUT(0.45); + + sequence { + action: STATE_SET "default"; + target: "sizer_bg_effect"; + } } - program { "unpressed_effect3"; + program { "clicked"; + signal: "mouse,clicked,1"; + source: "event"; 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") + if (get_int(disabled) == 0) { + run_program(PROGRAM:"play_sound"); + run_program(PROGRAM:"clicked_signal"); } - set_state(PART:"clipper_bg_effect", "default", 0.0); - set_state(PART:"bg_effect", "default", 0.0); } } program { "play_sound"; @@ -1130,22 +809,63 @@ group { "elm/button/base/spinner/increase/default"; in: 0.001 0.0; action: SIGNAL_EMIT "elm,action,click" ""; } - - BUTTON_VECTOR_PART_MIRRORED_PROGRAM("icon") + program { "action_focus"; + signal: "elm,action,focus_highlight,show"; + source: "elm"; + action: STATE_SET "focused"; + target: "focus_image"; + } + program { "action_unfocus"; + signal: "elm,action,focus_highlight,hide"; + source: "elm"; + action: STATE_SET "default"; + target: "focus_image"; + } + program { "access_pressed"; + signal: "elm,action,anim,activate"; + source: "elm"; + after: "set_effect_pressed"; + } + program { "on_disabled"; + script { + set_int(disabled, 1); + if (get_int(animate) == 1) return; + set_state(PART:"icon", "disabled", 0.0); + } + } + program { "on_enabled"; + script { + set_int(disabled, 0); + set_state(PART:"icon", "default", 0.0); + } + } } } - group { "elm/button/base/spinner/decrease/default"; inherit: "elm/button/base/spinner/increase/default"; alias: "elm/button/base/spinner/decrease/horizontal"; images { + vector: "core_press_top_left.svg"; + vector: "core_press_top_right.svg"; + vector: "core_press_bottom_left.svg"; + vector: "core_press_bottom_right.svg"; + vector: "core_press_center.svg"; image: "core_icon_picker_arrow_left.png" COMP; } parts { image { "icon"; desc { "default"; image.normal: "core_icon_picker_arrow_left.png"; + color_class: "spinner/default/icon"; + } + desc { "pressed"; + inherit: "default"; + color_class: "spinner/default/icon_pressed"; + } + desc { "disabled"; + inherit: "default"; + color_class: "spinner/default/icon_disabled"; } } } @@ -1250,31 +970,66 @@ group { "elm/button/base/spinner/increase/vertical"; inherit: "elm/button/base/spinner/increase/default"; //data.item: "focus_highlight" "on"; // We need to set data item after applying focus_image properly. images { + vector: "core_press_top_left.svg"; + vector: "core_press_top_right.svg"; + vector: "core_press_bottom_left.svg"; + vector: "core_press_bottom_right.svg"; + vector: "core_press_center.svg"; image: "core_icon_picker_arrow_up.png" COMP; } + script { + public disabled = 0; + public animate = 0; + } parts { //Effect Shape Part - spacer { "base"; + spacer { "sizer_bg_effect"; + scale; desc { "default"; - min: SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC; - max: SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC; + rel.to: "base"; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; + min: SPINNER_UP_DOWN_EFFECT_MIN_SIZE_INC; + fixed: 1 1; + } + desc { "pressed"; + inherit: "default"; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; } } - spacer { "bg_spacer"; + rect { "clipper_bg_effect"; desc { "default"; - min: SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC; - max: SPINNER_UP_DOWN_BG_IMAGE_SIZE_INC; + color: 255 255 255 0; + color_class: "spinner/vertical/effect_icon"; + } + desc { "pressed"; + inherit: "default"; + color: 255 255 255 255; } } image { "icon"; + scale; desc { "default"; image.normal: "core_icon_picker_arrow_up.png"; + rel.to: "base"; min: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; + fixed: 1 1; + color_class: "spinner/vertical/icon"; + } + desc { "pressed"; + inherit: "default"; + color_class: "spinner/vertical/icon_pressed"; + } + desc { "disabled"; + inherit: "default"; + color_class: "spinner/vertical/icon_disabled"; } } } } + group { "elm/button/base/spinner/decrease/vertical"; inherit: "elm/button/base/spinner/increase/vertical"; images { @@ -1284,10 +1039,20 @@ group { "elm/button/base/spinner/decrease/vertical"; image { "icon"; desc { "default"; image.normal: "core_icon_picker_arrow_down.png"; + color_class: "spinner/vertical/icon"; + } + desc { "pressed"; + inherit: "default"; + color_class: "spinner/vertical/icon_pressed"; + } + desc { "disabled"; + inherit: "default"; + color_class: "spinner/vertical/icon_disabled"; } } } } +#undef BUTTON_SPINNER_BG_EFFECT_PARTS group { "elm/button/base/spinner/vertical"; inherit: "elm/button/base/spinner/default"; -- cgit v1.2.3