[Colorselector]: Apply 0.4 changes. modified edc also to support

double colored separator.

Change-Id: I0ea39502f6a59bd2a7cbf792a865781892cd8f1e

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 bbaa7e7..02250e6 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_color_picker_handler.png and b/themes/images/HD/dark/Controls/00_color_picker_handler.png differ

diff --git a/themes/images/HD/dark/Controls/00_color_picker_palette_focus.png b/themes/images/HD/dark/Controls/00_color_picker_palette_focus.png
index 11bf712..0dcf094 100755 (executable)
Binary files a/themes/images/HD/dark/Controls/00_color_picker_palette_focus.png and b/themes/images/HD/dark/Controls/00_color_picker_palette_focus.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 1792d4d..609e98c 100755 (executable)
--- 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 (executable)
--- 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 (file)
--- 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;
          }