From 7b5429b4431cefbae9c509133bb0f6bd86dbe129 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 6 Mar 2019 12:02:19 -0500 Subject: [PATCH] ipc: fix fullscreen deco_rect This fixes the deco_rect reported by the ipc for fullscreen containers to be all zeroes. Children of the fullscreen container should still have their decorations reported correctly --- sway/ipc-json.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sway/ipc-json.c b/sway/ipc-json.c index bcc525ad1..20dcafb1e 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -352,8 +352,9 @@ static void ipc_json_describe_workspace(struct sway_workspace *workspace, static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) { enum sway_container_layout parent_layout = container_parent_layout(c); - if (parent_layout != L_TABBED && parent_layout != L_STACKED && - c->current.border != B_NORMAL) { + if ((parent_layout != L_TABBED && parent_layout != L_STACKED && + c->current.border != B_NORMAL) || + c->fullscreen_mode != FULLSCREEN_NONE) { deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0; return; }