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/tree/view.c | |
parent | Add note about required scdoc version to README. (diff) | |
download | sway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.tar.gz sway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.tar.zst sway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.zip |
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/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) { | |||
197 | 197 | ||
198 | void view_autoconfigure(struct sway_view *view) { | 198 | void view_autoconfigure(struct sway_view *view) { |
199 | struct sway_container *con = view->container; | 199 | struct sway_container *con = view->container; |
200 | if (!con->workspace) { | 200 | if (container_is_scratchpad_hidden(con)) { |
201 | // Hidden in the scratchpad | ||
202 | return; | 201 | return; |
203 | } | 202 | } |
204 | struct sway_output *output = con->workspace->output; | 203 | struct sway_output *output = con->workspace->output; |
@@ -1054,7 +1053,7 @@ void view_set_urgent(struct sway_view *view, bool enable) { | |||
1054 | 1053 | ||
1055 | ipc_event_window(view->container, "urgent"); | 1054 | ipc_event_window(view->container, "urgent"); |
1056 | 1055 | ||
1057 | if (view->container->workspace) { | 1056 | if (!container_is_scratchpad_hidden(view->container)) { |
1058 | workspace_detect_urgent(view->container->workspace); | 1057 | workspace_detect_urgent(view->container->workspace); |
1059 | } | 1058 | } |
1060 | } | 1059 | } |