Refactor and update combo_box as tizen style
authorSanghyup Lee <sh53.lee@samsung.com>
Wed, 11 Sep 2013 01:10:55 +0000 (10:10 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 11 Sep 2013 04:26:53 +0000 (04:26 +0000)
[Title] Refactor and update combo_box as tizen style
[Issue#] N/A
[Problem] There are some bugs in combo button.
  1. previous combo button is too ugly.
  2. Combo button is displayed like blured with scale factor.
  3. transparent combo box draw ugly arrows and draw rounded border.
  4.There are some blank in popup.
[Cause] N/A
[Solution] Refactored combo box to fix abvoe problems.
  1. changed and update image which is bigger and more clear.
  2. supported scalability by adding scale data value.
  3. replaced manual drawing to signal for transparent background.
  (https://bugs.webkit.org/show_bug.cgi?id=117405)
  In addition, added resetBorder() like opensource and removed manual drawing.
  resetBorder() was removed for manual drawing, but we will not use manual drawing from now.
  4. Fill the blank as pannel color.

Change-Id: I255e6d9d2a07427dba6561e96962be0c1a267168

27 files changed:
ManualTests/tizen/control/combo.html [new file with mode: 0644]
Source/WebCore/platform/efl/RenderThemeEfl.cpp
Source/WebCore/platform/efl/RenderThemeEfl.h
Source/WebKit/efl/DefaultTheme/CMakeLists.txt
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_border.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_border.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_button.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal_button.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press_button.png [new file with mode: 0644]
Source/WebKit/efl/DefaultTheme/widget/combo/00_icon.png [new file with mode: 0755]
Source/WebKit/efl/DefaultTheme/widget/combo/combo.edc
Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_press.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png [deleted file]
Source/WebKit/efl/DefaultTheme/widget/combo/icon.png [deleted file]
Source/WebKit2/UIProcess/API/efl/tizen/control.edc

diff --git a/ManualTests/tizen/control/combo.html b/ManualTests/tizen/control/combo.html
new file mode 100644 (file)
index 0000000..9eb80f3
--- /dev/null
@@ -0,0 +1,17 @@
+<select>
+  <option value="a">DefaultButton</option>
+  <option value="b">b</option>
+  <option value="c">c</option>
+  <option value="e">e</option>
+  <option value="f">f</option>
+</select>
+<br><br>
+
+<select style="background-color:yellow;" >
+  <option value="a">YellowBgcolor</option>
+  <option value="b">b</option>
+  <option value="c">c</option>
+  <option value="e">e</option>
+  <option value="f">f</option>
+</select>
+
index f484ba5..37d231c 100755 (executable)
@@ -349,7 +349,8 @@ bool RenderThemeEfl::paintThemePart(RenderObject* object, FormType type, const P
         return false;
 
     applyEdjeStateFromForm(entry->o, controlStatesForRenderer(object));
-
+    if (object && object->hasBackground() && object->style()->visitedDependentColor(CSSPropertyBackgroundColor) != Color::white)
+        edje_object_signal_emit(entry->o, "bg_styled", "");
     cairo = info.context->platformContext()->cr();
     ASSERT(cairo);
 
@@ -971,51 +972,12 @@ void RenderThemeEfl::adjustMenuListStyle(StyleResolver* styleResolver, RenderSty
     } else
 #endif
     adjustSizeConstraints(style, ComboBox);
-
+    style->resetBorder();
     style->setWhiteSpace(PRE);
 }
 
-#if ENABLE(TIZEN_THEME_STYLE_WORKAROUND)
-const int COMBO_BUTTON_WIDTH = 16;
-
-bool RenderThemeEfl::paintTransparentMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    GraphicsContext* context = info.context;
-    context->save();
-
-    // Draw combo button.
-    int maxX = rect.maxX();
-    Color color = object->style()->visitedDependentColor(CSSPropertyBackgroundColor);
-    IntRect graybox(maxX - COMBO_BUTTON_WIDTH - 2, rect.y() + 2, COMBO_BUTTON_WIDTH, rect.height() - 4);
-    context->fillRect(graybox, color, ColorSpaceDeviceRGB);
-    context->setStrokeColor(Color::gray, ColorSpaceDeviceRGB);
-    context->strokeRect(graybox, 1);
-
-    // Draw arrow in combo button.
-    // 3, 8, 15 is three point of COMBO_BUTTON_WIDTH and -1 pixe is for gap between COMBO_BUTTON and boder.
-    int centerYOfRect = rect.y() + rect.height() / 2;
-    IntPoint pnt1(maxX - 1 - 15, centerYOfRect - 3);
-    IntPoint pnt2(maxX - 1 - 8, centerYOfRect + 5);
-    IntPoint pnt3(maxX - 1 - 3, centerYOfRect - 3);
-    context->setStrokeThickness(2);
-    context->drawLine(pnt1, pnt2);
-    context->drawLine(pnt2, pnt3);
-    context->restore();
-
-    return false;
-}
-#endif
-
 bool RenderThemeEfl::paintMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-#if ENABLE(TIZEN_THEME_STYLE_WORKAROUND)
-    if (object->hasBackground()) {
-        Color color = object->style()->visitedDependentColor(CSSPropertyBackgroundColor);
-
-        if (color != Color::white)
-            return paintTransparentMenuList(object, info, rect);
-    }
-#endif
     return paintThemePart(object, ComboBox, info, rect);
 }
 
index c5a8915..dea0165 100644 (file)
@@ -244,9 +244,6 @@ private:
     void applyEdjeStateFromForm(Evas_Object*, ControlStates);
     bool paintThemePart(RenderObject*, FormType, const PaintInfo&, const IntRect&);
     bool isFormElementTooLargeToDisplay(const IntSize&);
-#if ENABLE(TIZEN_THEME_STYLE_WORKAROUND)
-    bool paintTransparentMenuList(RenderObject*, const PaintInfo&, const IntRect&);
-#endif
 
 #if ENABLE(VIDEO)
     bool emitMediaButtonSignal(FormType, MediaControlElementType, const IntRect&);
index 3a51674..10da876 100644 (file)
@@ -24,15 +24,18 @@ ADD_CUSTOM_COMMAND(
         widget/check/img_check_on_hover.png
         widget/check/img_check_on.png
         widget/combo/combo.edc
-        widget/combo/combo_focus_button.png
-        widget/combo/combo_focus.png
-        widget/combo/combo_hover_button.png
-        widget/combo/combo_hover.png
-        widget/combo/combo_normal_button.png
-        widget/combo/combo_normal.png
-        widget/combo/combo_press_button.png
-        widget/combo/combo_press.png
-        widget/combo/icon.png
+        widget/combo/00_combo_focus_button.png
+        widget/combo/00_combo_focus.png
+        widget/combo/00_combo_hover_button.png
+        widget/combo/00_combo_hover.png
+        widget/combo/00_combo_normal_button.png
+        widget/combo/00_combo_normal.png
+        widget/combo/00_combo_press_button.png
+        widget/combo/00_combo_press.png
+        widget/combo/00_combo_border.png
+        widget/combo/00_combo_focus_border.png
+        widget/combo/00_combo_hover_border.png
+        widget/combo/00_icon.png
         widget/entry/entry.edc
         widget/entry/img_focused.png
         widget/entry/img_hovered.png
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_border.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_border.png
new file mode 100644 (file)
index 0000000..20e7430
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_border.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus.png
new file mode 100644 (file)
index 0000000..9308051
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_border.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_border.png
new file mode 100644 (file)
index 0000000..f486bcb
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_border.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_button.png
new file mode 100644 (file)
index 0000000..b13d63d
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_focus_button.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png
new file mode 100644 (file)
index 0000000..9308051
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png
new file mode 100644 (file)
index 0000000..f486bcb
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_border.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png
new file mode 100644 (file)
index 0000000..b13d63d
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_hover_button.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal.png
new file mode 100644 (file)
index 0000000..ae61afc
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal_button.png
new file mode 100644 (file)
index 0000000..5b02254
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_normal_button.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press.png
new file mode 100644 (file)
index 0000000..0e84123
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press_button.png
new file mode 100644 (file)
index 0000000..3167678
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_combo_press_button.png differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/00_icon.png b/Source/WebKit/efl/DefaultTheme/widget/combo/00_icon.png
new file mode 100755 (executable)
index 0000000..c24a161
Binary files /dev/null and b/Source/WebKit/efl/DefaultTheme/widget/combo/00_icon.png differ
index 63402aa..e4370c1 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-group {
-    name: "webkit/widget/combo";
+group { name: "webkit/widget/combo";
+    data { item: "scale" "2"; } /* original combo_size is 64, 29 , original combo_button size is 31, 29 */
 
     images {
-        image: "widget/combo/combo_normal.png" COMP;
-        image: "widget/combo/combo_normal_button.png" COMP;
-        image: "widget/combo/combo_hover.png" COMP;
-        image: "widget/combo/combo_hover_button.png" COMP;
-        image: "widget/combo/combo_focus.png" COMP;
-        image: "widget/combo/combo_focus_button.png" COMP;
-        image: "widget/combo/combo_press.png" COMP;
-        image: "widget/combo/combo_press_button.png" COMP;
-        image: "widget/combo/icon.png" COMP;
+        image: "widget/combo/00_combo_normal.png" COMP;
+        image: "widget/combo/00_combo_normal_button.png" COMP;
+        image: "widget/combo/00_combo_hover.png" COMP;
+        image: "widget/combo/00_combo_hover_button.png" COMP;
+        image: "widget/combo/00_combo_focus.png" COMP;
+        image: "widget/combo/00_combo_focus_button.png" COMP;
+        image: "widget/combo/00_combo_press.png" COMP;
+        image: "widget/combo/00_combo_press_button.png" COMP;
+        image: "widget/combo/00_combo_border.png" COMP;
+        image: "widget/combo/00_combo_focus_border.png" COMP;
+        image: "widget/combo/00_combo_hover_border.png" COMP;
+        image: "widget/combo/00_icon.png" COMP;
     }
 
     script {
         public isEnabled;
         public isPressed;
-        public isChecked;
         public isFocused;
         public isHovered;
+        public isStyled;
 
         public show() {
             if (get_int(isEnabled) == 1) {
-                set_state(PART:"combo", "default", 0.0);
-                set_state(PART:"combo_button", "default", 0.0);
-                set_state(PART:"combo_button_icon", "default", 0.0);
                 if (get_int(isFocused) == 1) {
-                    set_state(PART:"combo", "focused", 0.0);
-                    set_state(PART:"combo_button", "focused", 0.0);
                     if (get_int(isPressed) == 1) {
                         set_state(PART:"combo", "pressed", 0.0);
                         set_state(PART:"combo_button", "pressed", 0.0);
                     }
+                    else if (get_int(isStyled) == 1) {
+                        set_state(PART:"combo", "styled_focused", 0.0);
+                        set_state(PART:"combo_button", "focused", 0.0);
+                    }
+                    else {
+                        set_state(PART:"combo", "focused", 0.0);
+                        set_state(PART:"combo_button", "focused", 0.0);
+                    }
                 }
                 else if (get_int(isHovered) == 1) {
-                    set_state(PART:"combo", "hovered", 0.0);
-                    set_state(PART:"combo_button", "hovered", 0.0);
-                    if (get_int(isPressed) == 1) {
-                        set_state(PART:"combo", "pressed", 0.0);
-                        set_state(PART:"combo_button", "pressed", 0.0);
+                    if (get_int(isStyled) == 1) {
+                        set_state(PART:"combo", "styled_hovered", 0.0);
+                        set_state(PART:"combo_button", "hovered", 0.0);
                     }
+                    else {
+                        set_state(PART:"combo", "hovered", 0.0);
+                        set_state(PART:"combo_button", "hovered", 0.0);
+                    }
+                }
+                else if (get_int(isStyled) == 1) {
+                    set_state(PART:"combo", "styled", 0.0);
+                    set_state(PART:"combo_button", "default", 0.0);
                 }
+                else {
+                    set_state(PART:"combo", "default", 0.0);
+                    set_state(PART:"combo_button", "default", 0.0);
+                }
+                
+                set_state(PART:"combo_button_icon", "default", 0.0);
             }
             else {
                 set_state(PART:"combo", "disabled", 0.0);
@@ -89,7 +107,7 @@ group {
                 rel1.to: "clipper";
                 rel2 {
                     to: "clipper"; 
-                    offset: -17 -1;
+                    offset: -34 -1;
                 }
             }
         }
@@ -101,8 +119,8 @@ group {
             description {
                 state: "default" 0.0;
                 image {
-                    normal: "widget/combo/combo_normal.png";
-                    border: 0 0 0 0;
+                    normal: "widget/combo/00_combo_normal.png";
+                    border: 15 0 15 15;
                 }
             }
             description {
@@ -114,27 +132,47 @@ group {
                state: "hovered" 0.0;
                inherit: "default" 0.0;
                image {
-                  normal: "widget/combo/combo_hover.png";
-                  border: 0 0 0 0;
+                  normal: "widget/combo/00_combo_hover.png";
+                  border: 15 0 15 15;
                }
             }
             description {
                state: "focused" 0.0;
                inherit: "default" 0.0;
                image {
-                  normal: "widget/combo/combo_focus.png";
-                  border: 0 0 0 0;
+                  normal: "widget/combo/00_combo_focus.png";
+                  border: 15 0 15 15;
                }
             }
             description {
                state: "pressed" 0.0;
                inherit: "default" 0.0;
                image {
-                  normal: "widget/combo/combo_press.png";
-                  border: 0 0 0 0;
+                  normal: "widget/combo/00_combo_press.png";
+                  border: 15 0 15 15;
                }
             }
+            description {
+                state: "styled" 0.0;
+                image {
+                    normal: "widget/combo/00_combo_border.png";
+                    border: 15 0 15 15;
+                }
+            }
+            description {
+                state: "styled_focused" 0.0;
+                image {
+                    normal: "widget/combo/00_combo_focus_border.png";
+                    border: 15 0 15 15;
+                }
+            }
+            description {
+                state: "styled_hovered" 0.0;
+                image {
+                    normal: "widget/combo/00_combo_hover_border.png";
+                    border: 15 0 15 15;
+                }
+            }
         }
 
         part {
@@ -162,8 +200,8 @@ group {
                 state: "default" 0.0;
                 rel1.to: "bt_combo_clipper";
                 image {
-                     normal: "widget/combo/combo_normal_button.png";
-                     border: 1 0 0 0;
+                     normal: "widget/combo/00_combo_normal_button.png";
+                     border: 0 15 15 15;
                }
             }
             description {
@@ -177,8 +215,8 @@ group {
                 inherit: "default" 0.0;
                 rel1.to: "bt_combo_clipper";
                 image {
-                    normal: "widget/combo/combo_hover_button.png";
-                    border: 1 0 0 0;
+                    normal: "widget/combo/00_combo_hover_button.png";
+                    border: 0 15 15 15;
                 }
             }
             description {
@@ -186,8 +224,8 @@ group {
                 inherit: "default" 0.0;
                 rel1.to: "bt_combo_clipper";
                 image {
-                    normal: "widget/combo/combo_focus_button.png";
-                    border: 1 0 0 0;
+                    normal: "widget/combo/00_combo_focus_button.png";
+                    border: 0 15 15 15;
                 }
             }
             description {
@@ -195,8 +233,8 @@ group {
                 inherit: "default" 0.0;
                 rel1.to: "bt_combo_clipper";
                 image {
-                    normal: "widget/combo/combo_press_button.png";
-                    border: 1 0 0 0;
+                    normal: "widget/combo/00_combo_press_button.png";
+                    border: 0 15 15 15;
                 }
             }
         }
@@ -207,33 +245,24 @@ group {
             clip_to: "bt_combo_clipper";
             description {
                 state: "default" 0.0;
-                min: 12 10;
-                max: 12 10;
+                min: 24 20;
+                max: 24 20;
                 color: 255 255 255 150;
                 rel1 {
                     to: "bt_combo_clipper";
                     relative: 0.5 0.5;
-                    offset: -6 -5;
                 }
                 rel2 {
                     to: "bt_combo_clipper";
                     relative: 0.5 0.5;
-                    offset: 6 5;
                 }
                 fixed: 1 1;
-                image {
-                     normal: "widget/combo/icon.png";
-                     border: 0 0 0 0;
-               }
+                image.normal: "widget/combo/00_icon.png";
             }
             description {
                 state: "disabled" 0.0;
                 inherit: "default" 0.0;
                 color: 255 255 255 50;
-                image {
-                     normal: "widget/combo/icon.png";
-                     border: 0 0 0 0;
-               }
             }
         }
 
@@ -245,7 +274,7 @@ group {
                color: 0 0 0 0;
                rel1 {
                   to: "combo_clipper";
-                  offset: 5 2;
+                  offset: 3 3;
                }
                rel2 {
                   to: "combo_clipper";
@@ -289,14 +318,22 @@ group {
             }
         }
         program {
+            name: "styled_state";
+            signal: "bg_styled";
+            script {
+                set_int(isStyled, 1);
+                show();
+            }
+        }
+        program {
             name: "reset";
             signal: "reset";
             script {
                 set_int(isEnabled, 0);
                 set_int(isPressed, 0);
-                set_int(isChecked, 0);
                 set_int(isFocused, 0);
                 set_int(isHovered, 0);
+                set_int(isStyled, 0);
                 show();
             }
         }
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus.png
deleted file mode 100644 (file)
index 873dc19..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png
deleted file mode 100644 (file)
index 197d680..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_focus_button.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover.png
deleted file mode 100644 (file)
index 9d7a91c..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png
deleted file mode 100644 (file)
index aa48e1e..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_hover_button.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal.png
deleted file mode 100644 (file)
index fb44a18..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png
deleted file mode 100644 (file)
index 7b07b50..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_normal_button.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_press.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_press.png
deleted file mode 100644 (file)
index 9a7df3c..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_press.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png b/Source/WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png
deleted file mode 100644 (file)
index eafc07d..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/combo_press_button.png and /dev/null differ
diff --git a/Source/WebKit/efl/DefaultTheme/widget/combo/icon.png b/Source/WebKit/efl/DefaultTheme/widget/combo/icon.png
deleted file mode 100644 (file)
index 1534c2c..0000000
Binary files a/Source/WebKit/efl/DefaultTheme/widget/combo/icon.png and /dev/null differ
index 116d389..7f9d14f 100644 (file)
@@ -334,7 +334,7 @@ collections {
                 description { state: "default" 0.0;
                     rel1 { relative: 0.0 1.0; }
                     rel2 { relative: 1.0 1.5; }
-                    color: 255 255 255 255;
+                    color: 68 68 68 255;
                 }
                 description { state: "show" 0.0;
                     inherit: "default" 0.0;