yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't deactivate the showing desktop state when a new window is shown

Browse source 
that belongs to the desktop (#113552).


svn path=/trunk/KDE/kdebase/workspace/; revision=528392
This commit is contained in:
Luboš Luňák 2006-04-10 22:11:44 +00:00
parent 77bc9cd63d
commit b7d19892d3
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client.cpp
View file

@ -891,7 +891,16 @@ void Client::updateVisibility()
} }
if( show ) if( show )
{ {
if( workspace()->showingDesktop()) bool belongs_to_desktop = false;
for( ClientList::ConstIterator it = group()->members().begin();
it != group()->members().end();
++it )
if( (*it)->isDesktop())
{
belongs_to_desktop = true;
break;
}
if( !belongs_to_desktop && workspace()->showingDesktop())
workspace()->resetShowingDesktop( true ); workspace()->resetShowingDesktop( true );
if( isShade()) if( isShade())
setMappingState( IconicState ); setMappingState( IconicState );

11
manage.cpp
View file

@ -454,7 +454,16 @@ bool Client::manage( Window w, bool isMapped )
if( !isOnCurrentDesktop() && !isMapped && !session && ( allow || workspace()->sessionSaving())) if( !isOnCurrentDesktop() && !isMapped && !session && ( allow || workspace()->sessionSaving()))
workspace()->setCurrentDesktop( desktop()); workspace()->setCurrentDesktop( desktop());
if( workspace()->showingDesktop()) bool belongs_to_desktop = false;
for( ClientList::ConstIterator it = group()->members().begin();
it != group()->members().end();
++it )
if( (*it)->isDesktop())
{
belongs_to_desktop = true;
break;
}
if( !belongs_to_desktop && workspace()->showingDesktop())
workspace()->resetShowingDesktop( false ); workspace()->resetShowingDesktop( false );
if( isOnCurrentDesktop() && !isMapped && !allow ) if( isOnCurrentDesktop() && !isMapped && !allow )