From: Michael Stapelberg Date: Fri, 26 Aug 2011 01:17:41 +0000 (+0200) Subject: Correctly render containers when a split container is focused X-Git-Tag: 4.0.2~18^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7fca7f029f27847e0e4c3c15773fa1c2db118ffe;p=i3%2Fi3 Correctly render containers when a split container is focused --- diff --git a/include/con.h b/include/con.h index d8bad7de..93497404 100644 --- a/include/con.h +++ b/include/con.h @@ -68,6 +68,12 @@ bool con_is_floating(Con *con); */ Con *con_inside_floating(Con *con); +/** + * Checks if the given container is inside a focused container. + * + */ +Con *con_inside_focused(Con *con); + /** * Returns the container with the given client window ID or NULL if no such * container exists. diff --git a/src/con.c b/src/con.c index a115ad7b..9cef302f 100644 --- a/src/con.c +++ b/src/con.c @@ -358,6 +358,18 @@ Con *con_inside_floating(Con *con) { return con_inside_floating(con->parent); } +/* + * Checks if the given container is inside a focused container. + * + */ +Con *con_inside_focused(Con *con) { + if (con == focused) + return true; + if (!con->parent) + return false; + return con_inside_focused(con->parent); +} + /* * Returns the container with the given client window ID or NULL if no such * container exists. diff --git a/src/x.c b/src/x.c index abfcebef..f0307abf 100644 --- a/src/x.c +++ b/src/x.c @@ -290,7 +290,7 @@ void x_draw_decoration(Con *con) { /* find out which colors to use */ if (con->urgent) p->color = &config.client.urgent; - else if (con == focused) + else if (con == focused || con_inside_focused(con)) p->color = &config.client.focused; else if (con == TAILQ_FIRST(&(parent->focus_head))) p->color = &config.client.focused_inactive;