Changeset 83837 in webkit

Timestamp:

Apr 14, 2011 4:59:33 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-04-14 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Disabled form controls don't actually look disabled.
​https://bugs.webkit.org/show_bug.cgi?id=58490

Unsetting QStyle::State_Enabled is not enough to get the "disabled" appearance
when painting controls. We must also set the QStyleOption's palette's current
color group.

• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::initializeCommonQStyleOptions):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/RenderThemeQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Disabled form controls don't actually look disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=58490
+
+        Unsetting QStyle::State_Enabled is not enough to get the "disabled" appearance
+        when painting controls. We must also set the QStyleOption's palette's current
+        color group.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::initializeCommonQStyleOptions):
+
 2011-04-14  Nancy Piedra  <nancy.piedra@nokia.com>
 

trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

@@ -1112 +1112 @@
     option.state &= ~(QStyle::State_HasFocus | QStyle::State_MouseOver);
 
-    if (!isEnabled(o))
-        option.state &= ~QStyle::State_Enabled;
-
     if (isReadOnlyControl(o))
         // Readonly is supported on textfields.
@@ -1125 +1122 @@
 
     setPaletteFromPageClientIfExists(option.palette);
+
+    if (!isEnabled(o)) {
+        option.palette.setCurrentColorGroup(QPalette::Disabled);
+        option.state &= ~QStyle::State_Enabled;
+    }
+
     RenderStyle* style = o->style();
     if (!style)