From: shaheba.m Date: Fri, 14 Jun 2013 04:46:08 +0000 (+0530) Subject: [Button] Added focus for buttons. X-Git-Tag: accepted/tizen/20131029.210118~180 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b38dd4fc449d86ff3ae3b58fb8c33811d2178aa7;p=profile%2Fivi%2Fefl-theme-tizen.git [Button] Added focus for buttons. Change-Id: Ie529b2f9aede119a2d5e4f937db83fb480996a96 Conflicts: themes/widgets/button.edc --- diff --git a/themes/00_icon_focus.png b/themes/00_icon_focus.png new file mode 100755 index 0000000..b95b4b3 Binary files /dev/null and b/themes/00_icon_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_button_01_focus.png b/themes/images/HD/dark/Controls/00_button_01_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Controls/00_button_handler_focus.png b/themes/images/HD/dark/Controls/00_button_handler_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Controls/00_button_radio_focus.png b/themes/images/HD/dark/Controls/00_button_radio_focus.png new file mode 100755 index 0000000..ec298f1 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_button_radio_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_check_focus.png b/themes/images/HD/dark/Controls/00_check_focus.png new file mode 100755 index 0000000..728f7e4 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_check_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_circle_button_focus.png b/themes/images/HD/dark/Controls/00_circle_button_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Controls/00_color_picker_handler_focus.png b/themes/images/HD/dark/Controls/00_color_picker_handler_focus.png new file mode 100755 index 0000000..da2b11b Binary files /dev/null and b/themes/images/HD/dark/Controls/00_color_picker_handler_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_color_picker_palette_focus.png b/themes/images/HD/dark/Controls/00_color_picker_palette_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Controls/00_fast_scroll_rollover_bg_line_focus.png b/themes/images/HD/dark/Controls/00_fast_scroll_rollover_bg_line_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Controls/00_picker_button_bg_focus.png b/themes/images/HD/dark/Controls/00_picker_button_bg_focus.png new file mode 100755 index 0000000..4009d35 Binary files /dev/null and b/themes/images/HD/dark/Controls/00_picker_button_bg_focus.png differ diff --git a/themes/images/HD/dark/Controls/00_slider_handle_focus.png b/themes/images/HD/dark/Controls/00_slider_handle_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png b/themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png new file mode 100755 index 0000000..5a80838 Binary files /dev/null and b/themes/images/HD/dark/Naviframe/00_toolbar_button_focus.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_focus.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_focus.png new file mode 100755 index 0000000..be33990 Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_focus.png differ diff --git a/themes/images/HD/dark/Popup/00_popup_button_focus.png b/themes/images/HD/dark/Popup/00_popup_button_focus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/light/Controls/00_button_01_focus.png b/themes/images/HD/light/Controls/00_button_01_focus.png new file mode 100755 index 0000000..39fb82a Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_01_focus.png differ diff --git a/themes/images/HD/light/Controls/00_button_on_off_handler_focus.png b/themes/images/HD/light/Controls/00_button_on_off_handler_focus.png new file mode 100755 index 0000000..fa8d992 Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_on_off_handler_focus.png differ diff --git a/themes/images/HD/light/Controls/00_button_radio_focus.png b/themes/images/HD/light/Controls/00_button_radio_focus.png new file mode 100755 index 0000000..61a187c Binary files /dev/null and b/themes/images/HD/light/Controls/00_button_radio_focus.png differ diff --git a/themes/images/HD/light/Controls/00_check_focus.png b/themes/images/HD/light/Controls/00_check_focus.png new file mode 100755 index 0000000..d058cb4 Binary files /dev/null and b/themes/images/HD/light/Controls/00_check_focus.png differ diff --git a/themes/images/HD/light/Controls/00_color_picker_handler_focus.png b/themes/images/HD/light/Controls/00_color_picker_handler_focus.png new file mode 100755 index 0000000..e75a92e Binary files /dev/null and b/themes/images/HD/light/Controls/00_color_picker_handler_focus.png differ diff --git a/themes/images/HD/light/Controls/00_picker_button_bg_focus.png b/themes/images/HD/light/Controls/00_picker_button_bg_focus.png new file mode 100755 index 0000000..4009d35 Binary files /dev/null and b/themes/images/HD/light/Controls/00_picker_button_bg_focus.png differ diff --git a/themes/images/HD/light/Naviframe/00_toolbar_button_focus.png b/themes/images/HD/light/Naviframe/00_toolbar_button_focus.png new file mode 100755 index 0000000..5a80838 Binary files /dev/null and b/themes/images/HD/light/Naviframe/00_toolbar_button_focus.png differ diff --git a/themes/images/HD/light/Naviframe/Icon/00_icon_focus.png b/themes/images/HD/light/Naviframe/Icon/00_icon_focus.png new file mode 100755 index 0000000..be33990 Binary files /dev/null and b/themes/images/HD/light/Naviframe/Icon/00_icon_focus.png differ diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index 2b58a8e..5a2ab55 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -2094,7 +2094,7 @@ rel1.to : "button_image"; rel2.to : "button_image"; image { - normal: "00_button_01_focus.png"; + normal: "00_popup_button_focus.png"; border: BUTTON_POPUP_BG_BORDER_INC; border_scale: 1; } @@ -3025,6 +3025,7 @@ image: "00_circle_button_dim.png" COMP; \ image: image_normal COMP; \ image: image_press COMP; \ + image: 00_circle_button_focus.png COMP;\ } \ parts { \ part { name: "button_image"; \ @@ -5432,6 +5433,10 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") image: "00_toolbar_button_dim.png" COMP; image: "00_button_icon_arrow.png" COMP; image: "00_button_icon_arrow_press.png" COMP; + image: "00_toolbar_button_focus.png" COMP; + } + data { + item: "focus_highlight" "on"; } data { item: "focus_highlight" "on"; @@ -5847,6 +5852,24 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC; } } + part { name: "focus_image"; + scale: 1; + mouse_events: 0; + repeat_events: 1; + description { state: "default" 0.0; + visible: 0; + rel1.to : "button_image"; + rel2.to : "button_image"; + image { + normal: "00_icon_focus.png"; + border_scale: 1; + } + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "elm.swallow.content"; type: SWALLOW; scale: 1; @@ -5997,6 +6020,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") signal: "elm,state,orient,180"; action: SIGNAL_EMIT "elm,state,portrait" "elm"; } + program { name: "action_focus"; + signal: "elm,action,focus_highlight,show"; + source: "elm"; + action: STATE_SET "focused" 0.0; + target: "focus_image"; + } + program { name: "action_unfocus"; + signal: "elm,action,focus_highlight,hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "focus_image"; + } } }