From a9a5c4524720e6cfe4a1fb15f4fc7794fe11b225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 5 Aug 2008 13:02:48 +0000 Subject: [PATCH] Change for easier syncing. svn path=/trunk/KDE/kdebase/workspace/; revision=842516 --- clients/ozone/oxygenbutton.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/clients/ozone/oxygenbutton.cpp b/clients/ozone/oxygenbutton.cpp index dd7322bac9..45f3736852 100644 --- a/clients/ozone/oxygenbutton.cpp +++ b/clients/ozone/oxygenbutton.cpp @@ -186,14 +186,12 @@ void OxygenButton::paintEvent(QPaintEvent *) // widget->window()setPalette(pal); - if( OxygenFactory::blendTitlebarColors()) - helper_.renderWindowBackground(&painter, this->rect(), this, pal); - else { - QPalette pal2( pal ); + QPalette pal2( pal ); + if( !OxygenFactory::blendTitlebarColors()) { pal2.setColor( window()->backgroundRole(), client_.options()->color( KDecorationDefines::ColorTitleBar, client_.isActive())); - helper_.renderWindowBackground(&painter, this->rect(), this, pal2); } + helper_.renderWindowBackground(&painter, this->rect(), this, pal2); if (type_ == ButtonMenu) { // we paint the mini icon (which is 16 pixels high)