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

make kwin switch to a related activity if a window there is being activated.

Browse source 
I'd prefer if it went to the "last active" one, but first I'd need to implement a way of knowing which one that was.

svn path=/trunk/KDE/kdebase/workspace/; revision=1126339
This commit is contained in:
Chani Armitage 2010-05-13 18:53:08 +00:00
parent f26519c8d0
commit 09ca99c292
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
activation.cpp
View file

@ -285,12 +285,19 @@ void Workspace::activateClient( Client* c, bool force )
return;
}
raiseClient( c );
if (!c->isOnDesktop(currentDesktop()) )
if (!c->isOnCurrentDesktop() )
{
++block_focus;
setCurrentDesktop( c->desktop() );
--block_focus;
}
if (!c->isOnCurrentActivity() )
{
++block_focus;
//DBUS!
activityController_.setCurrentActivity( c->activities().first() ); //first isn't necessarily best, but it's easiest
--block_focus;
}
if( c->isMinimized())
c->unminimize();
@ -764,7 +771,9 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar
bool session ) const
{
Time time = info->userTime();
kDebug( 1212 ) << "User timestamp, initial:" << time;
//kDebug( 1212 ) << "User timestamp, initial:" << time;
//^^ this deadlocks kwin --replace sometimes.
// newer ASN timestamp always replaces user timestamp, unless user timestamp is 0
// helps e.g. with konqy reusing
if( asn_data != NULL && time != 0 )