aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c3
-rw-r--r--sway/desktop/render.c3
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) {