From: shilpa singh Date: Thu, 19 Apr 2012 06:51:50 +0000 (+0530) Subject: [Merge conflict resolved] X-Git-Tag: 2.0_alpha~163 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e98b346ff95093a4d6baa0b4ea447e06cdbde8c5;p=framework%2Fuifw%2Fefl-theme-tizen.git [Merge conflict resolved] [Colorselector]: GUI v1.5 changes. Bug fix: calendar app: when colorselector is added popup, colorselector goes out of popup. Change-Id: I8234a16dae35332f320dded19032dab1936f235f --- diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index 2df7fc0..dea27ac 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -1048,8 +1048,9 @@ #define DATETIME_SEPARATOR_TEXT_COLOR_INC 150 150 150 255 #define DATETIME_TEXT_SELECTED_COLOR_INC 42 109 140 255 -#define COLORSELECTOR_MIN_W_INC 704 +#define COLORSELECTOR_MIN_W_INC 624 #define COLORSELECTOR_MIN_H_INC 336 +#define COLORSELECTOR_MAX_W_INC 1014 #define COLORSELECTOR_COLORBAR_IMAGE0_BORDER 13 13 10 3 #define COLORSELECTOR_COLORBAR_IMAGE1_BORDER 4 4 3 3 #define COLORSELECTOR_COLORBAR_IMAGE2_BORDER 13 13 3 15 @@ -1068,7 +1069,6 @@ #define COLORSELECTOR_BUTTON_HEIGHT 74 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6 #define COLORSELECTOR_PADDING_COLOR_INC 68 68 68 255 -#define COLORSELECTOR_BAR_COLOR_INC 0 0 0 255 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index a06c7a5..f1d3998 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -1037,6 +1037,7 @@ #define COLORSELECTOR_MIN_W_INC 470 #define COLORSELECTOR_MIN_H_INC 210 +#define COLORSELECTOR_MAX_W_INC 680 #define COLORSELECTOR_COLORBAR_IMAGE0_BORDER 13 13 10 3 #define COLORSELECTOR_COLORBAR_IMAGE1_BORDER 4 4 3 3 #define COLORSELECTOR_COLORBAR_IMAGE2_BORDER 13 13 3 15 @@ -1055,7 +1056,6 @@ #define COLORSELECTOR_BUTTON_HEIGHT 46 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6 #define COLORSELECTOR_PADDING_COLOR_INC 68 68 68 255 -#define COLORSELECTOR_BAR_COLOR_INC 0 0 0 255 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 54 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 54 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index e566f14..61f4065 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -1054,8 +1054,9 @@ #define DATETIME_SEPARATOR_TEXT_COLOR_INC 100 100 100 255 #define DATETIME_TEXT_SELECTED_COLOR_INC 224 134 21 255 -#define COLORSELECTOR_MIN_W_INC 704 +#define COLORSELECTOR_MIN_W_INC 624 #define COLORSELECTOR_MIN_H_INC 336 +#define COLORSELECTOR_MAX_W_INC 1014 #define COLORSELECTOR_COLORBAR_IMAGE0_BORDER 13 13 10 3 #define COLORSELECTOR_COLORBAR_IMAGE1_BORDER 4 4 3 3 #define COLORSELECTOR_COLORBAR_IMAGE2_BORDER 13 13 3 15 @@ -1074,7 +1075,6 @@ #define COLORSELECTOR_BUTTON_HEIGHT 74 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6 #define COLORSELECTOR_PADDING_COLOR_INC 199 199 199 255 -#define COLORSELECTOR_BAR_COLOR_INC 249 249 249 255 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 86 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 86 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index adcbb61..c347980 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -1050,6 +1050,7 @@ #define COLORSELECTOR_MIN_W_INC 470 #define COLORSELECTOR_MIN_H_INC 210 +#define COLORSELECTOR_MAX_W_INC 680 #define COLORSELECTOR_COLORBAR_IMAGE0_BORDER 13 13 10 3 #define COLORSELECTOR_COLORBAR_IMAGE1_BORDER 4 4 3 3 #define COLORSELECTOR_COLORBAR_IMAGE2_BORDER 13 13 3 15 @@ -1068,7 +1069,6 @@ #define COLORSELECTOR_BUTTON_HEIGHT 46 #define COLORSELECTOR_BUTTON_BORDER 6 6 6 6 #define COLORSELECTOR_PADDING_COLOR_INC 199 199 199 255 -#define COLORSELECTOR_BAR_COLOR_INC 249 249 249 255 #define COLORSELECTOR_PALETTE_COLORBG_MIN_WIDTH_INC 54 #define COLORSELECTOR_PALETTE_COLORBG_MIN_HEIGHT_INC 54 diff --git a/themes/widgets/colorselector.edc b/themes/widgets/colorselector.edc index 30a026f..5ae1bd7 100644 --- a/themes/widgets/colorselector.edc +++ b/themes/widgets/colorselector.edc @@ -154,53 +154,19 @@ group{ color: 0 0 0 0; } } - part{ - name: "colorbar_0_bg"; - type: RECT; - mouse_events: 1; - description{ - state: "default" 0.0; - rel1.to: "elm.colorbar_0"; - rel2.to: "elm.colorbar_0"; - color: COLORSELECTOR_BAR_COLOR_INC; - } - } - part{ - name: "colorbar_1_bg"; - type: RECT; - mouse_events: 1; - description{ - state: "default" 0.0; - rel1.to: "elm.colorbar_1"; - rel2.to: "elm.colorbar_1"; - color: COLORSELECTOR_BAR_COLOR_INC; - } - } - part{ - name: "colorbar_2_bg"; - type: RECT; - mouse_events: 1; - description{ - state: "default" 0.0; - rel1.to: "elm.colorbar_2"; - rel2.to: "elm.colorbar_2"; - color: COLORSELECTOR_BAR_COLOR_INC; - } - } part{ name: "top_padding"; type: RECT; scale: 1; ignore_flags: ON_HOLD; description { state: "default" 0.0; - visible: 0; min: 1 1; fixed: 1 1; - rel1.relative: 0.5 0.0; + color: COLORSELECTOR_PADDING_COLOR_INC; + rel2.relative: 1.0 0.0; rel1.to: "bg_rect"; rel2.to: "bg_rect"; - rel2.relative: 0.5 0.0; - align: 0.5 0.0; + align: 0.0 0.0; } } part{ @@ -210,8 +176,9 @@ group{ scale: 1; description{ state: "default" 0.0; - min:1 COLORSELECTOR_COLORBAR_HEIGHT; - fixed:0 1; + min: 1 COLORSELECTOR_COLORBAR_HEIGHT; + 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"; @@ -229,11 +196,10 @@ group{ min: 1 1; fixed: 1 1; color: COLORSELECTOR_PADDING_COLOR_INC; - rel1.relative: 0.5 1.0; - rel2.relative: 0.5 1.0; - rel1.to: "elm.colorbar_0"; - rel2.to: "elm.colorbar_0"; - align: 0.5 0.0; + rel1.relative: 0.0 1.0; + rel1.to_y: "elm.colorbar_0"; + rel2.to_y: "elm.colorbar_0"; + align: 0.0 0.0; } } part{ @@ -243,9 +209,9 @@ group{ scale: 1; description{ state: "default" 0.0; - min:1 COLORSELECTOR_COLORBAR_HEIGHT; - fixed:0 1; - rel1.relative: 0.0 1.0; + min: 1 COLORSELECTOR_COLORBAR_HEIGHT; + 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"; @@ -263,11 +229,10 @@ group{ min: 1 1; fixed: 1 1; color: COLORSELECTOR_PADDING_COLOR_INC; - rel1.relative: 0.5 1.0; - rel2.relative: 0.5 1.0; - rel1.to: "elm.colorbar_1"; - rel2.to: "elm.colorbar_1"; - align: 0.5 0.0; + rel1.relative: 0.0 1.0; + rel1.to_y: "elm.colorbar_1"; + rel2.to_y: "elm.colorbar_1"; + align: 0.0 0.0; } } part{ @@ -277,9 +242,9 @@ group{ scale: 1; description{ state: "default" 0.0; - min:1 COLORSELECTOR_COLORBAR_HEIGHT; - fixed:0 1; - rel1.relative: 0.0 1.0; + min: 1 COLORSELECTOR_COLORBAR_HEIGHT; + 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"; @@ -297,11 +262,10 @@ group{ min: 1 1; fixed: 1 1; color: COLORSELECTOR_PADDING_COLOR_INC; - rel1.relative: 0.5 1.0; - rel2.relative: 0.5 1.0; + rel1.relative: 0.0 1.0; rel1.to_y: "elm.colorbar_2"; rel2.to_y: "bg_rect"; - align: 0.5 0.0; + align: 0.0 0.0; } } }