diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-01 22:41:20 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-01 22:41:20 +1000 |
| commit | 4fa5e2d9db2879b665d6447692017b82ff78e186 (patch) | |
| tree | 19a4f66de6aeb2842a269c5e0103cb68b3d1f4c7 | |
| parent | 6ef14e99eec0d741104be3a1483b7e92de870c96 (diff) | |
| parent | 7f574c538db6bfc42166181b25ad5ef0831be63f (diff) | |
| download | sway-4fa5e2d9db2879b665d6447692017b82ff78e186.tar.xz | |
Merge branch 'borders' of github:RyanDwyer/sway into borders
| -rw-r--r-- | sway/commands.c | 2 | ||||
| -rw-r--r-- | sway/tree/view.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c index 575859c9..8abfd40b 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -101,9 +101,9 @@ static struct cmd_handler handlers[] = { { "client.focused_inactive", cmd_client_focused_inactive }, { "client.unfocused", cmd_client_unfocused }, { "client.urgent", cmd_client_urgent }, + { "default_border", cmd_default_border }, { "exec", cmd_exec }, { "exec_always", cmd_exec_always }, - { "default_border", cmd_default_border }, { "focus_follows_mouse", cmd_focus_follows_mouse }, { "for_window", cmd_for_window }, { "fullscreen", cmd_fullscreen }, diff --git a/sway/tree/view.c b/sway/tree/view.c index 80949c89..05a9b277 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -346,7 +346,11 @@ void view_unmap(struct sway_view *view) { view->swayc = NULL; view->surface = NULL; - arrange_children_of(parent); + if (parent->type == C_OUTPUT) { + arrange_output(parent); + } else { + arrange_children_of(parent); + } } void view_update_position(struct sway_view *view, double ox, double oy) { |