NitrogenHelper -> OxygenHelper + Use extra height argument for renderWindowBackground

svn path=/trunk/KDE/kdebase/workspace/; revision=1019625
icc-effect-5.14.5
Hugo Pereira Da Costa 2009-09-04 04:20:59 +00:00
parent 52d665ae37
commit b4b78b3ba6
1 changed files with 6 additions and 7 deletions

View File

@ -48,16 +48,16 @@ using namespace std;
namespace Nitrogen
{
K_GLOBAL_STATIC_WITH_ARGS(NitrogenHelper, globalHelper, ("nitrogenDeco"))
K_GLOBAL_STATIC_WITH_ARGS(OxygenHelper, globalHelper, ("nitrogenDeco"))
//___________________________________________
NitrogenHelper *nitrogenHelper()
OxygenHelper *nitrogenHelper()
{ return globalHelper; }
//___________________________________________
static void oxkwincleanupBefore()
{
NitrogenHelper *h = globalHelper;
OxygenHelper *h = globalHelper;
h->invalidateCaches();
}
@ -373,10 +373,9 @@ namespace Nitrogen
} else {
int offset( configuration().buttonSize() - 22 );
offset += layoutMetric( LM_OuterPaddingBottom );
helper().renderWindowBackground(painter, rect, widget, backgroundPalette( widget, palette ), offset );
int offset = layoutMetric( LM_OuterPaddingBottom );
int height = 64 + configuration().buttonSize() - 22;
helper().renderWindowBackground(painter, rect, widget, backgroundPalette( widget, palette ), offset, height );
}