* don't set the font on the native widget in change events

* don't set the palette on the native widget in change events
* reset the value of customFont when it is set specifically because !customFont (allowing future theme changes to take effect as a result)

svn path=/trunk/KDE/kdelibs/; revision=1187721

widgets/checkbox.cpp

@@ -85,6 +85,7 @@ public:
         q->setPalette(p);
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -191,7 +192,6 @@ void CheckBox::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/combobox.cpp

@@ -98,11 +98,11 @@ void ComboBoxPrivate::syncBorders()
     //calc the rect for the over effect
     syncActiveRect();
 
-    KComboBox *native = q->nativeWidget();
     if (customFont) {
-        native->setFont(q->font());
+        q->setFont(q->font());
     } else {
-        native->setFont(Theme::defaultTheme()->font(Theme::DefaultFont));
+        q->setFont(Theme::defaultTheme()->font(Theme::DefaultFont));
+        customFont = false;
     }
 }
 
@@ -300,7 +300,6 @@ void ComboBox::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/groupbox.cpp

@@ -54,6 +54,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -111,7 +112,6 @@ void GroupBox::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/label.cpp

@@ -103,6 +103,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -341,13 +342,11 @@ void Label::changeEvent(QEvent *event)
         case QEvent::FontChange:
             if (font() != QApplication::font()) {
                 d->customFont = true;
-                nativeWidget()->setFont(font());
             }
             break;
 
         case QEvent::PaletteChange:
             d->customPalette = true;
-            nativeWidget()->setPalette(palette());
             break;
 
         default:
@@ -361,8 +360,8 @@ bool Label::event(QEvent *event)
 {
     if (event->type() == QEvent::Show && font() != QApplication::font()) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
+
     return QGraphicsProxyWidget::event(event);
 }
 

widgets/lineedit.cpp

@@ -61,6 +61,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -181,7 +182,6 @@ void LineEdit::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/radiobutton.cpp

@@ -77,6 +77,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -182,7 +183,6 @@ void RadioButton::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/spinbox.cpp

@@ -65,6 +65,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -162,7 +163,6 @@ void SpinBox::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/tabbar.cpp

@@ -236,6 +236,7 @@ void TabBarPrivate::setPalette()
 
     if (!customFont) {
         q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+        customFont = false;
     }
 }
 
@@ -626,7 +627,6 @@ void TabBar::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsWidget::changeEvent(event);

widgets/textbrowser.cpp

@@ -83,6 +83,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -207,7 +208,6 @@ void TextBrowser::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/textedit.cpp

@@ -63,6 +63,7 @@ public:
 
         if (!customFont) {
             q->setFont(Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont));
+            customFont = false;
         }
     }
 
@@ -179,7 +180,6 @@ void TextEdit::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
         d->customFont = true;
-        nativeWidget()->setFont(font());
     }
 
     QGraphicsProxyWidget::changeEvent(event);

widgets/toolbutton.cpp

@@ -380,15 +380,9 @@ void ToolButton::paint(QPainter *painter,
         buttonOpt.palette.setColor(QPalette::ButtonText, Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
     }
 
-    QFont widgetFont;
+    buttonOpt.font = d->customFont ? font() : Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont);
-    if (d->customFont) {
-        widgetFont = font();
-    } else {
-        widgetFont = Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont);
-    }
-    buttonOpt.font = widgetFont;
 
-    painter->setFont(widgetFont);
+    painter->setFont(buttonOpt.font);
     button->style()->drawControl(QStyle::CE_ToolButtonLabel, &buttonOpt, painter, button);
 }