From 23a8a60bf4257be04bea22bf3c0f3453ddb33187 Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Fri, 6 Jan 2012 12:13:09 +0530 Subject: [PATCH] [Button] Added macros for text color in Picker Bar style's,needed for generic implementation of picker bar style. Change-Id: I555e1f0ee476e1ce70b1ae2e7e03155db40b9438 --- themes/inc/tizen-black-hd-inc.edc | 5 +++++ themes/inc/tizen-black-inc.edc | 5 +++++ themes/inc/tizen-hd-inc.edc | 5 +++++ themes/inc/tizen-inc.edc | 5 +++++ themes/widgets/button.edc | 20 ++++++++++---------- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index abb9000..4cacd55 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -508,6 +508,11 @@ #define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 44 44 #define BUTTON_TICKERNOTI_FONT_SIZE_INC 28 +#define BUTTON_PICKER_TEXT_DEFAULT_COLOR_INC 249 249 249 255 +#define BUTTON_PICKER_TEXT_CLICKED_COLOR_INC 249 249 249 255 +#define BUTTON_PICKER_TEXT_DISABLED_COLOR_INC 106 106 106 255 +#define BUTTON_PICKER_TEXT_FOCUSED_COLOR_INC 249 249 249 255 + #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 74 66 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index 838ba60..322efa4 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -492,6 +492,11 @@ #define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 30 30 #define BUTTON_TICKERNOTI_FONT_SIZE_INC 20 +#define BUTTON_PICKER_TEXT_DEFAULT_COLOR_INC 249 249 249 255 +#define BUTTON_PICKER_TEXT_CLICKED_COLOR_INC 249 249 249 255 +#define BUTTON_PICKER_TEXT_DISABLED_COLOR_INC 106 106 106 255 +#define BUTTON_PICKER_TEXT_FOCUSED_COLOR_INC 249 249 249 255 + #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 46 42 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 4 4 4 4 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index bce59f0..e89e370 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -523,6 +523,11 @@ #define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 44 44 #define BUTTON_TICKERNOTI_FONT_SIZE_INC 28 +#define BUTTON_PICKER_TEXT_DEFAULT_COLOR_INC 78 73 69 255 +#define BUTTON_PICKER_TEXT_CLICKED_COLOR_INC 255 255 255 255 +#define BUTTON_PICKER_TEXT_DISABLED_COLOR_INC 0 0 0 128 +#define BUTTON_PICKER_TEXT_FOCUSED_COLOR_INC 255 255 255 255 + #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 74 66 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 5 5 5 5 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 16 5 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index 33e2f4c..c8a06ff 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -517,6 +517,11 @@ #define BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC 30 30 #define BUTTON_TICKERNOTI_FONT_SIZE_INC 20 +#define BUTTON_PICKER_TEXT_DEFAULT_COLOR_INC 78 73 69 255 +#define BUTTON_PICKER_TEXT_CLICKED_COLOR_INC 255 255 255 255 +#define BUTTON_PICKER_TEXT_DISABLED_COLOR_INC 0 0 0 128 +#define BUTTON_PICKER_TEXT_FOCUSED_COLOR_INC 255 255 255 255 + #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_MIN_INC 46 42 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_BG_DEFAULT_BORDER_INC 4 4 4 4 #define BUTTON_PICKER_PREV_TEXT_DEFAULT_PADDING_MIN_INC 10 5 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index a324cf7..48fe148 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -4716,7 +4716,7 @@ relative: 0.0 0.0; to: "padding_right_bottom"; } - color: 78 73 69 255; + color: BUTTON_PICKER_TEXT_DEFAULT_COLOR_INC; text { font: "SLP:style=Medium"; size: BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC; @@ -4733,15 +4733,15 @@ inherit: "default" 0.0; visible: 1; min: 0 0; - color: 255 255 255 255; + color: BUTTON_PICKER_TEXT_CLICKED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; + color: BUTTON_PICKER_TEXT_DISABLED_COLOR_INC; } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; + color: BUTTON_PICKER_TEXT_DISABLED_COLOR_INC; visible: 1; min: BUTTON_PICKER_BAR_DEFAULT_TEXT_VISIBLE_MIN_INC; } @@ -4749,7 +4749,7 @@ inherit: "default" 0.0; visible: 1; min: 0 0; - color: 255 255 255 255; + color: BUTTON_PICKER_TEXT_FOCUSED_COLOR_INC; } } part { name: "over2"; @@ -5135,7 +5135,7 @@ relative: 0.0 0.0; to: "padding_right_bottom"; } - color: 78 73 69 255; + color: BUTTON_PICKER_TEXT_DEFAULT_COLOR_INC; text { font: "SLP:style=Medium"; size: BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC; @@ -5152,15 +5152,15 @@ inherit: "default" 0.0; visible: 1; min: 0 0; - color: 255 255 255 255; + color: BUTTON_PICKER_TEXT_CLICKED_COLOR_INC; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; + color: BUTTON_PICKER_TEXT_DISABLED_COLOR_INC; } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; + color: BUTTON_PICKER_TEXT_DISABLED_COLOR_INC; visible: 1; min: BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_VISIBLE_MIN_INC; } @@ -5168,7 +5168,7 @@ inherit: "default" 0.0; visible: 1; min: 0 0; - color: 255 255 255 255; + color: BUTTON_PICKER_TEXT_FOCUSED_COLOR_INC; } } part { name: "over2"; -- 2.7.4