Diffstat (limited to 'noncore/settings/appearance2/sample.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/sample.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/noncore/settings/appearance2/sample.cpp b/noncore/settings/appearance2/sample.cpp index ee27d60..e447002 100644 --- a/noncore/settings/appearance2/sample.cpp +++ b/noncore/settings/appearance2/sample.cpp | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <qpixmapcache.h> | 10 | #include <qpixmapcache.h> |
11 | #include <qtimer.h> | 11 | #include <qtimer.h> |
12 | #include <qobjectlist.h> | 12 | #include <qobjectlist.h> |
13 | #include <qcommonstyle.h> | ||
13 | 14 | ||
14 | #include "sample.h" | 15 | #include "sample.h" |
15 | 16 | ||
@@ -67,6 +68,7 @@ void SampleWindow::setFont( const QFont &f ) | |||
67 | 68 | ||
68 | static void setStyleRecursive ( QWidget *w, QStyle *s ) | 69 | static void setStyleRecursive ( QWidget *w, QStyle *s ) |
69 | { | 70 | { |
71 | w->setStyle( s ); | ||
70 | QObjectList *childObjects=(QObjectList*)w->children(); | 72 | QObjectList *childObjects=(QObjectList*)w->children(); |
71 | if ( childObjects ) { | 73 | if ( childObjects ) { |
72 | QObject * o; | 74 | QObject * o; |
@@ -76,16 +78,21 @@ static void setStyleRecursive ( QWidget *w, QStyle *s ) | |||
76 | } | 78 | } |
77 | } | 79 | } |
78 | } | 80 | } |
79 | w->setStyle( s ); | ||
80 | } | 81 | } |
81 | 82 | ||
82 | 83 | ||
83 | void SampleWindow::setStyle2 ( QStyle *sty ) | 84 | void SampleWindow::setStyle2 ( QStyle *sty ) |
84 | { | 85 | { |
86 | typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, QColorGroup &, bool, bool); | ||
87 | |||
88 | extern QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl); | ||
89 | |||
85 | QPixmapCache::clear ( ); | 90 | QPixmapCache::clear ( ); |
86 | QPalette p = palette ( ); | 91 | QPalette p = palette ( ); |
87 | sty-> polish ( p ); | 92 | sty-> polish ( p ); |
93 | qt_set_draw_menu_bar_impl ( 0 ); | ||
88 | setStyleRecursive ( this, sty ); | 94 | setStyleRecursive ( this, sty ); |
95 | setPalette ( p ); | ||
89 | QTimer::singleShot ( 0, this, SLOT( fixGeometry ( ))); | 96 | QTimer::singleShot ( 0, this, SLOT( fixGeometry ( ))); |
90 | } | 97 | } |
91 | 98 | ||
@@ -206,12 +213,12 @@ void SampleWindow::paletteChange( const QPalette &old ) | |||
206 | popup-> setPalette ( palette ( )); | 213 | popup-> setPalette ( palette ( )); |
207 | } | 214 | } |
208 | 215 | ||
216 | |||
209 | void SampleWindow::setPalette ( const QPalette &pal ) | 217 | void SampleWindow::setPalette ( const QPalette &pal ) |
210 | { | 218 | { |
211 | QPixmapCache::clear ( ); | 219 | QPixmapCache::clear ( ); |
212 | QPalette p = pal; | 220 | QPalette p = pal; |
213 | style ( ). polish ( p ); | 221 | style ( ). polish ( p ); |
214 | |||
215 | QWidget::setPalette ( p ); | 222 | QWidget::setPalette ( p ); |
216 | } | 223 | } |
217 | 224 | ||