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

re-added the 1 pixel contrast on the top and sides of the titlebar, for 'no-border' and 'no-side-border' window border sizes. This requires svn external update of lib/helper.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1032139
This commit is contained in:
Hugo Pereira Da Costa 2009-10-07 00:54:15 +00:00
parent 4d4c8d91e7
commit ee9a1c1e0a
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
clients/oxygen/oxygenclient.cpp
View file

@ -906,34 +906,49 @@ namespace Oxygen
// adjust if there are shadows
if( compositingActive() ) frame.adjust(-1,-1, 1, 1);
// dimensions
int x,y,w,h;
frame.getRect(&x, &y, &w, &h);
// shadow and resize handles
if( configuration().frameBorder() >= OxygenConfiguration::BorderTiny )
if( !isMaximized() )
{
if( !isMaximized() )
if( configuration().frameBorder() >= OxygenConfiguration::BorderTiny )
{
helper().drawFloatFrame(
&painter, frame, backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ),
!compositingActive(), isActive(),
!compositingActive(), isActive() && configuration().useOxygenShadows(),
KDecoration::options()->color(ColorTitleBar)
);
} else if( isShade() ) {
} else {
// adjust frame so that only the bottom part of the frame is drawn
helper().drawFloatFrame(
&painter, frame.adjusted( -4, -4, 4, 0 ), backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ),
!compositingActive(), isActive(),
KDecoration::options()->color(ColorTitleBar)
&painter, frame, backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ),
false, isActive() && configuration().useOxygenShadows(),
KDecoration::options()->color(ColorTitleBar),
TileSet::Top
);
}
} else if( isShade() ) {
// adjust frame so that only the bottom part of the frame is drawn
helper().drawFloatFrame(
&painter, frame.adjusted( -4, -4, 4, 0 ), backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ),
!compositingActive(), isActive(),
KDecoration::options()->color(ColorTitleBar)
);
}
if( configuration().frameBorder() >= OxygenConfiguration::BorderTiny )
{
// dimensions
int x,y,w,h;
frame.getRect(&x, &y, &w, &h);
if( isResizable() && !isShade() && !isMaximized() )
{