NitrogenHelper -> OxygenHelper + Use extra height argument for renderWindowBackground
svn path=/trunk/KDE/kdebase/workspace/; revision=1019625
This commit is contained in:
parent
52d665ae37
commit
b4b78b3ba6
1 changed files with 6 additions and 7 deletions
|
@ -48,16 +48,16 @@ using namespace std;
|
||||||
namespace Nitrogen
|
namespace Nitrogen
|
||||||
{
|
{
|
||||||
|
|
||||||
K_GLOBAL_STATIC_WITH_ARGS(NitrogenHelper, globalHelper, ("nitrogenDeco"))
|
K_GLOBAL_STATIC_WITH_ARGS(OxygenHelper, globalHelper, ("nitrogenDeco"))
|
||||||
|
|
||||||
//___________________________________________
|
//___________________________________________
|
||||||
NitrogenHelper *nitrogenHelper()
|
OxygenHelper *nitrogenHelper()
|
||||||
{ return globalHelper; }
|
{ return globalHelper; }
|
||||||
|
|
||||||
//___________________________________________
|
//___________________________________________
|
||||||
static void oxkwincleanupBefore()
|
static void oxkwincleanupBefore()
|
||||||
{
|
{
|
||||||
NitrogenHelper *h = globalHelper;
|
OxygenHelper *h = globalHelper;
|
||||||
h->invalidateCaches();
|
h->invalidateCaches();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -373,10 +373,9 @@ namespace Nitrogen
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
int offset( configuration().buttonSize() - 22 );
|
int offset = layoutMetric( LM_OuterPaddingBottom );
|
||||||
|
int height = 64 + configuration().buttonSize() - 22;
|
||||||
offset += layoutMetric( LM_OuterPaddingBottom );
|
helper().renderWindowBackground(painter, rect, widget, backgroundPalette( widget, palette ), offset, height );
|
||||||
helper().renderWindowBackground(painter, rect, widget, backgroundPalette( widget, palette ), offset );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue