Finally the proper way of doing r1.395.
svn path=/trunk/kdebase/kwin/; revision=286457
This commit is contained in:
parent
685f642737
commit
81a1feae6d
1 changed files with 3 additions and 6 deletions
|
@ -173,11 +173,8 @@ void Client::releaseWindow( bool on_shutdown )
|
||||||
setModal( false ); // otherwise its mainwindow wouldn't get focus
|
setModal( false ); // otherwise its mainwindow wouldn't get focus
|
||||||
hidden = true; // so that it's not considered visible anymore (can't use hideClient(), it would set flags)
|
hidden = true; // so that it's not considered visible anymore (can't use hideClient(), it would set flags)
|
||||||
if( !on_shutdown )
|
if( !on_shutdown )
|
||||||
{
|
|
||||||
workspace()->clientHidden( this );
|
workspace()->clientHidden( this );
|
||||||
XUnmapWindow( qt_xdisplay(), window()); // destroying decoration would cause ugly visual effect
|
XUnmapWindow( qt_xdisplay(), frameId()); // destroying decoration would cause ugly visual effect
|
||||||
XUnmapWindow( qt_xdisplay(), wrapperId());
|
|
||||||
}
|
|
||||||
destroyDecoration();
|
destroyDecoration();
|
||||||
cleanGrouping();
|
cleanGrouping();
|
||||||
if( !on_shutdown )
|
if( !on_shutdown )
|
||||||
|
@ -201,7 +198,7 @@ void Client::releaseWindow( bool on_shutdown )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Make sure it's not unmapped if the app unmapped it (#65279). The app
|
// Make sure it's not mapped if the app unmapped it (#65279). The app
|
||||||
// may do map+unmap before we initially map the window by calling rawShow() from manage().
|
// may do map+unmap before we initially map the window by calling rawShow() from manage().
|
||||||
XUnmapWindow( qt_xdisplay(), client );
|
XUnmapWindow( qt_xdisplay(), client );
|
||||||
}
|
}
|
||||||
|
@ -287,11 +284,11 @@ void Client::destroyDecoration()
|
||||||
setMask( QRegion()); // reset shape mask
|
setMask( QRegion()); // reset shape mask
|
||||||
int save_workarea_diff_x = workarea_diff_x;
|
int save_workarea_diff_x = workarea_diff_x;
|
||||||
int save_workarea_diff_y = workarea_diff_y;
|
int save_workarea_diff_y = workarea_diff_y;
|
||||||
move( grav );
|
|
||||||
if( !isShade())
|
if( !isShade())
|
||||||
plainResize( clientSize(), ForceGeometrySet );
|
plainResize( clientSize(), ForceGeometrySet );
|
||||||
else
|
else
|
||||||
plainResize( QSize( clientSize().width(), 0 ), ForceGeometrySet );
|
plainResize( QSize( clientSize().width(), 0 ), ForceGeometrySet );
|
||||||
|
move( grav );
|
||||||
workarea_diff_x = save_workarea_diff_x;
|
workarea_diff_x = save_workarea_diff_x;
|
||||||
workarea_diff_y = save_workarea_diff_y;
|
workarea_diff_y = save_workarea_diff_y;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue