diff options
| author | JunsuChoi <jsuya.choi@samsung.com> | 2016-10-21 21:04:25 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-10-27 06:58:14 -0700 |
| commit | b28f6d1c814afae3073f0c38accae5469884b84d (patch) | |
| tree | f16fdbce5306f0a831e6bff94e2d482e2f43896b | |
| parent | b55d6df072bb494331876376cb570549c1901686 (diff) | |
| download | efl-theme-tizen-mobile-b28f6d1c814afae3073f0c38accae5469884b84d.tar.gz efl-theme-tizen-mobile-b28f6d1c814afae3073f0c38accae5469884b84d.tar.bz2 efl-theme-tizen-mobile-b28f6d1c814afae3073f0c38accae5469884b84d.zip | |
[Button] fix button finished_animation program
- add clipper_bg part in finished_animation.
- Remove unnecessary code.
- modify button size(default, bottom).
Change-Id: I50af83a161b881b5c07badec6349c7e404bba059
| -rw-r--r-- | mobile/HD-inc.edc | 8 | ||||
| -rw-r--r-- | mobile/widgets/button.edc | 16 |
2 files changed, 8 insertions, 16 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc index 3cc4912e..2e053138 100644 --- a/mobile/HD-inc.edc +++ b/mobile/HD-inc.edc @@ -587,11 +587,11 @@ //****************************************************************************// #define GLIDE_EASE_OUT(duration) CUBIC_BEZIER (duration) 0.25 0.46 0.45 1.0 -#define BUTTON_MIN_WIDTH_INC 81 -#define BUTTON_MIN_HEIGHT_INC 77 +#define BUTTON_MIN_WIDTH_INC 80 +#define BUTTON_MIN_HEIGHT_INC 78 #define BUTTON_CORNER_RADIUS_INC "39" -#define BUTTON_BOTTOM_MIN_WIDTH_INC 117 -#define BUTTON_BOTTOM_MIN_HEIGHT_INC 103 +#define BUTTON_BOTTOM_MIN_WIDTH_INC 116 +#define BUTTON_BOTTOM_MIN_HEIGHT_INC 104 #define BUTTON_BOTTOM_MAX_WIDTH_INC 656 #define BUTTON_BOTTOM_MAX_HEIGHT_INC 104 #define BUTTON_BOTTOM_CORNER_RADIUS "52" diff --git a/mobile/widgets/button.edc b/mobile/widgets/button.edc index 26060766..983a0ccc 100644 --- a/mobile/widgets/button.edc +++ b/mobile/widgets/button.edc @@ -377,7 +377,6 @@ inherit: "default"; min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; - fixed: 1 1; } desc { "icon_only"; inherit: "default"; @@ -434,7 +433,6 @@ to_y: "padding_bottom_right"; } min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; - fixed: 1 1; } desc { "icon_only"; rel.to: "bg"; @@ -606,7 +604,7 @@ } program { "finished_animation"; action: STATE_SET "default"; - targets: "bg_effect" "clipper_bg_effect"; + targets: "bg_effect" "clipper_bg_effect" "clipper_bg"; } program { "clicked"; signal: "mouse,clicked,1"; @@ -966,7 +964,7 @@ } program { "finished_animation"; action: STATE_SET "default"; - targets: "bg_effect" "clipper_bg_effect"; + targets: "bg_effect" "clipper_bg_effect" "clipper_bg"; } program { "clicked"; signal: "mouse,clicked,1"; @@ -1268,7 +1266,7 @@ } program { "finished_animation"; action: STATE_SET "default"; - targets: "bg_effect" "clipper_bg_effect"; + targets: "bg_effect" "clipper_bg_effect" "clipper_bg"; } program { "multi_down"; signal: "elm,action,multi,down"; @@ -1415,7 +1413,6 @@ color_class: "button/editfield_clear/icon_pressed"; } desc { "disabled"; - inherit: "default"; color_class: "button/editfield_clear/icon_disabled"; } } @@ -3005,9 +3002,7 @@ group { "elm/button/base/contacts"; } program { "finished_animation"; action: STATE_SET "default"; - target: "bg_effect"; - target: "clipper_bg"; - target: "clipper_bg_effect"; + targets: "clipper_bg" "bg_effect" "clipper_bg_effect"; target_groups: "bg_effect_vector"; } program { "play_sound"; @@ -3268,9 +3263,6 @@ group { "elm/button/base/contacts"; inherit: "ready"; color: 255 255 255 255; } - desc { "disabled"; - inherit: "ready"; - } } image { "icon"; scale; |