From 34c79c9e2ffd29c3ed14d14ded623e33aad88d1d Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Mon, 9 Jan 2012 19:42:02 +0530 Subject: [PATCH] [tickernoti] Change in edc code to support all themes of tickernoti default style Change-Id: I2eabc842ef69b83379d89bb9f1455a5aceef060b --- themes/inc/tizen-black-hd-inc.edc | 10 +++--- themes/inc/tizen-black-inc.edc | 6 ++-- themes/inc/tizen-hd-inc.edc | 10 +++--- themes/inc/tizen-inc.edc | 6 ++-- themes/widgets/tickernoti.edc | 75 ++++++++++++++++++++++++++------------- 5 files changed, 70 insertions(+), 37 deletions(-) diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index b71a49a..6508c7f 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -1061,14 +1061,16 @@ #define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 48 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 98 +#define TICKERNOTI_DEFAULT_BG_BOTTOM_MIN_HEIGHT_INC 8 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 8 -#define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 10 8 -#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 16 -#define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 15 0 +#define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 16 13 +#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 16 13 +#define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 16 0 +#define TICKERNOTI_DEFAULT_TEXT_MIN_INC 0 60 #define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 90 54 #define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 90 54 #define TICKERNOTI_DEFAULT_ICON_MIN_INC 64 64 -#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 5 0 +#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 16 0 #define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 30 #define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 50 #define TICKERNOTI_INFO_BG_PADDING_LEFT_TOP_INC 8 5 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index 025e3fa..613e1e0 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -1046,14 +1046,16 @@ #define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 30 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 55 +#define TICKERNOTI_DEFAULT_BG_BOTTOM_MIN_HEIGHT_INC 5 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 5 #define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 10 5 -#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 10 +#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 5 #define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 10 0 +#define TICKERNOTI_DEFAULT_TEXT_MIN_INC 0 38 #define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 50 34 #define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 50 34 #define TICKERNOTI_DEFAULT_ICON_MIN_INC 40 40 -#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 5 0 +#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 10 0 #define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 20 #define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 27 #define TICKERNOTI_INFO_BG_PADDING_LEFT_TOP_INC 5 2 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 46e883e..c7e6bda 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -1075,14 +1075,16 @@ #define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 48 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 98 +#define TICKERNOTI_DEFAULT_BG_BOTTOM_MIN_HEIGHT_INC 8 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 8 -#define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 10 8 -#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 16 -#define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 15 0 +#define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 16 13 +#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 16 13 +#define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 16 0 +#define TICKERNOTI_DEFAULT_TEXT_MIN_INC 0 60 #define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 90 54 #define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 90 54 #define TICKERNOTI_DEFAULT_ICON_MIN_INC 64 64 -#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 5 0 +#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 16 0 #define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 30 #define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 50 #define TICKERNOTI_INFO_BG_PADDING_LEFT_TOP_INC 8 5 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index b8b9b92..7325070 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -1072,14 +1072,16 @@ #define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 30 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 55 +#define TICKERNOTI_DEFAULT_BG_BOTTOM_MIN_HEIGHT_INC 5 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 5 #define TICKERNOTI_DEFAULT_BG_PADDING_LEFT_TOP_INC 10 5 -#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 10 +#define TICKERNOTI_DEFAULT_BG_PADDING_RIGHT_BOTTOM_INC 10 5 #define TICKERNOTI_DEFAULT_PADDING_AFTER_ICON_INC 10 0 +#define TICKERNOTI_DEFAULT_TEXT_MIN_INC 0 38 #define TICKERNOTI_DEFAULT_BUTTON_MIN_INC 50 34 #define TICKERNOTI_DEFAULT_BUTTON_MAX_INC 50 34 #define TICKERNOTI_DEFAULT_ICON_MIN_INC 40 40 -#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 5 0 +#define TICKERNOTI_DEFAULT_PADDING_BEFORE_BUTTON_INC 10 0 #define TICKERNOTI_DEFAULT_TEXT_FONT_SIZE_INC 20 #define TICKERNOTI_INFO_BG_MIN_HEIGHT_INC 27 #define TICKERNOTI_INFO_BG_PADDING_LEFT_TOP_INC 5 2 diff --git a/themes/widgets/tickernoti.edc b/themes/widgets/tickernoti.edc index cbe4feb..5518489 100644 --- a/themes/widgets/tickernoti.edc +++ b/themes/widgets/tickernoti.edc @@ -306,7 +306,30 @@ relative: 1.0 1.0; to: "bg"; } - image.normal: "00_winset_notification_bg.png"; + image { + normal: "00_winset_notification_bg.png"; + border: TICKERNOTI_DEFAULT_BG_BORDER_INC; + border_scale: 1; + } + } + } + part { + name: "bg_bottom"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 1.0; + visible: 0; + fixed: 0 1; + min: 0 TICKERNOTI_DEFAULT_BG_BOTTOM_MIN_HEIGHT_INC; + rel1 { + relative: 0.0 1.0; + to: "bg"; + } + rel2 { + relative: 1.0 1.0; + to: "bg"; + } } } part { @@ -342,12 +365,12 @@ fixed: 1 1; align: 1.0 1.0; rel1 { - relative: 1.0 1.0; - to: "bg"; + relative: 1.0 0.0; + to: "bg_bottom"; } rel2 { - relative: 1.0 1.0; - to: "bg"; + relative: 1.0 0.0; + to: "bg_bottom"; } } } @@ -357,10 +380,13 @@ type: SWALLOW; scale: 1; mouse_events: 1; + clip_to: "base"; description { state: "default" 0.0; - fixed: 1 0; - align: 0.0 0.0; + fixed: 1 1; + min: TICKERNOTI_DEFAULT_ICON_MIN_INC; + max: TICKERNOTI_DEFAULT_ICON_MIN_INC; + align: 0.0 0.5; rel1 { relative: 1.0 1.0; to: "padding_left_top"; @@ -368,7 +394,7 @@ rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; - to_y: "padding_right_bottom"; + to_y: "bg_bottom"; } aspect: 1.0 1.0; aspect_preference: VERTICAL; @@ -386,14 +412,14 @@ fixed: 1 0; align: 0.0 0.0; rel1 { - relative: 1.0 1.0; + relative: 1.0 0.0; to_x: "icon"; - to_y: "padding_left_top"; + to_y: "bg"; } rel2 { relative: 1.0 0.0; to_x: "icon"; - to_y: "padding_right_bottom"; + to_y: "bg_bottom"; } } } @@ -406,15 +432,17 @@ description { state: "default" 0.0; visible: 0; + min: TICKERNOTI_DEFAULT_TEXT_MIN_INC; align: 0.0 0.5; rel1 { relative: 1.0 0.0; - to: "padding_icon_right"; + to_x: "padding_icon_right"; + to_y: "bg"; } rel2 { relative: 0.0 0.0; to_x: "padding_button_left"; - to_y: "padding_right_bottom"; + to_y: "bg_bottom"; } } } @@ -423,20 +451,16 @@ type: TEXTBLOCK; scale: 1; mouse_events: 0; + clip_to: "base"; description { state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - to: "text_rect"; - } - rel2 { - relative: 1.0 1.0; - to: "text_rect"; - } - align: 0.0 0.5; + fixed: 0 1; + rel1.to: "text_rect"; + rel2.to: "text_rect"; text { style: "style_text"; max: 0 1; + align: 0.0 0.5; } } } @@ -466,13 +490,14 @@ fixed: 1 1; align: 1.0 0.5; rel1 { - relative: 0.0 1.0; + relative: 0.0 0.0; to_x: "padding_right_bottom"; - to_y: "padding_left_top"; + to_y: "bg"; } rel2 { relative: 0.0 0.0; - to: "padding_right_bottom"; + to_x: "padding_right_bottom"; + to_y: "bg_bottom"; } } } -- 2.7.4