From 0b931b08ee5e79576c57a2fa13bd69758f2cdd83 Mon Sep 17 00:00:00 2001 From: shilpa singh Date: Fri, 14 Jun 2013 15:47:52 +0530 Subject: [PATCH] [Colorselector]: Apply 0.4 changes. modified edc also to support double colored separator. Change-Id: I0ea39502f6a59bd2a7cbf792a865781892cd8f1e --- .../HD/dark/Controls/00_color_picker_handler.png | Bin 2922 -> 2930 bytes .../Controls/00_color_picker_palette_focus.png | Bin 3488 -> 3565 bytes themes/inc/tizen-dark-inc.edc | 3 +- themes/inc/tizen-light-inc.edc | 3 +- themes/widgets/colorselector.edc | 94 ++++++++++++++++++--- 5 files changed, 84 insertions(+), 16 deletions(-) diff --git a/themes/images/HD/dark/Controls/00_color_picker_handler.png b/themes/images/HD/dark/Controls/00_color_picker_handler.png index bbaa7e71f79e3cab133a4b90e1ec8e27e15318a4..02250e61df6435784a67db7b19de7e033b40467e 100644 GIT binary patch delta 187 zcmaDQ_DO8R0j~PFo-U3d6}R5pwB=%Q-PipsXUO4mTh4X2f6cVrl@u-pI35dns!kK7TDcALKU``)eJ=Ec5xxAfYszO?8+ zPpX&SEZ#DipNS1CFgvqBuJC(On)YSyyL)BM{#(_ft@LW*=1EZ-qS8wLNHRz^p9|$^Z-9$D7 z2YkpSgjnFCDd_5(E`fyn0lxYg!ya_i!AlxK=8}UT5QquXc%?;37Jyb+vlUjttOSAl6D9)cMFJ>Y)`_@tEjJ&G(I5&s65 z+u7N)*!^||ST2{#Py7A;;GYPMz2EN-%H{G?U>Ud) zCZ^lA{rumE1l@nO?dO0#7K?d8TB%gZWipuuT%u(%nFpm(DJO)`{PElEc6&c+hs|d5 zjbRv%bX~s>td3pR_4|flJZd(ZZ=%+=+wFbe_PC7K48wRF2JCjbu9R}ytNpc*?u~o# zWhv!$x7&5YcnrgM?BSTNR;$m#K%UU`^GfAA{OeN6?J$3yYPI?dmqtSR3eesKET(DN-7r32HR`&;b=?6lnj|fy)JO<1i25GmKeYdcn5Jp*NjD>em|9p^NSr4& z8jVJ0>b!rsx%mT-oN)7rwY9Z$FgP3zKLf)U&_6jjae{!2jg1`e^&*v29W;35~ih;KZjlBj^kLsQ4IKWaB%Q0j3ArM=A@Jly+N3a z5J?Il7NnF9v)ODe3}f5&zV~bZ;Ev-sm54z&v@CziEEEcP|BXNPLZOhiEX$0#^&Q8l z04x6CIb)jU)@2UPv74s31sN$s~3uu`wrUtWe#yMeIa@{u}@rxGm{|o+k?c0000%Sl8*RCwCtmO*P1K@`V-)8Sp6%jNPj$8mb@AINc>Ub$R;24sQBFxW!9UVrIc zq3ZSeOJLyw3`l>fs=Dd^1*xjK2_*fn<#xM$5H+FMY`#?#WgS@cTRNS7q$tXIv)Ozb zHMiYv9{|gPQ$M9B%F{5%Znt|XrQG)Re#)P0Z*mNn0(~YS^!POX`flgXG6Vx+|gA;#zD=O-?M zIgaD>f*;n_*6s~X&Aw)bPPjMl{11aT` zOeT{L^Eo~~J^;=JtIAoHbrjJE`_*dod7)5v9IX1lYN1egT&-50M^$~xvW|cie~U?J znpXT9{Y=xeB9I#D)Vi*}zDkg;>#v78wFgT8D~4ua>|O=PFpOPb1xO6Re89A(X~n1< z{!Er-9eG=q_Jf9CK4=QaX_{6vO>-~o9{SbkbUvA;x#vN0gB%4-{NzQP^1X;BE~y+{ g-;4Njl+*VC08Y5miwGJac>n+a07*qoM6N<$f|a*u-2eap diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 1792d4d..609e98c 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -1082,7 +1082,8 @@ #define COLORSELECTOR_BUTTON_WIDTH 74 #define COLORSELECTOR_BUTTON_HEIGHT 74 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6 -#define COLORSELECTOR_PADDING_COLOR_INC 225 223 218 255 +#define COLORSELECTOR_PADDING_COLOR_TOP_INC 39 40 43 255 +#define COLORSELECTOR_PADDING_COLOR_BOTTOM_INC 17 19 27 255 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index ddff958..a3366c0 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -1110,7 +1110,8 @@ #define COLORSELECTOR_BUTTON_WIDTH 74 #define COLORSELECTOR_BUTTON_HEIGHT 74 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6 -#define COLORSELECTOR_PADDING_COLOR_INC 225 223 218 255 +#define COLORSELECTOR_PADDING_COLOR_TOP_INC 185 184 178 255 +#define COLORSELECTOR_PADDING_COLOR_BOTTOM_INC 225 223 218 255 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86 diff --git a/themes/widgets/colorselector.edc b/themes/widgets/colorselector.edc index 0995a77..6930820 100644 --- a/themes/widgets/colorselector.edc +++ b/themes/widgets/colorselector.edc @@ -162,7 +162,7 @@ group{ color: 0 0 0 0; } } - part{ name: "top_padding"; + part{ name: "top_padding1"; type: RECT; scale: 1; ignore_flags: ON_HOLD; @@ -170,13 +170,28 @@ group{ state: "default" 0.0; min: 1 1; fixed: 1 1; - color: COLORSELECTOR_PADDING_COLOR_INC; + color: COLORSELECTOR_PADDING_COLOR_TOP_INC; rel2.relative: 1.0 0.0; rel1.to: "bg_rect"; rel2.to: "bg_rect"; align: 0.0 0.0; } } + part{ name: "top_padding2"; + type: RECT; + scale: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + min: 1 1; + fixed: 1 1; + color: COLORSELECTOR_PADDING_COLOR_BOTTOM_INC; + rel1.relative: 0.0 1.0; + rel1.to_y: "top_padding1"; + rel2.to_y: "top_padding1"; + align: 0.0 0.0; + } + } part{ name: "elm.colorbar_0"; type: SWALLOW; @@ -188,13 +203,13 @@ group{ max: COLORSELECTOR_MAX_W_INC COLORSELECTOR_COLORBAR_HEIGHT; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.to_y: "top_padding"; - rel2.to_y: "top_padding"; + rel1.to_y: "top_padding2"; + rel2.to_y: "top_padding2"; align: 0.5 0.0; } } part{ - name: "bottom_padding"; + name: "bottom_padding1"; type: RECT; scale: 1; ignore_flags: ON_HOLD; @@ -203,7 +218,7 @@ group{ visible: 1; min: 1 1; fixed: 1 1; - color: COLORSELECTOR_PADDING_COLOR_INC; + color: COLORSELECTOR_PADDING_COLOR_TOP_INC; rel1.relative: 0.0 1.0; rel1.to_y: "elm.colorbar_0"; rel2.to_y: "elm.colorbar_0"; @@ -211,6 +226,23 @@ group{ } } part{ + name: "bottom_padding2"; + type: RECT; + scale: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + visible: 1; + min: 1 1; + fixed: 1 1; + color: COLORSELECTOR_PADDING_COLOR_BOTTOM_INC; + rel1.relative: 0.0 1.0; + rel1.to_y: "bottom_padding1"; + rel2.to_y: "bottom_padding1"; + align: 0.0 0.0; + } + } + part{ name: "elm.colorbar_1"; type: SWALLOW; mouse_events: 1; @@ -221,13 +253,13 @@ group{ max: COLORSELECTOR_MAX_W_INC COLORSELECTOR_COLORBAR_HEIGHT; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.to_y: "bottom_padding"; - rel2.to_y: "bottom_padding"; + rel1.to_y: "bottom_padding2"; + rel2.to_y: "bottom_padding2"; align: 0.5 0.0; } } part { - name: "bottom_padding1"; + name: "bottom_padding3"; type: RECT; scale: 1; ignore_flags: ON_HOLD; @@ -236,13 +268,30 @@ group{ visible: 1; min: 1 1; fixed: 1 1; - color: COLORSELECTOR_PADDING_COLOR_INC; + color: COLORSELECTOR_PADDING_COLOR_TOP_INC; rel1.relative: 0.0 1.0; rel1.to_y: "elm.colorbar_1"; rel2.to_y: "elm.colorbar_1"; align: 0.0 0.0; } } + part { + name: "bottom_padding4"; + type: RECT; + scale: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + visible: 1; + min: 1 1; + fixed: 1 1; + color: COLORSELECTOR_PADDING_COLOR_BOTTOM_INC; + rel1.relative: 0.0 1.0; + rel1.to_y: "bottom_padding3"; + rel2.to_y: "bottom_padding3"; + align: 0.0 0.0; + } + } part{ name: "elm.colorbar_2"; type: SWALLOW; @@ -254,13 +303,13 @@ group{ max: COLORSELECTOR_MAX_W_INC COLORSELECTOR_COLORBAR_HEIGHT; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.to_y: "bottom_padding1"; - rel2.to_y: "bottom_padding1"; + rel1.to_y: "bottom_padding4"; + rel2.to_y: "bottom_padding4"; align: 0.5 0.0; } } part { - name: "bottom_padding2"; + name: "bottom_padding5"; type: RECT; scale: 1; ignore_flags: ON_HOLD; @@ -269,9 +318,26 @@ group{ visible: 1; min: 1 1; fixed: 1 1; - color: COLORSELECTOR_PADDING_COLOR_INC; + color: COLORSELECTOR_PADDING_COLOR_TOP_INC; rel1.relative: 0.0 1.0; rel1.to_y: "elm.colorbar_2"; + rel2.to_y: "elm.colorbar_2"; + align: 0.0 0.0; + } + } + part { + name: "bottom_padding6"; + type: RECT; + scale: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + visible: 1; + min: 1 1; + fixed: 1 1; + color: COLORSELECTOR_PADDING_COLOR_BOTTOM_INC; + rel1.relative: 0.0 1.0; + rel1.to_y: "bottom_padding5"; rel2.to_y: "bg_rect"; align: 0.0 0.0; } -- 2.7.4