yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added tileset initialization in constructor (to NULL), tileset destruction in destructor; and tileset destruction when replaced in ::shadowTiles method. (this was leaking, or did I miss something ?)

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1019165
This commit is contained in:
Hugo Pereira Da Costa 2009-09-03 03:32:12 +00:00
parent eca2dcabac
commit 290b5a8cc9
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clients/nitrogen/nitrogenclient.cpp
View file

@ -72,6 +72,8 @@ namespace Nitrogen
KCommonDecorationUnstable(b, f), KCommonDecorationUnstable(b, f),
colorCacheInvalid_(true), colorCacheInvalid_(true),
size_grip_( 0 ), size_grip_( 0 ),
shadowTiles_( 0 ),
glowTiles_( 0 ),
helper_(*globalHelper), helper_(*globalHelper),
initialized_( false ) initialized_( false )
{ qAddPostRoutine(oxkwincleanupBefore); } { qAddPostRoutine(oxkwincleanupBefore); }
@ -83,6 +85,10 @@ namespace Nitrogen
// delete sizegrip if any // delete sizegrip if any
if( hasSizeGrip() ) deleteSizeGrip(); if( hasSizeGrip() ) deleteSizeGrip();
// delete tilesets
if( shadowTiles_ ) delete shadowTiles_;
if( glowTiles_ ) delete glowTiles_;
} }
//___________________________________________ //___________________________________________
@ -741,10 +747,18 @@ namespace Nitrogen
&& opt.glowColor == opt.glowColor) && opt.glowColor == opt.glowColor)
optionChanged = false; optionChanged = false;
if (active && glowTiles_ && !optionChanged) if (active && glowTiles_ )
return glowTiles_; {
else if (!active && shadowTiles_ && !optionChanged)
return shadowTiles_; if( optionChanged) delete glowTiles_;
else return glowTiles_;
} else if (!active && shadowTiles_ ) {
if( optionChanged ) delete shadowTiles_;
else return shadowTiles_;
}
TileSet *tileSet = 0; TileSet *tileSet = 0;