Merge branch 'borders' of github:RyanDwyer/sway into borders

This commit is contained in:
Ryan Dwyer 2018-05-01 22:41:20 +10:00
commit 4fa5e2d9db
2 changed files with 6 additions and 2 deletions

View file

@ -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 },

View file

@ -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) {