diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2019-01-28 19:06:42 +1000 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-01-28 10:35:40 +0100 |
| commit | 6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a (patch) | |
| tree | 61a9e61c64fd1b88a79b06a6f9dafeb84e4f8c35 /sway/desktop | |
| parent | 68a28e482fd4a813721e45ea860b80ada0e226b4 (diff) | |
| download | sway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.tar.xz | |
Introduce container_is_scratchpad_hidden
Just a convenience function that improves readability of the code.
Other things worth noting:
* container_get_siblings and container_sibling_index no longer use the
const keyword
* container_handle_fullscreen_reparent is only ever called after
attaching the container to a workspace, so its con->workspace check has
been changed to an assertion
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/output.c | 3 | ||||
| -rw-r--r-- | sway/desktop/render.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index b5f164cb..ad75bb35 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -252,8 +252,7 @@ static void output_for_each_surface(struct sway_output *output, struct sway_workspace *workspace = output_get_active_workspace(output); struct sway_container *fullscreen_con = root->fullscreen_global; - if (fullscreen_con && fullscreen_con->scratchpad && - !fullscreen_con->workspace) { + if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) { fullscreen_con = NULL; } if (!fullscreen_con) { diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 9102dc34..92e623ef 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -986,8 +986,7 @@ void output_render(struct sway_output *output, struct timespec *when, } struct sway_container *fullscreen_con = root->fullscreen_global; - if (fullscreen_con && fullscreen_con->scratchpad && - !fullscreen_con->workspace) { + if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) { fullscreen_con = NULL; } if (!fullscreen_con) { |