aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorRonan Pigott <rpigott@berkeley.edu>2021-04-18 13:47:14 -0700
committerSimon Ser <contact@emersion.fr>2021-05-10 10:30:44 +0200
commit137dbf3e6d567ca98df9bde1e2a0e69d81bd5ced (patch)
tree246293eea9effd8ae84da76189372cb7c77d47ba /sway/commands
parentd45623c2db570b7a2e0582943734d18f3d64b126 (diff)
cmd_fullscreen: ignore fullscreen request on workspaces
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/fullscreen.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index bc59201c..21c1e9a0 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -18,16 +18,13 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE,
"Can't run this command while there's no outputs connected.");
}
- struct sway_node *node = config->handler_context.node;
struct sway_container *container = config->handler_context.container;
- struct sway_workspace *workspace = config->handler_context.workspace;
- if (node->type == N_WORKSPACE && workspace->tiling->length == 0) {
- return cmd_results_new(CMD_FAILURE,
- "Can't fullscreen an empty workspace");
- }
- // If in the scratchpad, operate on the highest container
- if (container && !container->pending.workspace) {
+ if (!container) {
+ // If the focus is not a container, do nothing successfully
+ return cmd_results_new(CMD_SUCCESS, NULL);
+ } else if (!container->pending.workspace) {
+ // If in the scratchpad, operate on the highest container
while (container->pending.parent) {
container = container->pending.parent;
}
@@ -49,13 +46,6 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
global = strcasecmp(argv[1], "global") == 0;
}
- if (enable && node->type == N_WORKSPACE) {
- // Wrap the workspace's children in a container so we can fullscreen it
- container = workspace_wrap_children(workspace);
- workspace->layout = L_HORIZ;
- seat_set_focus_container(config->handler_context.seat, container);
- }
-
enum sway_fullscreen_mode mode = FULLSCREEN_NONE;
if (enable) {
mode = global ? FULLSCREEN_GLOBAL : FULLSCREEN_WORKSPACE;