From 25af6e9767b03aeaed88ed3df5036ebce3773d3c Mon Sep 17 00:00:00 2001 From: Amit Kamboj Date: Tue, 18 Jun 2013 10:14:03 +0530 Subject: [PATCH] [popup] Apply Dark theme for popup UX version 0.6 Change-Id: I8152b0bc08a80627dc979005624b90c5aed7402d Conflicts: themes/inc/tizen-dark-inc.edc --- themes/images/HD/dark/Popup/00_popup_button_bg.png | Bin 3056 -> 3033 bytes themes/images/HD/dark/Popup/00_popup_title_bg.png | Bin 3047 -> 3024 bytes themes/inc/tizen-dark-inc.edc | 6 ++-- themes/inc/tizen-light-inc.edc | 4 +-- themes/widgets/popup.edc | 38 ++++++--------------- 5 files changed, 16 insertions(+), 32 deletions(-) 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 11e17c63586cfd541f23ef21c11854e079707cc4..a3b92e6e23f14a7741705761106cedabed9c87ff 100644 GIT binary patch delta 283 zcmV+$0p$Mh7ugq(7YaWJ1^@s6t4cc+u_2!de*{THK~#9!?AtL)13?sr@o$zL<2gKy zptlHH1Z+}UgcKe@BoOamA)X?&=p9V6kgUxXVx#P2m@s_*{>{vfH}kp)!!R&4_p9~v z;(z2}y$Vxn+mwxCyx?4u1e;yX>V(A@>x8v!TPLh(no40I)Cmj1gqHus@!gjzW18lSC z=DX5UahZB;e&uakv-r60fg9ivI3}!f9J_zJ=;q1O_EcXTdf*Ot0y^LtxB~wABeDlR h#*S}Ouiwvn4**ehC5MvY5DEYQ002ovPDHLkV1lY2eZ>F( delta 298 zcmV+_0oDH57w{L57Yb1b1^@s6nY2|uu_2!de;Y|eK~#9!?At#|13?&u@n@DD<2gKy zptlHH1Z=D=LJE%{5{UP(5Koa>;vKYENY-Wxu~Bz2Ocru})aqwspdqrl}MbLY=T6OxV$Ky02fDFk!-k zlS2z1lTZr>fA-Jx8Ta;4684r6_FfY9oDud?67~e_GobdsrX*|&tTVvYi*CLxT@`Or zug#CVj&l|-_dRe0JOGD;c@E?0UoX0OaO}y?hRd z@-3JF$ONj6O^hTAM1vNoY%r_@D$L}^F#0u|1YQah5|a~7_&@3Hp515r?c7RPmRy_R z_~ZQQ78n2>;0CCl&HsQO;1gKP-tNB%P9*}?dw4w^3*a4i0;(52-ve`Cv|c{{rh;|* zM3WP01Kjd=I1Zx710X@TRf6~kZ8vwO{p4zc14Xhpb zrQ4ZcjX+o<6RZe?6`5e^B9pKSACtWc5*;aX00030{{sMdi6jT9`pato0000inbPM4XN@NDSZvm!cDVj0v75(hH(CBn1Kr)b7z=I znx^3xbHb5Em@r|&gb5QSOqj5ravGw@)%0b5ssmI&A2IdC33( diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 512dcc4..67e8285 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -872,8 +872,8 @@ #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 32 47 -#define POPUP_BASE_DEFAULT_BUTTON_BG_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_TITLE_VOLUMEBAR_MIN_INC 648 68 @@ -881,7 +881,7 @@ #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 -#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 112 +#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96 #define POPUP_DESC_LEFT_PADDING 16 #define POPUP_DESC_RIGHT_PADDING 16 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index b048a86..4167e23 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -900,8 +900,8 @@ #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 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 32 47 -#define POPUP_BASE_DEFAULT_BUTTON_BG_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 636 78 #define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 816 78 #define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68 diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc index e89fbac..836cc6b 100644 --- a/themes/widgets/popup.edc +++ b/themes/widgets/popup.edc @@ -488,22 +488,6 @@ group { name: "elm/popup/base/default"; fixed: 1 1; } } - part { - name:"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; - rel1 { - relative: 0.0 1.0; - to: "base"; - } - rel2.to: "base"; - } - } part { name: "base"; scale: 1; description { state: "default" 0.0; @@ -852,11 +836,7 @@ group { name: "elm/popup/base/default"; fixed: 0 1; align: 0.0 0.0; rel1.to: "elm.bg.action_area"; - rel2 { - relative: 1.0 0.0; - to_x: "elm.bg.action_area"; - to_y: "bottom_padding"; - } + rel2.to: "elm.bg.action_area"; } } } @@ -2280,9 +2260,11 @@ group { name: "elm/popup/base/content_expand"; fixed : 0 1; align: 0.5 0.0; visible: 0; - image.normal: "00_popup_title_bg.png"; - image.border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC; - image.border_scale: 1; + image { + normal: "00_popup_title_bg.png"; + border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC; + border_scale: 1; + } rel1.to_x: "base"; rel2 { relative: 1.0 0.0; @@ -2408,9 +2390,11 @@ group { name: "elm/popup/base/content_expand"; fixed : 0 1; align: 0.5 1.0; visible: 0; - image.normal: "00_popup_button_bg.png"; - image.border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC; - image.border_scale: 1; + image { + normal: "00_popup_button_bg.png"; + border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC; + border_scale: 1; + } rel1 { relative: 0.0 1.0; to_x: "base"; -- 2.7.4