Changeset 34468 in webkit


Ignore:
Timestamp:
Jun 9, 2008 5:55:31 AM (16 years ago)
Author:
Simon Hausmann
Message:

2008-06-09 Tor Arne Vestbø <tavestbo@trolltech.com>

Reviewed by Simon

Use the text color from QStyle when styling form elements.

Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r34467 r34468  
    2121        * svg/xlinkattrs.in:
    2222        * xml/xmlattrs.in:
     23
     242008-06-09  Tor Arne Vestbø  <tavestbo@trolltech.com>
     25
     26        Reviewed by Simon
     27
     28        Use the text color from QStyle when styling form elements.
     29
     30        * platform/qt/RenderThemeQt.cpp:
     31        (WebCore::RenderThemeQt::adjustButtonStyle):
     32        (WebCore::RenderThemeQt::adjustTextFieldStyle):
     33        (WebCore::RenderThemeQt::adjustMenuListStyle):
     34        (WebCore::RenderThemeQt::adjustMenuListButtonStyle):
    2335
    24362008-06-09  Tor Arne Vestbø  <tavestbo@trolltech.com>
  • trunk/WebCore/platform/qt/RenderThemeQt.cpp

    r34300 r34468  
    335335}
    336336
    337 
    338337void RenderThemeQt::setCheckboxSize(RenderStyle* style) const
    339338{
     
    345344    return paintButton(o, i, r);
    346345}
    347 
    348346
    349347void RenderThemeQt::setRadioSize(RenderStyle* style) const
     
    387385    setButtonSize(style);
    388386    setButtonPadding(style);
     387
     388    style->setColor(QApplication::palette().text().color());
    389389}
    390390
     
    457457}
    458458
     459void RenderThemeQt::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
     460{
     461    style->setBackgroundColor(Color::transparent);
     462    style->setColor(QApplication::palette().text().color());
     463}
     464
    459465bool RenderThemeQt::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
    460466{
     
    486492}
    487493
    488 void RenderThemeQt::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
    489 {
    490     style->setBackgroundColor(Color::transparent);
     494void RenderThemeQt::adjustTextAreaStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     495{
     496    adjustTextFieldStyle(selector, style, element);
    491497}
    492498
     
    494500{
    495501    return paintTextField(o, i, r);
    496 }
    497 
    498 void RenderThemeQt::adjustTextAreaStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
    499 {
    500     adjustTextFieldStyle(selector, style, element);
    501502}
    502503
     
    515516    // Add in the padding that we'd like to use.
    516517    setPopupPadding(style);
     518
     519    style->setColor(QApplication::palette().text().color());
    517520}
    518521
     
    554557}
    555558
     559void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style,
     560                                              Element* e) const
     561{
     562    // WORKAROUND because html4.css specifies -webkit-border-radius for <select> so we override it here
     563    // see also http://bugs.webkit.org/show_bug.cgi?id=18399
     564    style->resetBorderRadius();
     565
     566    // Height is locked to auto.
     567    style->setHeight(Length(Auto));
     568
     569    // White-space is locked to pre
     570    style->setWhiteSpace(PRE);
     571
     572    computeSizeBasedOnStyle(style);
     573
     574    // Add in the padding that we'd like to use.
     575    setPopupPadding(style);
     576
     577    style->setColor(QApplication::palette().text().color());
     578}
    556579
    557580bool RenderThemeQt::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& i,
     
    574597
    575598    return false;
    576 }
    577 
    578 void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style,
    579                                               Element* e) const
    580 {
    581     // WORKAROUND because html4.css specifies -webkit-border-radius for <select> so we override it here
    582     // see also http://bugs.webkit.org/show_bug.cgi?id=18399
    583     style->resetBorderRadius();
    584 
    585     // Height is locked to auto.
    586     style->setHeight(Length(Auto));
    587 
    588     // White-space is locked to pre
    589     style->setWhiteSpace(PRE);
    590 
    591     computeSizeBasedOnStyle(style);
    592 
    593     // Add in the padding that we'd like to use.
    594     setPopupPadding(style);
    595599}
    596600
Note: See TracChangeset for help on using the changeset viewer.