Changeset 34468 in webkit
- Timestamp:
- Jun 9, 2008 5:55:31 AM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r34467 r34468 21 21 * svg/xlinkattrs.in: 22 22 * xml/xmlattrs.in: 23 24 2008-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): 23 35 24 36 2008-06-09 Tor Arne Vestbø <tavestbo@trolltech.com> -
trunk/WebCore/platform/qt/RenderThemeQt.cpp
r34300 r34468 335 335 } 336 336 337 338 337 void RenderThemeQt::setCheckboxSize(RenderStyle* style) const 339 338 { … … 345 344 return paintButton(o, i, r); 346 345 } 347 348 346 349 347 void RenderThemeQt::setRadioSize(RenderStyle* style) const … … 387 385 setButtonSize(style); 388 386 setButtonPadding(style); 387 388 style->setColor(QApplication::palette().text().color()); 389 389 } 390 390 … … 457 457 } 458 458 459 void RenderThemeQt::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 460 { 461 style->setBackgroundColor(Color::transparent); 462 style->setColor(QApplication::palette().text().color()); 463 } 464 459 465 bool RenderThemeQt::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) 460 466 { … … 486 492 } 487 493 488 void RenderThemeQt::adjustText FieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const489 { 490 style->setBackgroundColor(Color::transparent);494 void RenderThemeQt::adjustTextAreaStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const 495 { 496 adjustTextFieldStyle(selector, style, element); 491 497 } 492 498 … … 494 500 { 495 501 return paintTextField(o, i, r); 496 }497 498 void RenderThemeQt::adjustTextAreaStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const499 {500 adjustTextFieldStyle(selector, style, element);501 502 } 502 503 … … 515 516 // Add in the padding that we'd like to use. 516 517 setPopupPadding(style); 518 519 style->setColor(QApplication::palette().text().color()); 517 520 } 518 521 … … 554 557 } 555 558 559 void 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 } 556 579 557 580 bool RenderThemeQt::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& i, … … 574 597 575 598 return false; 576 }577 578 void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style,579 Element* e) const580 {581 // WORKAROUND because html4.css specifies -webkit-border-radius for <select> so we override it here582 // see also http://bugs.webkit.org/show_bug.cgi?id=18399583 style->resetBorderRadius();584 585 // Height is locked to auto.586 style->setHeight(Length(Auto));587 588 // White-space is locked to pre589 style->setWhiteSpace(PRE);590 591 computeSizeBasedOnStyle(style);592 593 // Add in the padding that we'd like to use.594 setPopupPadding(style);595 599 } 596 600
Note: See TracChangeset
for help on using the changeset viewer.