Changeset 14704 in webkit


Ignore:
Timestamp:
Jun 2, 2006 6:41:00 PM (18 years ago)
Author:
adele
Message:

Reviewed by Darin.

Windows theme for textareas. Also made some formatting changes.

  • rendering/RenderThemeWin.cpp: (WebCore::RenderThemeWin::supportsFocus): (WebCore::RenderThemeWin::getThemeData): (WebCore::RenderThemeWin::adjustButtonStyle): (WebCore::RenderThemeWin::adjustTextFieldStyle): (WebCore::RenderThemeWin::adjustTextAreaStyle): (WebCore::RenderThemeWin::paintTextArea):
  • rendering/RenderThemeWin.h: (WebCore::RenderThemeWin::supportsHover):
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r14703 r14704  
     12006-06-02  Adele Peterson  <adele@apple.com>
     2
     3        Reviewed by Darin.
     4
     5        Windows theme for textareas.  Also made some formatting changes.
     6
     7        * rendering/RenderThemeWin.cpp:
     8        (WebCore::RenderThemeWin::supportsFocus):
     9        (WebCore::RenderThemeWin::getThemeData):
     10        (WebCore::RenderThemeWin::adjustButtonStyle):
     11        (WebCore::RenderThemeWin::adjustTextFieldStyle):
     12        (WebCore::RenderThemeWin::adjustTextAreaStyle):
     13        (WebCore::RenderThemeWin::paintTextArea):
     14        * rendering/RenderThemeWin.h:
     15        (WebCore::RenderThemeWin::supportsHover):
     16
    1172006-06-02  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
    218
  • trunk/WebCore/rendering/RenderThemeWin.cpp

    r14560 r14704  
    154154        case ButtonAppearance:
    155155        case TextFieldAppearance:
     156        case TextAreaAppearance:
    156157            return true;
    157158        default:
     
    198199            break;
    199200        case TextFieldAppearance:
     201        case TextAreaAppearance:
    200202            result.m_part = TFP_TEXTFIELD;
    201203            result.m_state = determineState(o);
     
    206208}
    207209
    208 void RenderThemeWin::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
     210void RenderThemeWin::adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
    209211{
    210212    addIntrinsicMargins(style);
     
    293295}
    294296
    295 void RenderThemeWin::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const
     297void RenderThemeWin::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
    296298{
    297299    addIntrinsicMargins(style);
     
    323325}
    324326
    325 }
     327void RenderThemeWin::adjustTextAreaStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
     328{
     329    addIntrinsicMargins(style);
     330}
     331
     332bool RenderThemeWin::paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
     333{
     334    return paintTextField(o, i, r);
     335}
     336
     337}
  • trunk/WebCore/rendering/RenderThemeWin.h

    r13835 r14704  
    4747       
    4848    // A method asking if the theme's controls actually care about redrawing when hovered.
    49     virtual bool supportsHover(const RenderStyle* style) const { return true; }
     49    virtual bool supportsHover(const RenderStyle*) const { return true; }
    5050
    5151    virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
    5252    { return paintButton(o, i, r); }
    53     virtual void setCheckboxSize(RenderStyle* style) const;
     53    virtual void setCheckboxSize(RenderStyle*) const;
    5454
    5555    virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
    5656    { return paintButton(o, i, r); }
    57     virtual void setRadioSize(RenderStyle* style) const;
     57    virtual void setRadioSize(RenderStyle*) const;
    5858
    59     virtual void adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
    60     virtual bool paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r);
     59    virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     60    virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
    6161
    62     virtual void adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, WebCore::Element* e) const;
    63     virtual bool paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r);
     62    virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     63    virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
     64
     65    virtual void adjustTextAreaStyle(CSSStyleSelector*, RenderStyle*, WebCore::Element*) const;
     66    virtual bool paintTextArea(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
    6467
    6568private:
    66     void addIntrinsicMargins(RenderStyle* style) const;
     69    void addIntrinsicMargins(RenderStyle*) const;
    6770    void close();
    6871
    69     unsigned determineState(RenderObject* o);
    70     bool supportsFocus(EAppearance appearance);
     72    unsigned determineState(RenderObject*);
     73    bool supportsFocus(EAppearance);
    7174
    72     ThemeData getThemeData(RenderObject* o);
     75    ThemeData getThemeData(RenderObject*);
    7376   
    7477    HMODULE m_themeDLL;
Note: See TracChangeset for help on using the changeset viewer.