Sync r982620 from Oxygen.
svn path=/trunk/KDE/kdebase/workspace/; revision=982626
This commit is contained in:
parent
787de98e98
commit
79010c7230
1 changed files with 111 additions and 111 deletions
|
@ -512,10 +512,11 @@ TileSet *OxygenClient::shadowTiles(const QColor& color, const QColor& glow, qrea
|
|||
else if (!active && shadowTiles_ && !optionChanged)
|
||||
return shadowTiles_;
|
||||
|
||||
TileSet *tileSet;
|
||||
TileSet *tileSet = 0;
|
||||
|
||||
//---------------------------------------------------------------
|
||||
// Create new glow/shadow tiles
|
||||
|
||||
if (!tileSet)
|
||||
{
|
||||
QColor light = oxygenHelper()->calcLightColor(oxygenHelper()->backgroundTopColor(color));
|
||||
QColor dark = oxygenHelper()->calcDarkColor(oxygenHelper()->backgroundBottomColor(color));
|
||||
|
||||
|
@ -636,7 +637,6 @@ TileSet *OxygenClient::shadowTiles(const QColor& color, const QColor& glow, qrea
|
|||
shadowTilesOption_ = opt;
|
||||
shadowTiles_ = tileSet;
|
||||
}
|
||||
}
|
||||
return tileSet;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue