cosmetic change to the positioning patch,

fix for xawtv fullscreen placement (discussed with Dirk Mueller)

svn path=/trunk/kdebase/kwin/; revision=65773
This commit is contained in:
Matthias Ettrich 2000-09-29 15:54:18 +00:00
parent 972efcada8
commit 2dd48cfde3
2 changed files with 4 additions and 5 deletions

View file

@ -902,7 +902,8 @@ bool Client::configureRequest( XConfigureRequestEvent& e )
if ( windowType() == NET::Normal && may_move ) { if ( windowType() == NET::Normal && may_move ) {
// crap for broken netscape // crap for broken netscape
QRect area = workspace()->clientArea(); QRect area = workspace()->clientArea();
if ( !area.contains( np ) ){ if ( !area.contains( np ) && width() < area.width() &&
height() < area.height() ) {
if ( np.x() < area.x() ) if ( np.x() < area.x() )
np.rx() = area.x(); np.rx() = area.x();
if ( np.y() < area.y() ) if ( np.y() < area.y() )

View file

@ -2295,7 +2295,7 @@ void Workspace::sendClientToDesktop( Client* c, int desk )
return; return;
c->setDesktop( desk ); c->setDesktop( desk );
if ( c->isOnDesktop( currentDesktop() ) ) if ( c->isOnDesktop( currentDesktop() ) )
c->show(); c->show();
else else
@ -2732,9 +2732,7 @@ void Workspace::storeSession( KConfig* config )
config->writeEntry( QString("sessionId")+n, sessionId.data() ); config->writeEntry( QString("sessionId")+n, sessionId.data() );
config->writeEntry( QString("windowRole")+n, windowRole.data() ); config->writeEntry( QString("windowRole")+n, windowRole.data() );
config->writeEntry( QString("wmCommand")+n, wmCommand.data() ); config->writeEntry( QString("wmCommand")+n, wmCommand.data() );
QPoint pos = c->geometry().topLeft(); config->writeEntry( QString("geometry")+n, QRect( c->pos(), c->windowWrapper()->size() ) );
QSize size = c->windowWrapper()->geometry().size();
config->writeEntry( QString("geometry")+n, QRect(pos, size) );
config->writeEntry( QString("restore")+n, c->geometryRestore() ); config->writeEntry( QString("restore")+n, c->geometryRestore() );
config->writeEntry( QString("maximize")+n, (int) c->maximizeMode() ); config->writeEntry( QString("maximize")+n, (int) c->maximizeMode() );
config->writeEntry( QString("desktop")+n, c->desktop() ); config->writeEntry( QString("desktop")+n, c->desktop() );