From 341c435591d9151dc8cab6a4f561a4790b94b48e Mon Sep 17 00:00:00 2001 From: "artem.popov" Date: Tue, 7 Aug 2012 20:58:56 +0300 Subject: [PATCH] [CTXPOPUP] changed shadow and bg, removed line between arrows and bg Change-Id: Id62de118fe03e782728c848feaa5d80b8cce492a --- themes/inc/tizen-hd-inc.edc | 6 ++++++ themes/widgets/ctxpopup.edc | 50 ++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 1cb0c80..7abf9cc 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -60,8 +60,14 @@ #define POPUP_CUSTOMSTYLE_TITLE_BOTTOM_LINE_COLOR_INC 70 82 102 255 #define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 249 249 249 255 +#define CTXPOPUP_ARROW_LEFT_OFFSET 0.0 +#define CTXPOPUP_ARROW_RIGHT_OFFSET 1.0 +#define CTXPOPUP_ARROW_UP_OFFSET 0.0 +#define CTXPOPUP_ARROW_DOWN_OFFSET 1.0 #define CTXPOPUP_BUBBLE_BG_IMAGE "00_popup_bubble_bg.png" #define CTXPOPUP_BG_IMAGE "00_popup_bg.png" +#define CTXPOPUP_FRAME_BG_LEFT_TOP_PADDING "ctxpopup_frame_left_top" +#define CTXPOPUP_FRAME_BG_RIGHT_BOTTOM_PADDING "ctxpopup_frame_right_bottom" #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 13 13 13 13 #define CTXPOPUP_BG_IMAGE_BORDER 3 3 3 3 #define CTXPOPUP_BG_COLOR_INC 0 0 0 255 diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index ffd5fb9..f0e3c0c 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -645,6 +645,23 @@ } } } + part { + name: "frame_bg"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "ctxpopup_clip"; + description { + state: "default" 0.0; + rel1 {to:CTXPOPUP_FRAME_BG_LEFT_TOP_PADDING;} + rel2 {to:CTXPOPUP_FRAME_BG_RIGHT_BOTTOM_PADDING;} + image { + normal: CTXPOPUP_BG_IMAGE; + border: CTXPOPUP_BG_IMAGE_BORDER; + border_scale: 1; + } + } + } part { name: "arrow_area_left"; type: RECT; mouse_events: 0; @@ -656,11 +673,11 @@ fixed: 1 1; align: 1 0.5; rel1 { - relative: 0 1; + relative: CTXPOPUP_ARROW_LEFT_OFFSET 1; to_y: "ctxpopup_frame_left_top"; } rel2 { - relative:0 0; + relative: CTXPOPUP_ARROW_LEFT_OFFSET 0; to:"ctxpopup_frame_left_bottom"; } } @@ -676,11 +693,11 @@ fixed: 1 1; align: 0 0.5; rel1 { - relative: 1 1; + relative: CTXPOPUP_ARROW_RIGHT_OFFSET 1; to:"ctxpopup_frame_right_top"; } rel2 { - relative: 1 0; + relative: CTXPOPUP_ARROW_RIGHT_OFFSET 0; to_y: "ctxpopup_frame_right_bottom"; } } @@ -696,11 +713,11 @@ fixed: 1 1; align: 0.5 1; rel1 { - relative: 1 0; + relative: 1 CTXPOPUP_ARROW_UP_OFFSET; to_x: "ctxpopup_frame_left_top"; } rel2 { - relative: 0 0; + relative: 0 CTXPOPUP_ARROW_UP_OFFSET; to:"ctxpopup_frame_right_top"; } } @@ -716,11 +733,11 @@ fixed: 1 1; align: 0.5 0; rel1 { - relative: 1 1; + relative: 1 CTXPOPUP_ARROW_DOWN_OFFSET; to:"ctxpopup_frame_left_bottom"; } rel2 { - relative: 0 1; + relative: 0 CTXPOPUP_ARROW_DOWN_OFFSET; to_x: "ctxpopup_frame_right_bottom"; } } @@ -885,23 +902,6 @@ } } part { - name: "frame_bg"; - type: IMAGE; - scale: 1; - mouse_events: 0; - clip_to: "ctxpopup_clip"; - description { - state: "default" 0.0; - rel1 {to:"ctxpopup_frame_left_top";} - rel2 {to:"ctxpopup_frame_right_bottom";} - image { - normal: CTXPOPUP_BG_IMAGE; - border: CTXPOPUP_BG_IMAGE_BORDER; - border_scale: 1; - } - } - } - part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "ctxpopup_clip"; -- 2.7.4