Change for easier syncing.
svn path=/trunk/KDE/kdebase/workspace/; revision=842516
This commit is contained in:
parent
e981508f42
commit
a9a5c45247
1 changed files with 3 additions and 5 deletions
|
@ -186,14 +186,12 @@ void OxygenButton::paintEvent(QPaintEvent *)
|
||||||
|
|
||||||
// widget->window()setPalette(pal);
|
// 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(
|
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)
|
||||||
|
|
Loading…
Reference in a new issue