summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-04-03 16:19:47 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-04-03 16:31:21 (GMT)
commit2a8e39999cb3f5be9bb16ffb5ddfe118d18f9ef1 (patch)
tree66667e3b26113ef47033aacc71f57d885dfe540b /src/gui/kernel
parentf9e0b4e7d57b568ab20b7c77e284f966ff6baf41 (diff)
downloadQt-2a8e39999cb3f5be9bb16ffb5ddfe118d18f9ef1.zip
Qt-2a8e39999cb3f5be9bb16ffb5ddfe118d18f9ef1.tar.gz
Qt-2a8e39999cb3f5be9bb16ffb5ddfe118d18f9ef1.tar.bz2
QGtkStyle: Fix styling and palette issues related to combo box
Well actually this change is a bit bigger than just that. *We no longer override the palette you provide in polish so it should be a bit more frienly toward custom application changes. * Another issue was that we would generate the palette information when we got the style callback from gtkButton but then the line edits might not yet have been polished. Hence we now return from the callback and instead post the update for later. * We had to modify the PE_Frame entry to draw a raised menu when the custom combo box delegate was used. * We now simply ignore custom qtconfig palette entries when using GtkStyle since they only cause trouble with it. Task-number: 250142 Reviewed-by: nrc
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qapplication_x11.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 260a9a4..10fb886 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -829,8 +829,11 @@ bool QApplicationPrivate::x11_apply_settings()
QColor(strlist[i]));
}
- if (groupCount == QPalette::NColorGroups)
- QApplicationPrivate::setSystemPalette(pal);
+ // ### Fix properly for 4.6
+ if (!(QApplicationPrivate::app_style && QApplicationPrivate::app_style->inherits("QGtkStyle"))) {
+ if (groupCount == QPalette::NColorGroups)
+ QApplicationPrivate::setSystemPalette(pal);
+ }
int kdeSessionVersion = QString::fromLocal8Bit(qgetenv("KDE_SESSION_VERSION")).toInt();