Fix color picker layout

[Title] Fix color picker layout.
[Issue#] N_SE-43403
[Problem] Color picker layout is broken in WVGA mode.
[Cause] EDC implementation.
[Solution] Fix color picker layout.

Change-Id: I1277552fe6e362b194beb1cbe348f15404e55d0d

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/control.edc b/Source/WebKit2/UIProcess/API/efl/tizen/control.edc
index 3a4f00c..414d2e3 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/control.edc
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/control.edc
@@ -269,57 +269,13 @@ collections {
                 type: RECT;
                 description { state: "default" 0.0;
                     visible: 0;
-                    min : 0 150;
+                    min : 0 140;
                     fixed: 0 0;
                     align: 0.0 0.0;
                     rel1 {relative: 0.0 0.0; to: "bg"; }
                     rel2 {relative: 1.0 0.0; to: "bg"; }
                 }
             }
-            part { name: "color_palette_bg";
-                scale: 1;
-                type: RECT;
-                description { state: "default" 0.0;
-                    visible: 0;
-                    fixed: 1 0;
-                    align: 0.0 0.0;
-                    rel1 {relative: 0.0 1.0; to_x: "bg"; to_y: "color_rect_bg"; }
-                    rel2 {relative: 1.0 1.0; to: "bg"; }
-                }
-            }
-            part { name: "pad_l";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 20 0;
-                    fixed: 1 0;
-                    align: 0.0 0.0;
-                    rel1 {relative: 0.0 0.0; to: "bg"; }
-                    rel2 {relative: 0.0 1.0; to: "bg"; }
-                }
-            }
-            part { name: "pad_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 1.0 0.0;
-                    rel1 {relative: 1.0 0.0; to: "bg"; }
-                    rel2 {relative: 1.0 1.0; to: "bg"; }
-                }
-            }
-            part { name: "pad_b";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 0 10;
-                    fixed: 0 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 0.0 1.0; to: "bg"; }
-                    rel2 {relative: 1.0 1.0; to: "bg"; }
-                }
-            }
             part { name: "elm.swallow.color_rect";
                 scale: 1;
                 type: SWALLOW;
@@ -328,33 +284,34 @@ collections {
                     min: 200 80;
                     max: 200 80;
                     fixed: 1 1;
-                    align: 0.5 0.3;
+                    align: 0.5 0.4;
                     rel1 {relative: 0.0 0.0; to: "color_rect_bg"; }
                     rel2 {relative: 1.0 1.0; to: "color_rect_bg"; }
                 }
             }
-            part { name: "elm.swallow.color1";
+
+            part { name: "color_palette_bg";
                 scale: 1;
-                type: SWALLOW;
+                type: RECT;
                 description { state: "default" 0.0;
-                    visible: 1;
-                    min: 70 70;
-                    max: 70 70;
-                    fixed: 1 1;
+                    visible: 0;
                     align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_l"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_l"; to_y: "color_palette_bg"; }
+                    min: 710 200;
+                    rel1 {relative: 0.0 1.0; to: "color_rect_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "bg"; }
                 }
             }
-            part { name: "pad_color1_r";
-                type: SPACER;
+           part { name: "elm.swallow.color1";
                 scale: 1;
+                type: SWALLOW;
                 description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color1"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color1"; }
+                    visible: 1;
+                    min: 70 70;
+                    max: 70 70;
+                    fixed: 1 1;
+                    align: 0.125 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color2";
@@ -365,20 +322,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_color1_r"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_color1_r"; to_y: "color_palette_bg"; }
-                }
-            }
-            part { name: "pad_color2_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color2"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color2"; }
+                    align: 0.25 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color3";
@@ -389,20 +335,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_color2_r"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_color2_r"; to_y: "color_palette_bg"; }
-                }
-            }
-            part { name: "pad_color3_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color3"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color3"; }
+                    align: 0.375 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color4";
@@ -413,20 +348,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_color3_r"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_color3_r"; to_y: "color_palette_bg"; }
-                }
-            }
-            part { name: "pad_color4_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color4"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color4"; }
+                    align: 0.5 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color5";
@@ -437,20 +361,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_color4_r"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_color4_r"; to_y: "color_palette_bg"; }
-                }
-            }
-            part { name: "pad_color5_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color5"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color5"; }
+                    align: 0.625 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color6";
@@ -461,20 +374,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_color5_r"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_color5_r"; to_y: "color_palette_bg"; }
-                }
-            }
-            part { name: "pad_color6_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color6"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color6"; }
+                    align: 0.75 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color7";
@@ -485,9 +387,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {relative: 1.0 0.0; to_x: "pad_color6_r"; to_y: "color_palette_bg"; }
-                    rel2 {relative: 1.0 0.0; to_x: "pad_color6_r"; to_y: "color_palette_bg"; }
+                    align: 0.875 0.0;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color8";
@@ -498,20 +400,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_l"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_l"; to_y: "pad_b"; }
-                }
-            }
-            part { name: "pad_color8_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color8"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color8"; }
+                    align: 0.125 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color9";
@@ -522,20 +413,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_color8_r"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_color8_r"; to_y: "pad_b"; }
-                }
-            }
-            part { name: "pad_color9_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color9"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color9"; }
+                    align: 0.25 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color10";
@@ -546,20 +426,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_color9_r"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_color9_r"; to_y: "pad_b"; }
-                }
-            }
-            part { name: "pad_color10_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color10"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color10"; }
+                    align: 0.375 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color11";
@@ -570,20 +439,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_color10_r"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_color10_r"; to_y: "pad_b"; }
-                }
-            }
-            part { name: "pad_color11_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color11"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color11"; }
+                    align: 0.5 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color12";
@@ -594,20 +452,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_color11_r"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_color11_r"; to_y: "pad_b"; }
-                }
-            }
-            part { name: "pad_color12_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color12"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color12"; }
+                    align: 0.625 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color13";
@@ -618,20 +465,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_color12_r"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_color12_r"; to_y: "pad_b"; }
-                }
-            }
-            part { name: "pad_color13_r";
-                type: SPACER;
-                scale: 1;
-                description { state: "default" 0.0;
-                    min : 10 0;
-                    fixed: 1 0;
-                    align: 0.0 0.5;
-                    rel1 {relative: 1.0 0.0; to: "elm.swallow.color13"; }
-                    rel2 {relative: 1.0 1.0; to: "elm.swallow.color13"; }
+                    align: 0.75 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
             part { name: "elm.swallow.color14";
@@ -642,9 +478,9 @@ collections {
                     min: 70 70;
                     max: 70 70;
                     fixed: 1 1;
-                    align: 0.0 1.0;
-                    rel1 {relative: 1.0 1.0; to_x: "pad_color13_r"; to_y: "pad_b"; }
-                    rel2 {relative: 1.0 1.0; to_x: "pad_color13_r"; to_y: "pad_b"; }
+                    align: 0.875 0.66;
+                    rel1 {relative: 0.0 0.0; to: "color_palette_bg"; }
+                    rel2 {relative: 1.0 1.0; to: "color_palette_bg"; }
                 }
             }
         }