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

activateNextClient precedence for next client in tabgroup

Browse source 
BUG: 309765
FIXED-IN: 4.10
REVIEW: 107258
This commit is contained in:
Thomas Lübking 2012-11-08 22:26:09 +01:00
parent 01adbe6dc5
commit 320c5cc287
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activation.cpp
View file

@ -457,16 +457,24 @@ bool Workspace::activateNextClient(Client* c)
Client* get_focus = NULL; Client* get_focus = NULL;
if (options->isNextFocusPrefersMouse()) { // precedence on keeping the current tabgroup active. to the user that's the same window
if (c && c->tabGroup()) {
if (c == c->tabGroup()->current())
c->tabGroup()->activateNext();
get_focus = c->tabGroup()->current();
if (get_focus == c) // single tab case - should not happen
get_focus = NULL;
}
if (!get_focus && options->isNextFocusPrefersMouse()) {
get_focus = clientUnderMouse(c ? c->screen() : activeScreen()); get_focus = clientUnderMouse(c ? c->screen() : activeScreen());
if (get_focus && (get_focus == c || get_focus->isDesktop())) { if (get_focus && (get_focus == c || get_focus->isDesktop())) {
// should rather not happen, but it cannot get the focus. rest of usability is tested above // should rather not happen, but it cannot get the focus. rest of usability is tested above
get_focus = 0; get_focus = NULL;
} }
} }
if (!get_focus) { // no suitable window under the mouse -> find sth. else if (!get_focus) { // no suitable window under the mouse -> find sth. else
// first try to pass the focus to the (former) active clients leader // first try to pass the focus to the (former) active clients leader
if (c && (get_focus = c->transientFor()) && isUsableFocusCandidate(get_focus, c, options->isSeparateScreenFocus())) { if (c && (get_focus = c->transientFor()) && isUsableFocusCandidate(get_focus, c, options->isSeparateScreenFocus())) {
raiseClient(get_focus); // also raise - we don't know where it came from raiseClient(get_focus); // also raise - we don't know where it came from