From a5973a7647432be2c70edf0b45523d39e27927fc Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Fri, 13 Jan 2012 16:35:00 +0530 Subject: [PATCH] [Button] changed name of macro's as style name has changed from title_icon/default to more/default. Change-Id: I8c94c4c25174920cb3e18153c027e7b01be8120b --- themes/inc/tizen-black-hd-inc.edc | 7 +++---- themes/inc/tizen-black-inc.edc | 7 +++---- themes/inc/tizen-hd-inc.edc | 7 +++---- themes/inc/tizen-inc.edc | 7 +++---- themes/widgets/button.edc | 10 +++++----- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index fd8d8ed..b524d89 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -629,10 +629,9 @@ #define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 28 #define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 124 74 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 82 64 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_BORDER_INC 5 5 5 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_PADDING_MIN_INC 16 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC 50 50 +#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 64 +#define BUTTON_NAVIFRAME_MORE_BG_BORDER_INC 5 5 5 5 +#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 50 50 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index 0d3629d..c171da4 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -613,10 +613,9 @@ #define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 20 #define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 100 42 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 82 64 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_BORDER_INC 5 5 5 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_PADDING_MIN_INC 16 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC 50 50 +#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 64 +#define BUTTON_NAVIFRAME_MORE_BG_BORDER_INC 5 5 5 5 +#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 50 50 #define BUTTON_TICKERNOTI_BG_MIN_INC 34 34 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 42 34 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 9dff65c..6ab1392 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -634,10 +634,9 @@ #define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 28 #define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 124 74 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 82 64 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_BORDER_INC 5 5 5 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_PADDING_MIN_INC 16 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC 50 50 +#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 64 +#define BUTTON_NAVIFRAME_MORE_BG_BORDER_INC 5 5 5 5 +#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 50 50 #define BUTTON_TICKERNOTI_BG_MIN_INC 54 54 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 62 34 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index 695ae59..8076179 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -626,10 +626,9 @@ #define BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC 20 #define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC 100 42 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 82 64 -#define BUTTON_NAVIFRAME_TITLE_ICON_BG_BORDER_INC 5 5 5 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_PADDING_MIN_INC 16 5 -#define BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC 50 50 +#define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 82 64 +#define BUTTON_NAVIFRAME_MORE_BG_BORDER_INC 5 5 5 5 +#define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 50 50 #define BUTTON_TICKERNOTI_BG_MIN_INC 34 34 #define BUTTON_TICKERNOTI_VISIBLE_BG_MIN_INC 42 34 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index 74904f4..8ccba24 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -7114,11 +7114,11 @@ part { name: "button_image"; scale: 1; description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC; - max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC; + min: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC; + max: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC; image { normal: "00_Title_btn.png"; - border: BUTTON_NAVIFRAME_TITLE_ICON_BG_BORDER_INC; + border: BUTTON_NAVIFRAME_MORE_BG_BORDER_INC; border_scale: 1; } } @@ -7138,8 +7138,8 @@ scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC; - max: BUTTON_NAVIFRAME_TITLE_ICON_DEFAULT_IMAGE_MIN_MAX_INC; + min: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC; + max: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC; rel1.to: "button_image"; rel2.to: "button_image"; image.normal: "00_winset_more.png"; -- 2.7.4