aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-03-06 12:02:19 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-03-11 10:56:20 -0400
commit7b5429b4431cefbae9c509133bb0f6bd86dbe129 (patch)
treefe97d0670b08b4eae00bb1992e840a2e810f6249
parentipc: fix rect for stacked children (diff)
downloadsway-7b5429b4431cefbae9c509133bb0f6bd86dbe129.tar.gz
sway-7b5429b4431cefbae9c509133bb0f6bd86dbe129.tar.zst
sway-7b5429b4431cefbae9c509133bb0f6bd86dbe129.zip
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
-rw-r--r--sway/ipc-json.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index bcc525ad..20dcafb1 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,
352 352
353static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) { 353static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) {
354 enum sway_container_layout parent_layout = container_parent_layout(c); 354 enum sway_container_layout parent_layout = container_parent_layout(c);
355 if (parent_layout != L_TABBED && parent_layout != L_STACKED && 355 if ((parent_layout != L_TABBED && parent_layout != L_STACKED &&
356 c->current.border != B_NORMAL) { 356 c->current.border != B_NORMAL) ||
357 c->fullscreen_mode != FULLSCREEN_NONE) {
357 deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0; 358 deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0;
358 return; 359 return;
359 } 360 }