Changeset 247827 in webkit

Timestamp:

Jul 25, 2019 11:04:15 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[WPE] Draw other button types
​https://bugs.webkit.org/show_bug.cgi?id=199377

Patch by Joshua Watt <​JPEW.hacker@gmail.com> on 2019-07-25
Reviewed by Michael Catanzaro.

There are other button types that should be drawn with the default style
besides just push buttons.

• platform/wpe/ThemeWPE.cpp:

(WebCore::ThemeWPE::paint):
(WebCore::ThemeWPE::paintButton):

• platform/wpe/ThemeWPE.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/wpe/ThemeWPE.cpp (modified) (2 diffs)
• platform/wpe/ThemeWPE.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-25  Joshua Watt  <JPEW.hacker@gmail.com>
+
+        [WPE] Draw other button types
+        https://bugs.webkit.org/show_bug.cgi?id=199377
+
+        Reviewed by Michael Catanzaro.
+
+        There are other button types that should be drawn with the default style
+        besides just push buttons.
+
+        * platform/wpe/ThemeWPE.cpp:
+        (WebCore::ThemeWPE::paint):
+        (WebCore::ThemeWPE::paintButton):
+        * platform/wpe/ThemeWPE.h:
+
 2019-07-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/platform/wpe/ThemeWPE.cpp

@@ -68 +68 @@
         break;
     case PushButtonPart:
-        paintButton(states, context, zoomedRect, zoomFactor);
+    case DefaultButtonPart:
+    case ButtonPart:
+    case SquareButtonPart:
+        paintButton(part, states, context, zoomedRect, zoomFactor);
         break;
     default:
@@ -130 +133 @@
 }
 
-void ThemeWPE::paintButton(ControlStates& states, GraphicsContext& context, const FloatRect& zoomedRect, float)
+void ThemeWPE::paintButton(ControlPart part, ControlStates& states, GraphicsContext& context, const FloatRect& zoomedRect, float)
 {
     GraphicsContextStateSaver stateSaver(context);
 
-    FloatSize corner(2, 2);
+    float roundness = (part == SquareButtonPart) ? 0 : 2;
+
+    FloatSize corner(roundness, roundness);
     FloatRoundedRect roundedRect(zoomedRect, corner, corner, corner, corner);
     Path path;

trunk/Source/WebCore/platform/wpe/ThemeWPE.h

@@ -38 +38 @@
     void paintCheckbox(ControlStates&, GraphicsContext&, const FloatRect&, float);
     void paintRadio(ControlStates&, GraphicsContext&, const FloatRect&, float);
-    void paintButton(ControlStates&, GraphicsContext&, const FloatRect&, float);
+    void paintButton(ControlPart, ControlStates&, GraphicsContext&, const FloatRect&, float);
 };