minor iconify/deiconify fix (previous commit broke w2k plugin)
svn path=/trunk/kdebase/kwin/; revision=77557
This commit is contained in:
parent
33f78a855b
commit
cf23bd927c
1 changed files with 3 additions and 3 deletions
|
@ -1566,8 +1566,8 @@ void Client::show()
|
||||||
{
|
{
|
||||||
if ( isIconified() && ( !isTransient() || mainClient() == this ) )
|
if ( isIconified() && ( !isTransient() || mainClient() == this ) )
|
||||||
animateIconifyOrDeiconify( FALSE );
|
animateIconifyOrDeiconify( FALSE );
|
||||||
QWidget::show();
|
|
||||||
setMappingState( NormalState );
|
setMappingState( NormalState );
|
||||||
|
QWidget::show();
|
||||||
windowWrapper()->map();
|
windowWrapper()->map();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1701,13 +1701,13 @@ void Client::iconify()
|
||||||
hide();
|
hide();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
setMappingState( IconicState );
|
||||||
Events::raise( Events::Iconify );
|
Events::raise( Events::Iconify );
|
||||||
|
|
||||||
if ( (!isTransient() || mainClient() == this ) && isVisible() )
|
if ( (!isTransient() || mainClient() == this ) && isVisible() )
|
||||||
animateIconifyOrDeiconify( TRUE );
|
animateIconifyOrDeiconify( TRUE );
|
||||||
hide();
|
hide();
|
||||||
|
|
||||||
setMappingState( IconicState );
|
|
||||||
workspace()->iconifyOrDeiconifyTransientsOf( this );
|
workspace()->iconifyOrDeiconifyTransientsOf( this );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue