Changeset 159534 in webkit

Timestamp:

Nov 19, 2013 6:12:43 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Implement spin control on WinCE port.
​https://bugs.webkit.org/show_bug.cgi?id=123254

Patch by Zhuang Zhigang <​zhuangzg@cn.fujitsu.com> on 2013-11-19
Reviewed by Brent Fulgham.

• rendering/RenderThemeWinCE.cpp:

(WebCore::RenderThemeWinCE::adjustInnerSpinButtonStyle):
(WebCore::RenderThemeWinCE::paintInnerSpinButton):

• rendering/RenderThemeWinCE.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeWinCE.cpp (modified) (1 diff)
• rendering/RenderThemeWinCE.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-19  Zhuang Zhigang  <zhuangzg@cn.fujitsu.com>
+
+        Implement spin control on WinCE port.
+        https://bugs.webkit.org/show_bug.cgi?id=123254
+
+        Reviewed by Brent Fulgham.
+
+        * rendering/RenderThemeWinCE.cpp:
+        (WebCore::RenderThemeWinCE::adjustInnerSpinButtonStyle):
+        (WebCore::RenderThemeWinCE::paintInnerSpinButton):
+        * rendering/RenderThemeWinCE.h:
+
 2013-11-19  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp

@@ -650 +650 @@
 #endif
 
+void RenderThemeWinCE::adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
+{
+    int width = ::GetSystemMetrics(SM_CXVSCROLL);
+    if (width <= 0)
+        width = 17; // Vista's default.
+    style->setWidth(Length(width, Fixed));
+    style->setMinWidth(Length(width, Fixed));
+}
+
+bool RenderThemeWinCE::paintInnerSpinButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+{
+    // We split the specified rectangle into two vertically. We can't draw a
+    // spin button of which height is less than 2px.
+    if (r.height() < 2)
+        return false;
+    IntRect upRect(r);
+    upRect.setHeight(r.height() / 2);
+    IntRect downRect(r);
+    downRect.setY(upRect.maxY());
+    downRect.setHeight(r.height() - upRect.height());
+
+    unsigned stateUp = DFCS_SCROLLUP;
+    unsigned stateDown = DFCS_SCROLLDOWN;
+
+    if (!isEnabled(o) || isReadOnlyControl(o)) {
+        stateUp |= DFCS_INACTIVE;
+        stateDown |= DFCS_INACTIVE;
+    } else if (isPressed(o)) {
+        if (isSpinUpButtonPartPressed(o))
+            stateUp |= DFCS_PUSHED;
+        else
+            stateDown |= DFCS_PUSHED;
+    }
+
+    paintInfo.context->drawFrameControl(upRect, DFC_SCROLL, stateUp);
+    paintInfo.context->drawFrameControl(downRect, DFC_SCROLL, stateDown);
+
+    return false;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderThemeWinCE.h

@@ -115 +115 @@
         virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle* style, Element*) const { }
 
+        virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
+        virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
+
         static void setWebKitIsBeingUnloaded();