Forward-port r494303 from 3.5 branch.

svn path=/trunk/KDE/kdebase/workspace/; revision=494311
This commit is contained in:
Eike Hein 2006-01-04 16:16:26 +00:00
parent b0a95318bc
commit 0aeabb9550

View file

@ -2071,9 +2071,7 @@ void Client::setFullScreen( bool set, bool user )
setGeometry( workspace()->clientArea( FullScreenArea, this )); setGeometry( workspace()->clientArea( FullScreenArea, this ));
else else
{ {
if( maximizeMode() != MaximizeRestore ) if( !geom_fs_restore.isNull())
changeMaximize( false, false, true ); // adjust size
else if( !geom_fs_restore.isNull())
setGeometry( QRect( geom_fs_restore.topLeft(), adjustedSize( geom_fs_restore.size()))); setGeometry( QRect( geom_fs_restore.topLeft(), adjustedSize( geom_fs_restore.size())));
// TODO isShaded() ? // TODO isShaded() ?
else else