Changeset 467

Timestamp:

Jan 22, 2010, 6:21:43 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QWidget: When setting the parent, take the parent's resolve masks to make sure attributes imposed by the user on the parent won't be overriden by the natural palette for this widget if it differs from QApplication::palette() [vendor bug].

File:

• trunk/src/gui/kernel/qwidget.cpp (modified) (1 diff)

trunk/src/gui/kernel/qwidget.cpp

@@ -9252 +9252 @@
     if (!testAttribute(Qt::WA_StyleSheet)
         && (!parent || !parent->testAttribute(Qt::WA_StyleSheet))) {
+        if (parent) {
+            // take the parent's resolve masks to make sure attributes imposed
+            // by the user on the parent won't be overriden by the natural
+            // palette for this widget if it differs from QApplication::palette()
+            QWidgetPrivate *pd = parent->d_func();
+            d->inheritedFontResolveMask =
+                pd->data.fnt.resolve() | pd->inheritedFontResolveMask;
+            d->inheritedPaletteResolveMask =
+                pd->data.pal.resolve() | pd->inheritedPaletteResolveMask;
+        }
         d->resolveFont();
         d->resolvePalette();