From 6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 28 Jan 2019 19:06:42 +1000 Subject: 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 --- sway/tree/view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 9ccb2a31..612cf96a 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -197,8 +197,7 @@ static bool gaps_to_edge(struct sway_view *view) { void view_autoconfigure(struct sway_view *view) { struct sway_container *con = view->container; - if (!con->workspace) { - // Hidden in the scratchpad + if (container_is_scratchpad_hidden(con)) { return; } struct sway_output *output = con->workspace->output; @@ -1054,7 +1053,7 @@ void view_set_urgent(struct sway_view *view, bool enable) { ipc_event_window(view->container, "urgent"); - if (view->container->workspace) { + if (!container_is_scratchpad_hidden(view->container)) { workspace_detect_urgent(view->container->workspace); } } -- cgit v1.2.3-54-g00ecf