koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Stapelberg
2012-01-07 18:50:46 +00:00
parent 6345124049 3ce7f03f02
commit 470ee00012
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/con.c
View File

@ -810,7 +810,7 @@ Con *con_get_next(Con *con, char way, orientation_t orientation) {
*/
Con *con_descend_focused(Con *con) {
Con *next = con;
while (!TAILQ_EMPTY(&(next->focus_head)))
while (next != focused && !TAILQ_EMPTY(&(next->focus_head)))
next = TAILQ_FIRST(&(next->focus_head));
return next;
}
@ -827,6 +827,8 @@ Con *con_descend_tiling_focused(Con *con) {
Con *next = con;
Con *before;
Con *child;
if (next == focused)
return next;
do {
before = next;
TAILQ_FOREACH(child, &(next->focus_head), focused) {
@ -836,7 +838,7 @@ Con *con_descend_tiling_focused(Con *con) {
next = child;
break;
}
} while (before != next);
} while (before != next && next != focused);
return next;
}