diff options
author | random human <random.bored.human@gmail.com> | 2019-06-27 07:57:58 +0000 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-06-27 11:13:02 -0400 |
commit | 0ba959f1cebe58867cac31b95a1835b7b83370d4 (patch) | |
tree | 1c8d408e48ee545210512ca2faa54ee6c6ad8202 /sway/tree/view.c | |
parent | Replace meson generator with custom_target (diff) | |
download | sway-0ba959f1cebe58867cac31b95a1835b7b83370d4.tar.gz sway-0ba959f1cebe58867cac31b95a1835b7b83370d4.tar.zst sway-0ba959f1cebe58867cac31b95a1835b7b83370d4.zip |
tree: set correct border value before creating floater
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 4fd3a65a..f6d62ad6 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -612,6 +612,10 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface, | |||
612 | &view->surface_new_subsurface); | 612 | &view->surface_new_subsurface); |
613 | view->surface_new_subsurface.notify = view_handle_surface_new_subsurface; | 613 | view->surface_new_subsurface.notify = view_handle_surface_new_subsurface; |
614 | 614 | ||
615 | if (decoration) { | ||
616 | view_update_csd_from_client(view, decoration); | ||
617 | } | ||
618 | |||
615 | if (view->impl->wants_floating && view->impl->wants_floating(view)) { | 619 | if (view->impl->wants_floating && view->impl->wants_floating(view)) { |
616 | view->container->border = config->floating_border; | 620 | view->container->border = config->floating_border; |
617 | view->container->border_thickness = config->floating_border_thickness; | 621 | view->container->border_thickness = config->floating_border_thickness; |
@@ -635,10 +639,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface, | |||
635 | view_update_title(view, false); | 639 | view_update_title(view, false); |
636 | container_update_representation(view->container); | 640 | container_update_representation(view->container); |
637 | 641 | ||
638 | if (decoration) { | ||
639 | view_update_csd_from_client(view, decoration); | ||
640 | } | ||
641 | |||
642 | if (fullscreen) { | 642 | if (fullscreen) { |
643 | container_set_fullscreen(view->container, true); | 643 | container_set_fullscreen(view->container, true); |
644 | arrange_workspace(view->container->workspace); | 644 | arrange_workspace(view->container->workspace); |