Reverted r1170209
because it causes crash when playing with shade and maximize (likely due to a lower-level bug in kwin) svn path=/trunk/KDE/kdebase/workspace/; revision=1170211
This commit is contained in:
parent
943154f255
commit
b8137a7671
1 changed files with 2 additions and 5 deletions
|
@ -268,6 +268,7 @@ namespace Oxygen
|
||||||
{
|
{
|
||||||
case LM_BorderLeft:
|
case LM_BorderLeft:
|
||||||
case LM_BorderRight:
|
case LM_BorderRight:
|
||||||
|
case LM_BorderBottom:
|
||||||
{
|
{
|
||||||
int border( 0 );
|
int border( 0 );
|
||||||
if( respectWindowState && maximized )
|
if( respectWindowState && maximized )
|
||||||
|
@ -275,10 +276,6 @@ namespace Oxygen
|
||||||
|
|
||||||
border = 0;
|
border = 0;
|
||||||
|
|
||||||
} else if( lm == LM_BorderBottom && isShade() ) {
|
|
||||||
|
|
||||||
border = 0;
|
|
||||||
|
|
||||||
} else if( lm == LM_BorderBottom && frameBorder >= Configuration::BorderNoSide ) {
|
} else if( lm == LM_BorderBottom && frameBorder >= Configuration::BorderNoSide ) {
|
||||||
|
|
||||||
// for tiny border, the convention is to have a larger bottom area in order to
|
// for tiny border, the convention is to have a larger bottom area in order to
|
||||||
|
@ -1406,7 +1403,7 @@ namespace Oxygen
|
||||||
renderTargetRect( &painter, widget()->palette() );
|
renderTargetRect( &painter, widget()->palette() );
|
||||||
|
|
||||||
// separator
|
// separator
|
||||||
if( itemCount == 1 && !itemData_.isAnimated() && drawSeparator())
|
if( itemCount == 1 && !itemData_.isAnimated() && drawSeparator() )
|
||||||
{ renderSeparator(&painter, frame, widget(), color ); }
|
{ renderSeparator(&painter, frame, widget(), color ); }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue