From: Amit Kamboj Date: Mon, 24 Jun 2013 15:31:23 +0000 (+0530) Subject: '[Popup] Apply Dark theme version 0.7 X-Git-Tag: submit/tizen_2.2/20130714.144922~90 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cbe44ffe91af3283d418f602a895e3f67972147;p=framework%2Fuifw%2Fefl-theme-tizen.git '[Popup] Apply Dark theme version 0.7 Change-Id: I83d2d272faa0b044f3f12673bbc729214102e03d --- diff --git a/themes/images/HD/dark/Popup/00_bottom_popup_shadow.png b/themes/images/HD/dark/Popup/00_bottom_popup_shadow.png deleted file mode 100644 index 74fe293..0000000 Binary files a/themes/images/HD/dark/Popup/00_bottom_popup_shadow.png and /dev/null differ diff --git a/themes/images/HD/dark/Popup/00_popup_button_bg.png b/themes/images/HD/dark/Popup/00_popup_button_bg.png index a3b92e6..10c7466 100644 Binary files a/themes/images/HD/dark/Popup/00_popup_button_bg.png and b/themes/images/HD/dark/Popup/00_popup_button_bg.png differ diff --git a/themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png b/themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png deleted file mode 100644 index d489652..0000000 Binary files a/themes/images/HD/dark/Popup/00_popup_dim_lighting_h.png and /dev/null differ diff --git a/themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png b/themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png deleted file mode 100644 index 51ee8e3..0000000 Binary files a/themes/images/HD/dark/Popup/00_popup_dim_lighting_v.png and /dev/null differ diff --git a/themes/images/HD/dark/Popup/00_popup_title_bg.png b/themes/images/HD/dark/Popup/00_popup_title_bg.png index ce8289d..d982805 100644 Binary files a/themes/images/HD/dark/Popup/00_popup_title_bg.png and b/themes/images/HD/dark/Popup/00_popup_title_bg.png differ diff --git a/themes/images/HD/light/Popup/00_bottom_popup_shadow.png b/themes/images/HD/light/Popup/00_bottom_popup_shadow.png deleted file mode 100644 index 74fe293..0000000 Binary files a/themes/images/HD/light/Popup/00_bottom_popup_shadow.png and /dev/null differ diff --git a/themes/images/HD/light/Popup/00_popup_dim_lighting_h.png b/themes/images/HD/light/Popup/00_popup_dim_lighting_h.png deleted file mode 100644 index d489652..0000000 Binary files a/themes/images/HD/light/Popup/00_popup_dim_lighting_h.png and /dev/null differ diff --git a/themes/images/HD/light/Popup/00_popup_dim_lighting_v.png b/themes/images/HD/light/Popup/00_popup_dim_lighting_v.png deleted file mode 100644 index 51ee8e3..0000000 Binary files a/themes/images/HD/light/Popup/00_popup_dim_lighting_v.png and /dev/null differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 097d45c..fc0214a 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -873,11 +873,11 @@ #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47 -#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 30 31 -#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 30 31 -#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 652 78 -#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78 -#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 28 0 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 12 13 30 31 +#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 12 13 30 31 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 620 78 +#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 800 78 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 300 #define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 300 @@ -890,8 +890,8 @@ #define POPUP_LABEL_DESC_TOP_PADDING 32 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32 #define POPUP_ACTION_DESC_TOP_PADDING 11 -#define POPUP_TITLE_LEFT_PADDING 42 -#define POPUP_TITLE_RIGHT_PADDING 42 +#define POPUP_TITLE_LEFT_PADDING 26 +#define POPUP_TITLE_RIGHT_PADDING 26 #define POPUP_TITLE_TOP_PADDING 0 #define POPUP_TITLE_BOTTOM_PADDING 0 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 10 @@ -906,7 +906,7 @@ #define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 96 #define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 78 -#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 568 296 +#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 596 296 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10 #define POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT "296" @@ -927,8 +927,8 @@ #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134 #define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96" -#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 396 76 -#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 604 76 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 394 76 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 596 76 #define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 76 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 76 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 76 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index ad3feb1..a39b818 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -899,15 +899,15 @@ #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47 -#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 30 31 -#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 30 31 -#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 652 78 -#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78 -#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 28 0 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 12 13 30 31 +#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 12 13 30 31 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 620 78 +#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 800 78 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 26 0 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 0 #define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 0 -#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96 +#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96 #define POPUP_DESC_LEFT_PADDING 16 #define POPUP_DESC_RIGHT_PADDING 16 @@ -916,8 +916,8 @@ #define POPUP_LABEL_DESC_TOP_PADDING 32 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32 #define POPUP_ACTION_DESC_TOP_PADDING 11 -#define POPUP_TITLE_LEFT_PADDING 42 -#define POPUP_TITLE_RIGHT_PADDING 42 +#define POPUP_TITLE_LEFT_PADDING 26 +#define POPUP_TITLE_RIGHT_PADDING 26 #define POPUP_TITLE_TOP_PADDING 0 #define POPUP_TITLE_BOTTOM_PADDING 0 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 10 @@ -953,8 +953,8 @@ #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134 #define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96" -#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 396 76 -#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 604 76 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 394 76 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 596 76 #define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 76 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 76 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 76 diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc index d54079f..49807bd 100644 --- a/themes/widgets/popup.edc +++ b/themes/widgets/popup.edc @@ -274,32 +274,6 @@ group { name: "elm/notify/block_events/popup"; target: "popup_indicator"; transition: LINEAR 0.2; } - /* - program { name: "landscape_mode"; - source: "elm"; - signal: "elm,state,orient,90"; - action: STATE_SET "landscape" 0.0; - target: "block_events"; - } - program { name: "landscape_mode2"; - source: "elm"; - signal: "elm,state,orient,270"; - action: STATE_SET "landscape" 0.0; - target: "block_events"; - } - program { name: "portrait_mode"; - source: "elm"; - signal: "elm,state,orient,0"; - action: STATE_SET "default" 0.0; - target: "block_events"; - } - program { name: "portrait_mode2"; - source: "elm"; - signal: "elm,state,orient,180"; - action: STATE_SET "default" 0.0; - target: "block_events"; - } - */ } } @@ -493,7 +467,6 @@ group { name: "elm/popup/base/default"; border_scale: 1; } fill.smooth: 0; - align: 0.5 0.5; } description { state: "landscape" 0.0; inherit: "default" 0.0; @@ -515,13 +488,12 @@ group { name: "elm/popup/base/default"; border_scale: 1; } rel1 { - relative: 0.0 1.0; - to_x: "base"; - to_y: "shadow_left_top_padding"; + relative: 1.0 1.0; + to: "shadow_left_top_padding"; } rel2 { - relative: 1.0 1.0; - to_x: "base"; + relative: 0.0 1.0; + to_x: "shadow_right_bottom_padding"; to_y: "shadow_left_top_padding"; } fill.smooth: 0; @@ -678,6 +650,7 @@ group { name: "elm/popup/base/default"; size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC; fit: 1 0; min: 0 1; + align: 0.0 0.5; } rel1 { relative: 1.0 0.0; @@ -801,6 +774,34 @@ group { name: "elm/popup/base/default"; color: 0 0 0 0; } } + part { name: "left_part"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: POPUP_DESC_LEFT_PADDING 0; + fixed: 1 0; + align: 0.0 0.0; + rel1.to: "base"; + rel2 { + to: "base"; + relative: 0.0 1.0; + } + } + } + part { name: "right_part"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: POPUP_DESC_RIGHT_PADDING 0; + fixed: 1 0; + align: 1.0 1.0; + rel1 { + relative: 1.0 0.0; + to: "base"; + } + rel2.to: "base"; + } + } part { name: "elm.bg.action_area"; scale : 1; description { state: "default" 0.0; @@ -814,10 +815,13 @@ group { name: "elm/popup/base/default"; border_scale: 1; } rel1 { + relative: 1.0 1.0; + to: "left_part"; + } + rel2 { relative: 0.0 1.0; - to: "base"; + to: "right_part"; } - rel2.to: "base"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -984,13 +988,13 @@ group { name: "elm/popup/base/verticalbuttonstyle"; fixed: 0 1; min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC; rel1 { - relative: 0.0 0.0; - to_x: "base"; + relative: 1.0 0.0; + to_x: "left_part"; to_y: "shadow_right_bottom_padding"; } rel2 { - relative: 1.0 0.0; - to_x: "base"; + relative: 0.0 0.0; + to_x: "right_part"; to_y: "shadow_right_bottom_padding"; } } @@ -2259,6 +2263,17 @@ group { name: "elm/popup/base/content_expand"; fixed: 1 1; } } + part { + name:"shadow_right_bottom_padding"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; + max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING; + align: 1 1; + fixed: 1 1; + } + } part { name: "elm.bg.title"; scale : 1; description { state: "default" 0.0; @@ -2272,14 +2287,14 @@ group { name: "elm/popup/base/content_expand"; border_scale: 1; } rel1 { - relative: 0.0 1.0; - to_x: "base"; - to_y: "shadow_left_top_padding"; + relative: 1.0 0.0; + to_x: "shadow_left_top_padding"; + to_y: "base"; } rel2 { - relative: 1.0 1.0; - to_x: "base"; - to_y: "shadow_left_top_padding"; + relative: 0.0 0.0; + to_x: "shadow_right_bottom_padding"; + to_y: "base"; } } description { state: "visible" 0.0; @@ -2342,16 +2357,18 @@ group { name: "elm/popup/base/content_expand"; size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC; fit: 1 0; min: 0 1; + align: 0.0 0.5; } visible: 0; rel1 { - relative: 1.0 1.0; to: "left_pad"; + relative: 1.0 1.0; } rel2 { - relative: 0.0 1.0; to: "right_pad"; + relative: 0.0 1.0; } + align: 0.0 0.5; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -2406,10 +2423,15 @@ group { name: "elm/popup/base/content_expand"; border_scale: 1; } rel1 { + relative: 1.0 1.0; + to_x: "shadow_left_top_padding"; + to_y: "base"; + } + rel2 { relative: 0.0 1.0; - to_x: "base"; + to_x: "shadow_right_bottom_padding"; + to_y: "base"; } - rel2.to_x: "base"; } description { state: "visible" 0.0; inherit: "default" 0.0;