From: Amit Kamboj Date: Mon, 22 Apr 2013 11:34:27 +0000 (+0530) Subject: [UX 4.6] Radio and check implementation. X-Git-Tag: submit/tizen/20131004.114939~371 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=beba7fa3f2740113508611cef7448041916d1f2b;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [UX 4.6] Radio and check implementation. Change-Id: I8a43e8243779d46ca66caffafe97ea506ac8e48c --- diff --git a/themes/images/tizen-hd/Controls/Check_box/00_check_Activated_dim.png b/themes/images/tizen-hd/Controls/Check_box/00_check_Activated_dim.png new file mode 100644 index 0000000..c321e28 Binary files /dev/null and b/themes/images/tizen-hd/Controls/Check_box/00_check_Activated_dim.png differ diff --git a/themes/images/tizen-hd/Controls/Check_box/00_check_dim.png b/themes/images/tizen-hd/Controls/Check_box/00_check_dim.png deleted file mode 100644 index 0854732..0000000 Binary files a/themes/images/tizen-hd/Controls/Check_box/00_check_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_Activated_dim.png b/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_Activated_dim.png new file mode 100644 index 0000000..d82a2d7 Binary files /dev/null and b/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_Activated_dim.png differ diff --git a/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_dim.png b/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_dim.png deleted file mode 100644 index c6109ce..0000000 Binary files a/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_dim.png and /dev/null differ diff --git a/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_press.png b/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_press.png new file mode 100644 index 0000000..462d83e Binary files /dev/null and b/themes/images/tizen-hd/Controls/Radio_button/00_button_radio_press.png differ diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 1fb5aca..795840a 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -30,7 +30,7 @@ images { \ image: "00_check_bg.png" COMP; \ image: "00_check_dim_bg.png" COMP; \ - image: "00_check_dim.png" COMP; \ + image: "00_check_Activated_dim.png" COMP; \ image: "00_check_Activated.png" COMP; \ image: "00_check_press_bg.png" COMP; \ image: "00_check_press.png" COMP; \ @@ -94,7 +94,7 @@ description { state: "disabled_visible" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ - image.normal: "00_check_dim.png"; \ + image.normal: "00_check_Activated_dim.png"; \ color: 255 255 255 255; \ } \ description { state: "pressed" 0.0; \ @@ -422,7 +422,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI images { \ image: "00_check_bg.png" COMP; \ image: "00_check_dim_bg.png" COMP; \ - image: "00_check_dim.png" COMP; \ + image: "00_check_Activated_dim.png" COMP; \ image: "00_check_Activated.png" COMP; \ } \ script { \ @@ -471,7 +471,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI description { state: "disabled_visible" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ - image.normal: "00_check_dim.png"; \ + image.normal: "00_check_Activated_dim.png"; \ } \ } \ part { name: "elm.swallow.content"; \ @@ -1583,7 +1583,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i group { name: "elm/check/base/grid"; images.image: "00_check_bg.png" COMP; images.image: "00_check_dim_bg.png" COMP; - images.image: "00_check_dim.png" COMP; + images.image: "00_check_Activated_dim.png" COMP; images.image: "00_check_Activated.png" COMP; script { public check_state = CHECK_STATE_DEFAULT; @@ -1663,7 +1663,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i description { state: "disabled_visible" 0.0; inherit: "default" 0.0; visible: 1; - image.normal: "00_check_dim.png"; + image.normal: "00_check_Activated_dim.png"; } } part { name: "sequence_clip"; diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc index d57153c..b5ea6ef 100644 --- a/themes/widgets/radio.edc +++ b/themes/widgets/radio.edc @@ -38,11 +38,12 @@ #define RADIO_STYLE_DEFAULT(style_name, min_width, min_height) \ group { name: "elm/radio/base/"style_name; \ images { \ - image: "00_button_radio_dim.png" COMP; \ + image: "00_button_radio_Activated_dim.png" COMP; \ image: "00_button_radio_Activated.png" COMP; \ image: "00_button_radio_bg.png" COMP; \ image: "00_button_radio_dim_bg.png" COMP; \ image: "00_button_radio_press_bg.png" COMP; \ + image: "00_button_radio_press.png" COMP; \ } \ parts { \ part { name: "back_bg"; \ @@ -97,7 +98,11 @@ } \ description { state: "disabled_visible" 0.0; \ inherit: "visible" 0.0; \ - image.normal: "00_button_radio_dim.png"; \ + image.normal: "00_button_radio_Activated_dim.png"; \ + } \ + description { state: "pressed" 0.0; \ + inherit: "visible" 0.0; \ + image.normal: "00_button_radio_press.png"; \ } \ } \ part { name: "opacity_clip"; \ @@ -234,14 +239,44 @@ program { name: "bg_normal"; \ signal: "mouse,up,1"; \ source: "over2"; \ - action: STATE_SET "default" 0.0; \ - target: "bg"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"radio", st, 30, vl); \ + if (!strcmp(st, "pressed")) \ + set_state(PART:"radio", "visible", 0.0); \ + else \ + set_state(PART:"radio", "default", 0.0); \ + set_state(PART:"bg", "default", 0.0); \ + } \ } \ program { name: "pressed"; \ signal: "mouse,down,1"; \ source: "over2"; \ - action: STATE_SET "pressed" 0.0; \ - target: "bg"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"radio", st, 30, vl); \ + if (!strcmp(st, "visible")) \ + set_state(PART:"radio", "pressed", 0.0); \ + else \ + set_state(PART:"radio", "default", 0.0); \ + set_state(PART:"bg", "pressed", 0.0); \ + } \ + } \ + program { name: "mouse,out"; \ + signal: "mouse,out"; \ + source: "over2"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"radio", st, 30, vl); \ + if (!strcmp(st, "visible")) \ + set_state(PART:"radio", "visible", 0.0); \ + else \ + set_state(PART:"radio", "default", 0.0); \ + set_state(PART:"bg", "default", 0.0); \ + } \ } \ program { name: "radio_on"; \ signal: "elm,state,radio,on"; \