From: Amit Kamboj Date: Wed, 17 Apr 2013 05:04:59 +0000 (+0530) Subject: [Check] Added favorite small style. X-Git-Tag: 2.1b_release~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d252397a7d74a4efd8c4eaa911021422c57f4c8;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [Check] Added favorite small style. Change-Id: Iececeb41c62bc7cdb46e65ea3e77faecae560c7b --- diff --git a/themes/images/tizen-hd/Controls/00_icon_favorite_off_45x45.png b/themes/images/tizen-hd/Controls/00_icon_favorite_off_45x45.png new file mode 100644 index 0000000..13147dd Binary files /dev/null and b/themes/images/tizen-hd/Controls/00_icon_favorite_off_45x45.png differ diff --git a/themes/images/tizen-hd/Controls/00_icon_favorite_on_45x45.png b/themes/images/tizen-hd/Controls/00_icon_favorite_on_45x45.png new file mode 100644 index 0000000..94b2a7e Binary files /dev/null and b/themes/images/tizen-hd/Controls/00_icon_favorite_on_45x45.png differ diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 5b86718..305f6dd 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -622,6 +622,9 @@ #define CHECK_ONOFF_OFF_FONT_SIZE_INC 24 #define CHECK_ONOFF_HANDLER_MIN_MAX_INC 63 63 +#define CHECK_STYLE_FAVORITE_SMALL_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 45 +#define CHECK_STYLE_FAVORITE_SMALL_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 45 + #define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC 72 #define CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC 72 #define CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC 100 diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 1a0e701..919fe76 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -1287,13 +1287,13 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } /////////////////////////////////////////////////////////////////////////////////////// -#define CHECK_STYLE_FAVORITE(style_name, min_width, min_height) \ +#define CHECK_STYLE_FAVORITE(style_name, on_image, on_dim_image, off_image, off_dim_image, min_width, min_height) \ group { name: "elm/check/base/"style_name; \ images { \ - image: "00_icon_favorite_on_72x72.png" COMP; \ - image: "00_icon_favorite_on_72x72_dim.png" COMP; \ - image: "00_icon_favorite_off_72x72.png" COMP; \ - image: "00_icon_favorite_off_72x72_dim.png" COMP; \ + image: on_image COMP; \ + image: on_dim_image COMP; \ + image: off_image COMP; \ + image: off_dim_image COMP; \ } \ parts { \ part { name: "back_bg"; \ @@ -1315,8 +1315,8 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ visible: 0; \ rel1.to: "back_bg"; \ rel2.to: "back_bg"; \ - min: CHECK_STYLE_FAVORITE_BG_NORMAL_MIN_MAX_INC; \ - max: CHECK_STYLE_FAVORITE_BG_NORMAL_MIN_MAX_INC; \ + min: min_width min_height; \ + max: min_width min_height; \ fixed: 1 1; \ } \ } \ @@ -1327,19 +1327,19 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ description { state: "default" 0.0; \ rel1.to: "bg"; \ rel2.to: "bg"; \ - image.normal: "00_icon_favorite_off_72x72.png"; \ + image.normal: off_image; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_icon_favorite_on_72x72.png"; \ + image.normal: on_image; \ } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_icon_favorite_off_72x72_dim.png"; \ + image.normal: off_dim_image; \ } \ description { state: "disabled_visible" 0.0; \ inherit: "default" 0.0; \ - image.normal: "00_icon_favorite_on_72x72_dim.png"; \ + image.normal: on_dim_image; \ } \ } \ part { name: "elm.swallow.content"; \ @@ -1547,9 +1547,11 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ } \ } //////////////////////////////////////////////////////////////////////////////// -CHECK_STYLE_FAVORITE("favorite", CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC) +CHECK_STYLE_FAVORITE("favorite", "00_icon_favorite_on_72x72.png", "00_icon_favorite_on_72x72_dim.png", "00_icon_favorite_off_72x72.png", "00_icon_favorite_off_72x72_dim.png", CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC) +//////////////////////////////////////////////////////////////////////////////// +CHECK_STYLE_FAVORITE("favorite_small", "00_icon_favorite_on_45x45.png", "00_icon_favorite_on_45x45.png", "00_icon_favorite_off_45x45.png", "00_icon_favorite_off_45x45.png", CHECK_STYLE_FAVORITE_SMALL_DEFAULT_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_SMALL_DEFAULT_BG_IMAGE_MIN_HEIGHT_INC) //////////////////////////////////////////////////////////////////////////////// -CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC) +CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_icon_favorite_on_72x72_dim.png", "00_icon_favorite_off_72x72.png", "00_icon_favorite_off_72x72_dim.png", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_WIDTH_INC, CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE_MIN_HEIGHT_INC) //////////////////////////////////////////////////////////////////////////////// group { name: "elm/check/base/grid";