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

Used nitrogenclient::renderWindowBackground in place of helper::renderWindowBackground everywhere to honor 'solid color' in title outline. Removed useless white spaces

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1021600
This commit is contained in:
Hugo Pereira Da Costa 2009-09-09 16:28:01 +00:00
parent e35a07a08d
commit 60e95cc624
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clients/nitrogen/nitrogenclient.cpp
View file

@ -172,13 +172,13 @@ namespace Nitrogen
border = qMax(frameBorder, 4); border = qMax(frameBorder, 4);
} else if( configuration().frameBorder() == NitrogenConfiguration::BorderNone && isPreview() && !compositingActive() ) { } else if( configuration().frameBorder() == NitrogenConfiguration::BorderNone && isPreview() && !compositingActive() ) {
border = 1; border = 1;
} else if( frameBorder < NitrogenConfiguration::BorderTiny ) { } else if( frameBorder < NitrogenConfiguration::BorderTiny ) {
border = 0; border = 0;
} else { } else {
border = frameBorder; border = frameBorder;
@ -451,11 +451,7 @@ namespace Nitrogen
int height = HFRAMESIZE; int height = HFRAMESIZE;
QRect rect( r.topLeft()-position, QSize( r.width(), height ) ); QRect rect( r.topLeft()-position, QSize( r.width(), height ) );
helper().slab( palette.color( widget->backgroundRole() ), 0, shadow_size )->render( rect.adjusted(-shadow_size-1, 0, shadow_size+1, 2 ), painter, TileSet::Bottom ); helper().slab( palette.color( widget->backgroundRole() ), 0, shadow_size )->render( rect.adjusted(-shadow_size-1, 0, shadow_size+1, 2 ), painter, TileSet::Bottom );
renderWindowBackground(painter, rect, widget, palette );
int offset = layoutMetric( LM_OuterPaddingTop );
int gradient_height = 64 + configuration().buttonSize() - 22;
const QWidget* window( isPreview() ? NitrogenClient::widget() : widget->window() );
helper().renderWindowBackground(painter, rect, widget, window, palette, offset, gradient_height );
} }
@ -511,11 +507,8 @@ namespace Nitrogen
// center // center
{ {
int offset = layoutMetric( LM_OuterPaddingTop );
int height = 64 + configuration().buttonSize() - 22;
int voffset = isMaximized() ? 0:HFRAMESIZE; int voffset = isMaximized() ? 0:HFRAMESIZE;
const QWidget* window( isPreview() ? widget() : widget()->window() ); renderWindowBackground(painter, rect.adjusted( 4, voffset, -4, -4 ), widget(), palette );
helper().renderWindowBackground(painter, rect.adjusted( 4, voffset, -4, -4 ), widget(), window, palette, offset, height );
} }
} }