Commit 17a01a28 authored by treat@webkit.org's avatar treat@webkit.org

WebCore:

2009-07-30  Mike Fenton  <mike.fenton@torchmobile.com>

         Reviewed by Adam Treat.

         Apply colour style to buttons that use Theme settings in Qt.

         https://bugs.webkit.org/show_bug.cgi?id=27814

         * platform/qt/RenderThemeQt.cpp:
         (WebCore::RenderThemeQt::adjustButtonStyle):

LayoutTests:
2009-07-30  Mike Fenton  <mike.fenton@torchmobile.com>

         Reviewed by Adam Treat.

         Add Button Colour style test and results for Qt based upon fix for bug.
         Unskip tables/mozilla/bugs/bug92647-2.html which passes with bug fix.
         Update expected results for qt for test fast/dom/HTMLTableColElement/resize-table-using-col-width-expected
         which also passes with the the bug fix.

         https://bugs.webkit.org/show_bug.cgi?id=27814

         * fast/forms/button-style-color.html: Added.
         * platform/qt/Skipped:
         * platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt:
         * platform/qt/fast/forms/button-style-color-expected.txt: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@46600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 14fa366c
2009-07-30 Mike Fenton <mike.fenton@torchmobile.com>
Reviewed by Adam Treat.
Add Button Colour style test and results for Qt based upon fix for bug.
Unskip tables/mozilla/bugs/bug92647-2.html which passes with bug fix.
Update expected results for qt for test fast/dom/HTMLTableColElement/resize-table-using-col-width-expected
which also passes with the the bug fix.
https://bugs.webkit.org/show_bug.cgi?id=27814
* fast/forms/button-style-color.html: Added.
* platform/qt/Skipped:
* platform/qt/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.txt:
* platform/qt/fast/forms/button-style-color-expected.txt: Added.
2009-07-30 Eric Carlson <eric.carlson@apple.com>
Reviewed by Simon Fraser.
......
<button>Test Button</button>
<button style="color:red">Test Button</button>
<button style="background-color:green">Test Button</button>
<button style="color:red;background-color:green">Test Button</button>
<input type=button value="Test Button">
<input type=button style="color:red" value="Test Button">
<input type=button style="background-color:green" value="Test Button">
<input type=button style="color:red;background-color:green" value="Test Button">
......@@ -4424,7 +4424,6 @@ tables/mozilla/bugs/bug9072.html
tables/mozilla/bugs/bug9123-1.html
tables/mozilla/bugs/bug9123-2.html
tables/mozilla/bugs/bug92143.html
tables/mozilla/bugs/bug92647-2.html
tables/mozilla/bugs/bug9271-1.html
tables/mozilla/bugs/bug9271-2.html
tables/mozilla/bugs/bug92868.html
......
......@@ -30,7 +30,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (2,2) size 63x17
text run at (2,2) width 63: "col 3 row 3"
RenderBlock (anonymous) at (0,50) size 784x32
RenderButton {BUTTON} at (2,2) size 393x28 [color=#1A1A1A] [bgcolor=#C0C0C0]
RenderButton {BUTTON} at (2,2) size 393x28 [bgcolor=#C0C0C0]
RenderBlock (anonymous) at (6,6) size 381x17
RenderText {#text} at (0,0) size 381x17
text run at (0,0) width 381: "Click me to test manually. The first column should grow to 500px."
......
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderButton {BUTTON} at (2,2) size 80x28 [bgcolor=#C0C0C0]
RenderBlock (anonymous) at (6,6) size 68x17
RenderText {#text} at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (84,8) size 4x17
text run at (84,8) width 4: " "
RenderButton {BUTTON} at (90,2) size 80x28 [color=#FF0000] [bgcolor=#C0C0C0]
RenderBlock (anonymous) at (6,6) size 68x17
RenderText {#text} at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (172,8) size 4x17
text run at (172,8) width 4: " "
RenderButton {BUTTON} at (178,4) size 84x26 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 68x17
RenderText {#text} at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (264,8) size 4x17
text run at (264,8) width 4: " "
RenderButton {BUTTON} at (270,4) size 84x26 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 68x17
RenderText {#text} at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (356,8) size 4x17
text run at (356,8) width 4: " "
RenderButton {INPUT} at (362,2) size 80x28 [bgcolor=#C0C0C0]
RenderBlock (anonymous) at (6,6) size 68x17
RenderText at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (444,8) size 4x17
text run at (444,8) width 4: " "
RenderButton {INPUT} at (450,2) size 80x28 [color=#FF0000] [bgcolor=#C0C0C0]
RenderBlock (anonymous) at (6,6) size 68x17
RenderText at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (532,8) size 4x17
text run at (532,8) width 4: " "
RenderButton {INPUT} at (538,4) size 84x26 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 68x17
RenderText at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (624,8) size 4x17
text run at (624,8) width 4: " "
RenderButton {INPUT} at (630,4) size 84x26 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (8,4) size 68x17
RenderText at (0,0) size 68x17
text run at (0,0) width 68: "Test Button"
RenderText {#text} at (0,0) size 0x0
2009-07-30 Mike Fenton <mike.fenton@torchmobile.com>
Reviewed by Adam Treat.
Apply colour style to buttons that use Theme settings in Qt.
https://bugs.webkit.org/show_bug.cgi?id=27814
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::adjustButtonStyle):
=== End merge of nitro-extreme branch 2009-07-30 ===
2009-05-11 Geoffrey Garen <ggaren@apple.com>
......
......@@ -419,8 +419,6 @@ void RenderThemeQt::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* s
setButtonSize(style);
setButtonPadding(style);
style->setColor(QApplication::palette().text().color());
}
void RenderThemeQt::setButtonSize(RenderStyle* style) const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment