mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands.c
View file

@ -101,9 +101,9 @@ static struct cmd_handler handlers[] = {
{ "client.focused_inactive", cmd_client_focused_inactive }, { "client.focused_inactive", cmd_client_focused_inactive },
{ "client.unfocused", cmd_client_unfocused }, { "client.unfocused", cmd_client_unfocused },
{ "client.urgent", cmd_client_urgent }, { "client.urgent", cmd_client_urgent },
{ "default_border", cmd_default_border },
{ "exec", cmd_exec }, { "exec", cmd_exec },
{ "exec_always", cmd_exec_always }, { "exec_always", cmd_exec_always },
{ "default_border", cmd_default_border },
{ "focus_follows_mouse", cmd_focus_follows_mouse }, { "focus_follows_mouse", cmd_focus_follows_mouse },
{ "for_window", cmd_for_window }, { "for_window", cmd_for_window },
{ "fullscreen", cmd_fullscreen }, { "fullscreen", cmd_fullscreen },

4
sway/tree/view.c
View file

@ -346,7 +346,11 @@ void view_unmap(struct sway_view *view) {
view->swayc = NULL; view->swayc = NULL;
view->surface = NULL; view->surface = NULL;
if (parent->type == C_OUTPUT) {
arrange_output(parent);
} else {
arrange_children_of(parent); arrange_children_of(parent);
}
} }
void view_update_position(struct sway_view *view, double ox, double oy) { void view_update_position(struct sway_view *view, double ox, double oy) {