Changeset 69495 in webkit

Timestamp:

Oct 11, 2010 8:24:11 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-10-11 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Search field icons should be centered vertically in the field
​https://bugs.webkit.org/show_bug.cgi?id=47441

Add a pixel dump result which tests the fix.

• platform/gtk/fast/css/text-input-with-webkit-border-radius-expected.checksum: Added.
• platform/gtk/fast/css/text-input-with-webkit-border-radius-expected.png: Added.

2010-10-11 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Search field icons should be centered vertically in the field
​https://bugs.webkit.org/show_bug.cgi?id=47441

Center search field icons vertically in the search field.

• platform/gtk/RenderThemeGtk.cpp: (WebCore::centerRectVerticallyInParentInputElement): Added this helper. (WebCore::RenderThemeGtk::paintSearchFieldResultsDecoration): Center the search field icon by adjusting its drawing rect relative to the containing search field. (WebCore::RenderThemeGtk::paintSearchFieldCancelButton): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/fast/css/text-input-with-webkit-border-radius-expected.checksum (added)
• LayoutTests/platform/gtk/fast/css/text-input-with-webkit-border-radius-expected.png (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/RenderThemeGtk.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-11  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Search field icons should be centered vertically in the field
+        https://bugs.webkit.org/show_bug.cgi?id=47441
+
+        Add a pixel dump result which tests the fix.
+
+        * platform/gtk/fast/css/text-input-with-webkit-border-radius-expected.checksum: Added.
+        * platform/gtk/fast/css/text-input-with-webkit-border-radius-expected.png: Added.
+
 2010-10-10  Antonio Gomes  <agomes@rim.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-11  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Search field icons should be centered vertically in the field
+        https://bugs.webkit.org/show_bug.cgi?id=47441
+
+        Center search field icons vertically in the search field.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::centerRectVerticallyInParentInputElement): Added this helper.
+        (WebCore::RenderThemeGtk::paintSearchFieldResultsDecoration): Center the search
+        field icon by adjusting its drawing rect relative to the containing search field.
+        (WebCore::RenderThemeGtk::paintSearchFieldCancelButton): Ditto.
+
 2010-10-11  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebCore/platform/gtk/RenderThemeGtk.cpp

@@ -499 +499 @@
 }
 
-bool RenderThemeGtk::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    GraphicsContext* context = i.context;
-
+static IntRect centerRectVerticallyInParentInputElement(RenderObject* object, const IntRect& rect)
+{
+    IntRect centeredRect(rect);
+    Node* input = object->node()->shadowAncestorNode(); // Get the renderer of <input> element.
+    if (!input->renderer()->isBox()) 
+        return centeredRect;
+
+    // If possible center the y-coordinate of the rect vertically in the parent input element.
+    // We also add one pixel here to ensure that the y coordinate is rounded up for box heights
+    // that are even, which looks in relation to the box text.
+    IntRect inputContentBox = toRenderBox(input->renderer())->absoluteContentBox();
+    centeredRect.setY(inputContentBox.y() + (inputContentBox.height() - centeredRect.height() + 1) / 2);
+    return centeredRect;
+}
+
+bool RenderThemeGtk::paintSearchFieldResultsDecoration(RenderObject* object, const PaintInfo& i, const IntRect& rect)
+{
     static Image* searchImage = Image::loadPlatformThemeIcon(GTK_STOCK_FIND, rect.width()).releaseRef();
-    context->drawImage(searchImage, DeviceColorSpace, rect);
-
+    IntRect centeredRect(centerRectVerticallyInParentInputElement(object, rect));
+    i.context->drawImage(searchImage, DeviceColorSpace, centeredRect);
     return false;
 }
@@ -520 +533 @@
 }
 
-bool RenderThemeGtk::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    GraphicsContext* context = i.context;
-
+bool RenderThemeGtk::paintSearchFieldCancelButton(RenderObject* object, const PaintInfo& i, const IntRect& rect)
+{
     // 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);
-
+    IntRect centeredRect(centerRectVerticallyInParentInputElement(object, rect));
+    i.context->drawImage(cancelImage, DeviceColorSpace, centeredRect);
     return false;
 }