diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-05 09:33:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-05 09:33:27 -0400 |
| commit | 610eb946171f782165a20614b2d3318b89273990 (patch) | |
| tree | 05eec1df1ef48e05b23d273d31143ad32e7632d2 /sway/commands/border.c | |
| parent | aa2bf98e0442f9bf41a852c2fafee5b0897010a2 (diff) | |
| parent | dbf4aa3e33bdee53876c6893b15ac3f224818e7c (diff) | |
| download | sway-610eb946171f782165a20614b2d3318b89273990.tar.xz | |
Merge pull request #2540 from RyanDwyer/typesafety
Implement type safe arguments and demote sway_container
Diffstat (limited to 'sway/commands/border.c')
| -rw-r--r-- | sway/commands/border.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index 9502c877..95498b2f 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -13,13 +13,12 @@ struct cmd_results *cmd_border(int argc, char **argv) { return error; } - struct sway_container *container = - config->handler_context.current_container; - if (container->type != C_VIEW) { + struct sway_container *container = config->handler_context.container; + if (!container->view) { return cmd_results_new(CMD_INVALID, "border", "Only views can have borders"); } - struct sway_view *view = container->sway_view; + struct sway_view *view = container->view; if (strcmp(argv[0], "none") == 0) { view->border = B_NONE; @@ -38,11 +37,11 @@ struct cmd_results *cmd_border(int argc, char **argv) { view->border_thickness = atoi(argv[1]); } - if (container_is_floating(view->swayc)) { - container_set_geometry_from_floating_view(view->swayc); + if (container_is_floating(view->container)) { + container_set_geometry_from_floating_view(view->container); } - arrange_windows(view->swayc); + arrange_container(view->container); struct sway_seat *seat = input_manager_current_seat(input_manager); if (seat->cursor) { |