Changeset 65074 in webkit

Timestamp:

Aug 10, 2010 9:43:37 AM (14 years ago)

Author:

kov@webkit.org

Message:

2010-08-10 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Xan Lopez.

[GTK] Inputs of type 'search' have weird looking checkboxes instead of search/clear icons
​https://bugs.webkit.org/show_bug.cgi?id=43760

Draw appropriate GTK+ stock images for search/clear icons in search entries.

• platform/gtk/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::paintSearchFieldResultsButton): (WebCore::RenderThemeGtk::paintSearchFieldResultsDecoration): (WebCore::RenderThemeGtk::paintSearchFieldCancelButton):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/RenderThemeGtk.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-10  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Inputs of type 'search' have weird looking checkboxes instead of search/clear icons
+        https://bugs.webkit.org/show_bug.cgi?id=43760
+
+        Draw appropriate GTK+ stock images for search/clear icons in search entries.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::paintSearchFieldResultsButton):
+        (WebCore::RenderThemeGtk::paintSearchFieldResultsDecoration):
+        (WebCore::RenderThemeGtk::paintSearchFieldCancelButton):
+
 2010-08-10  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/platform/gtk/RenderThemeGtk.cpp

@@ -486 +486 @@
 bool RenderThemeGtk::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    return paintMozillaGtkWidget(this, MOZ_GTK_DROPDOWN_ARROW, o, i, rect);
+    return paintSearchFieldResultsDecoration(o, i, rect);
 }
 
@@ -502 +502 @@
 bool RenderThemeGtk::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    return paintMozillaGtkWidget(this, MOZ_GTK_CHECKMENUITEM, o, i, rect);
+    GraphicsContext* context = i.context;
+
+    static Image* searchImage = Image::loadPlatformThemeIcon(GTK_STOCK_FIND, rect.width()).releaseRef();
+    context->drawImage(searchImage, DeviceColorSpace, rect);
+
+    return false;
 }
 
@@ -518 +523 @@
 bool RenderThemeGtk::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    return paintMozillaGtkWidget(this, MOZ_GTK_CHECKMENUITEM, o, i, rect);
+    GraphicsContext* context = i.context;
+
+    // TODO: Brightening up the image on hover is desirable here, I believe.
+    static Image* cancelImage = Image::loadPlatformThemeIcon(GTK_STOCK_CLEAR, rect.width()).releaseRef();
+    context->drawImage(cancelImage, DeviceColorSpace, rect);
+
+    return false;
 }