Change for easier syncing.

svn path=/trunk/KDE/kdebase/workspace/; revision=842516
This commit is contained in:
Luboš Luňák 2008-08-05 13:02:48 +00:00
parent e981508f42
commit a9a5c45247

View file

@ -186,14 +186,12 @@ void OxygenButton::paintEvent(QPaintEvent *)
// widget->window()setPalette(pal); // widget->window()setPalette(pal);
if( OxygenFactory::blendTitlebarColors()) QPalette pal2( pal );
helper_.renderWindowBackground(&painter, this->rect(), this, pal); if( !OxygenFactory::blendTitlebarColors()) {
else {
QPalette pal2( pal );
pal2.setColor( window()->backgroundRole(), client_.options()->color( pal2.setColor( window()->backgroundRole(), client_.options()->color(
KDecorationDefines::ColorTitleBar, client_.isActive())); KDecorationDefines::ColorTitleBar, client_.isActive()));
helper_.renderWindowBackground(&painter, this->rect(), this, pal2);
} }
helper_.renderWindowBackground(&painter, this->rect(), this, pal2);
if (type_ == ButtonMenu) { if (type_ == ButtonMenu) {
// we paint the mini icon (which is 16 pixels high) // we paint the mini icon (which is 16 pixels high)