Merge branch 'master' into next

diff --git a/include/data.h b/include/data.h
index 810709cdc28d4fe62275eae5ed1a94de71277b99..63b18b280e8837b471b437d2e245857071e0ad50 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -135,6 +135,7 @@ struct deco_render_params {
     Rect con_deco_rect;
     uint32_t background;
     bool con_is_leaf;
+    orientation_t parent_orientation;
 };
 
 /**

diff --git a/src/x.c b/src/x.c
index e53fd85719124945532abe74b9ca5294a6551bdd..78c6de33b243d8735af613b19719719364f70a7a 100644 (file)
--- a/src/x.c
+++ b/src/x.c
@@ -350,6 +350,7 @@ void x_draw_decoration(Con *con) {
     p->con_deco_rect = con->deco_rect;
     p->background = config.client.background;
     p->con_is_leaf = con_is_leaf(con);
+    p->parent_orientation = con_orientation(parent);
 
     if (con->deco_render_params != NULL &&
         (con->window == NULL || !con->window->name_x_changed) &&
@@ -444,7 +445,7 @@ void x_draw_decoration(Con *con) {
             TAILQ_PREV(con, nodes_head, nodes) == NULL &&
             con->parent->type != CT_FLOATING_CON) {
             xcb_change_gc(conn, con->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ p->color->indicator });
-            if (con_orientation(con->parent) == HORIZ)
+            if (p->parent_orientation == HORIZ)
                 xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, (xcb_rectangle_t[]){
                         { r->width + br.width + br.x, br.y, r->width, r->height + br.height } });
             else