aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/gaps.c15
-rw-r--r--sway/sway.5.scd8
2 files changed, 12 insertions, 11 deletions
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
index ca8cb27a..3f0ef155 100644
--- a/sway/commands/gaps.c
+++ b/sway/commands/gaps.c
@@ -149,16 +149,17 @@ struct cmd_results *cmd_gaps(int argc, char **argv) {
return error;
}
+ bool config_loading = !config->active || config->reloading;
+
if (argc == 2) {
return gaps_set_defaults(argc, argv);
}
- if (argc == 4) {
- if (config->active) {
- return gaps_set_runtime(argc, argv);
- } else {
- return cmd_results_new(CMD_INVALID, "gaps",
- "This syntax can only be used when sway is running");
- }
+ if (argc == 4 && !config_loading) {
+ return gaps_set_runtime(argc, argv);
+ }
+ if (config_loading) {
+ return cmd_results_new(CMD_INVALID, "gaps",
+ "Expected 'gaps inner|outer <px>'");
}
return cmd_results_new(CMD_INVALID, "gaps",
"Expected 'gaps inner|outer <px>' or "
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index f7ca00d6..4a645837 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -133,6 +133,10 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
*fullscreen*
Toggles fullscreen for the focused view.
+*gaps* inner|outer all|current set|plus|minus <amount>
+ Changes the _inner_ or _outer_ gaps for either _all_ workspaces or the
+ _current_ workspace.
+
*layout* default|splith|splitv|stacking|tabbed
Sets the layout mode of the focused container.
@@ -434,10 +438,6 @@ The default colors are:
This affects new workspaces only, and is used when the workspace doesn't
have its own gaps settings (see: workspace <ws> gaps inner|outer <amount>).
-*gaps* inner|outer all|current set|plus|minus <amount>
- Changes the _inner_ or _outer_ gaps for either _all_ workspaces or the
- _current_ workspace.
-
*hide\_edge\_borders* none|vertical|horizontal|both|smart|smart\_no\_gaps
Hides window borders adjacent to the screen edges. Default is _none_.