From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 3 Mar 2011 13:03:06 +0000 (+0100)
Subject: Bugfix: don’t focus the dockarea when closing a dock client
X-Git-Tag: tree-pr2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=77640da9e7741a90caf2852fb7d8ac426ef91796;p=i3%2Fi3

Bugfix: don’t focus the dockarea when closing a dock client
---

diff --git a/src/tree.c b/src/tree.c
index 3900b862..31177109 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -184,7 +184,12 @@ void tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
         if (kill_window || !dont_kill_parent || con == focused) {
             DLOG("focusing %p / %s\n", next, next->name);
             /* TODO: check if the container (or one of its children) was focused */
-            con_focus(next);
+            if (next->type == CT_DOCKAREA) {
+                /* Instead of focusing the dockarea, we need to restore focus to the workspace */
+                con_focus(con_descend_focused(output_get_content(next->parent)));
+            } else {
+                con_focus(next);
+            }
         }
         else {
             DLOG("not focusing because we're not killing anybody");