From 17b142dd646ce4053f4548c0ff7b189531219c32 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 29 Nov 2014 00:33:46 -0600 Subject: Send setActive signal when taking focus in Client::takeFocus This relates to Bug 2189 Clean up minor formatting issues --- twin/activation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'twin/activation.cpp') 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(); } -- cgit v1.2.1