Changeset 13594 in webkit

Timestamp:

Mar 30, 2006 7:12:40 PM (18 years ago)

Author:

hyatt

Message:

Land focus ring bug fix and win theme improvements.

Location:

trunk/WebCore

Files:

• platform/cairo/GraphicsContextCairo.cpp (modified) (1 diff)
• platform/win/TemporaryLinkStubs.cpp (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeWin.cpp (modified) (1 diff)
• rendering/RenderThemeWin.h (modified) (1 diff)

trunk/WebCore/platform/cairo/GraphicsContextCairo.cpp

@@ -443 +443 @@
     // FIXME: These rects should be rounded
     cairo_rectangle(m_data->context, finalFocusRect.x(), finalFocusRect.y(), finalFocusRect.width(), finalFocusRect.height());
-    setPen(color);
+    
+    // Force the alpha to 50%.  This matches what the Mac does with outline rings.
+    Color ringColor(color.red(), color.green(), color.blue(), 127);
+    setColor(m_data->context, ringColor);
     cairo_stroke(m_data->context);
 }

trunk/WebCore/platform/win/TemporaryLinkStubs.cpp

@@ -268 +268 @@
 Path& Path::operator=(const Path&){ return*this; }
 
-bool RenderThemeWin::paintCheckbox(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; }
-bool RenderThemeWin::paintRadio(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; }
-bool RenderThemeWin::paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; }
-bool RenderThemeWin::paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; }
-
 QLineEdit::QLineEdit(QLineEdit::Type) { }
 QLineEdit::~QLineEdit() { }

trunk/WebCore/rendering/RenderTheme.cpp

@@ -113 +113 @@
     }
     
-    return false;
+    return true;
 }
 bool RenderTheme::shouldPaintBorder(RenderObject* o)

trunk/WebCore/rendering/RenderTheme.h

@@ -101 +101 @@
     // Methods for each appearance value.
     virtual void adjustCheckboxStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
-    virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) = 0;
+    virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) { return true; }
     virtual void setCheckboxSize(RenderStyle* style) const {};
     
     virtual void adjustRadioStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
-    virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) = 0;
+    virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) { return true; }
     virtual void setRadioSize(RenderStyle* style) const {};
     
     virtual void adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
-    virtual bool paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) = 0;
+    virtual bool paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) { return true; }
     virtual void setButtonSize(RenderStyle* style) const {};
 
     virtual void adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
-    virtual bool paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) = 0;
+    virtual bool paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) { return true; }
 };
 

trunk/WebCore/rendering/RenderThemeWin.cpp

@@ -32 +32 @@
 }
 
+void RenderThemeWin::addIntrinsicMargins(RenderStyle* style) const
+{
+    // Cut out the intrinsic margins completely if we end up using a small font size
+    if (style->fontSize() < 11)
+        return;
+    
+    // Intrinsic margin value.
+    const int m = 2;
+    
+    // FIXME: Using width/height alone and not also dealing with min-width/max-width is flawed.
+    if (style->width().isIntrinsicOrAuto()) {
+        if (style->marginLeft().quirk())
+            style->setMarginLeft(Length(m, Fixed));
+        if (style->marginRight().quirk())
+            style->setMarginRight(Length(m, Fixed));
+    }
+
+    if (style->height().isAuto()) {
+        if (style->marginTop().quirk())
+            style->setMarginTop(Length(m, Fixed));
+        if (style->marginBottom().quirk())
+            style->setMarginBottom(Length(m, Fixed));
+    }
 }
+
+void RenderThemeWin::adjustCheckboxStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
+{
+    addIntrinsicMargins(style);
+}
+
+void RenderThemeWin::adjustRadioStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
+{
+    addIntrinsicMargins(style);
+}
+
+void RenderThemeWin::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
+{
+    addIntrinsicMargins(style);
+}
+
+void RenderThemeWin::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
+{
+    addIntrinsicMargins(style);
+}
+
+}

trunk/WebCore/rendering/RenderThemeWin.h

@@ -28 +28 @@
 namespace WebCore {
 
-    class RenderThemeWin : public RenderTheme {
+class RenderThemeWin : public RenderTheme {
+public:
+    virtual void adjustCheckboxStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
+    virtual void adjustRadioStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
+    virtual void adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
+    virtual void adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
 
-    protected:
-        virtual bool paintCheckbox(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);    
-        virtual bool paintRadio(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
-        virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
-        virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
-    };
+private:
+    void addIntrinsicMargins(RenderStyle* style) const;
+};
 
 };