diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-03-06 12:02:19 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-03-06 10:49:45 -0700 |
commit | 0df76ed96afa75ff8dd8ab6cf7748026e1caf5e7 (patch) | |
tree | c90bd7a0829768222ce589ae2d0264a961ecde52 | |
parent | ipc: fix rect for stacked children (diff) | |
download | sway-0df76ed96afa75ff8dd8ab6cf7748026e1caf5e7.tar.gz sway-0df76ed96afa75ff8dd8ab6cf7748026e1caf5e7.tar.zst sway-0df76ed96afa75ff8dd8ab6cf7748026e1caf5e7.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.c | 5 |
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 | ||
353 | static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) { | 353 | static 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 | } |