diff options
author | Timothy Pearson <[email protected]> | 2014-11-29 00:33:46 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-11-29 00:34:07 -0600 |
commit | 17b142dd646ce4053f4548c0ff7b189531219c32 (patch) | |
tree | f1cdf93b01b4c76d8d9e5079d64c2a27b442cc98 /twin/activation.cpp | |
parent | 2f7d50c20cebb33745c0ecea5a5b6cc3f4747d6e (diff) | |
download | tdebase-17b142dd646ce4053f4548c0ff7b189531219c32.tar.gz tdebase-17b142dd646ce4053f4548c0ff7b189531219c32.zip |
Send setActive signal when taking focus in Client::takeFocus
This relates to Bug 2189
Clean up minor formatting issues
Diffstat (limited to 'twin/activation.cpp')
-rw-r--r-- | twin/activation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/twin/activation.cpp b/twin/activation.cpp index 2e55b49c2..83ff24edb 100644 --- a/twin/activation.cpp +++ b/twin/activation.cpp @@ -311,14 +311,14 @@ void Workspace::requestFocus( Client* c, bool force ) { takeActivity( c, ActivityFocus | ( force ? ActivityFocusForce : 0 ), false); } - + void Workspace::takeActivity( Client* c, int flags, bool handled ) { - // the 'if( c == active_client ) return;' optimization mustn't be done here + // the 'if( c == active_client ) return;' optimization must not be done here if (!focusChangeEnabled() && ( c != active_client) ) flags &= ~ActivityFocus; - if ( !c ) + if ( !c ) { focusToNull(); return; @@ -328,7 +328,7 @@ void Workspace::takeActivity( Client* c, int flags, bool handled ) { Client* modal = c->findModal(); if( modal != NULL && modal != c ) - { + { next_active_client = modal; if( !modal->isOnDesktop( c->desktop())) { @@ -353,7 +353,7 @@ void Workspace::takeActivity( Client* c, int flags, bool handled ) { if( c->wantsInput() && ( flags & ActivityFocus )) { - // client cannot accept focus, but at least the window should be active (window menu, et. al. ) + // client cannot accept focus, but at least the window should be active (window menu, et. al. ) c->setActive( true ); focusToNull(); } |