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

don't show resize 'dots' in shaded mode. Round all four corners in shaded mode, even when 'no border' option is selected

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1020251
This commit is contained in:
Hugo Pereira Da Costa 2009-09-05 20:04:17 +00:00
parent c4cd3a4153
commit 0d6a13a62f
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clients/nitrogen/nitrogenclient.cpp
View file

@ -318,8 +318,8 @@ namespace Nitrogen
int top = 1; int top = 1;
int bottom = 1; int bottom = 1;
// disable bottom corners when border frame is too small // disable bottom corners when border frame is too small and window is not shaded
if( configuration().frameBorder() < NitrogenConfiguration::BorderTiny ) bottom = 0; if( configuration().frameBorder() < NitrogenConfiguration::BorderTiny && !isShade() ) bottom = 0;
int sw = layoutMetric( LM_OuterPaddingLeft ); int sw = layoutMetric( LM_OuterPaddingLeft );
int sh = layoutMetric( LM_OuterPaddingTop ); int sh = layoutMetric( LM_OuterPaddingTop );
@ -523,6 +523,7 @@ namespace Nitrogen
//_________________________________________________________ //_________________________________________________________
QPalette NitrogenClient::backgroundPalette( const QWidget* widget, QPalette palette ) const QPalette NitrogenClient::backgroundPalette( const QWidget* widget, QPalette palette ) const
{ {
if( configuration().drawTitleOutline() && isActive() ) if( configuration().drawTitleOutline() && isActive() )
{ palette.setColor( widget->window()->backgroundRole(), options()->color( KDecorationDefines::ColorTitleBar, true ) ); } { palette.setColor( widget->window()->backgroundRole(), options()->color( KDecorationDefines::ColorTitleBar, true ) ); }
@ -658,8 +659,8 @@ namespace Nitrogen
int top = 1; int top = 1;
int bottom = 1; int bottom = 1;
// disable bottom corners when border frame is too small // disable bottom corners when border frame is too small and window is not shaded
if( configuration().frameBorder() < NitrogenConfiguration::BorderTiny ) bottom = 0; if( configuration().frameBorder() < NitrogenConfiguration::BorderTiny && !isShade() ) bottom = 0;
QRegion mask( x+5*left, y+0*top, w-5*(left+right), h-0*(top+bottom)); QRegion mask( x+5*left, y+0*top, w-5*(left+right), h-0*(top+bottom));
mask += QRegion(x+0*left, y+5*top, w-0*(left+right), h-5*(top+bottom)); mask += QRegion(x+0*left, y+5*top, w-0*(left+right), h-5*(top+bottom));
mask += QRegion(x+2*left, y+2*top, w-2*(left+right), h-2*(top+bottom)); mask += QRegion(x+2*left, y+2*top, w-2*(left+right), h-2*(top+bottom));
@ -807,7 +808,7 @@ namespace Nitrogen
KDecoration::options()->color(ColorTitleBar) KDecoration::options()->color(ColorTitleBar)
); );
if( isResizable() ) if( isResizable() && !isShade() )
{ {
// Draw the 3-dots resize handles // Draw the 3-dots resize handles
@ -822,7 +823,7 @@ namespace Nitrogen
} }
// Draw the 3-dots resize handles // Draw the 3-dots resize handles
if( isResizable() && !configuration().drawSizeGrip() ) if( isResizable() && !isShade() && !configuration().drawSizeGrip() )
{ {
painter.setPen(Qt::NoPen); painter.setPen(Qt::NoPen);