diff options
| author | Brian Ashworth <[email protected]> | 2018-07-16 22:21:00 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-16 22:21:00 -0400 |
| commit | f516dbfb6d3380de24751de9a3f3156ece869e02 (patch) | |
| tree | fb23163603e5ac4221d6ee27ff91dffb19e3295f /sway/tree/view.c | |
| parent | db3a36373435a34b8d0a5fc4e90eacaa2b1dae6b (diff) | |
| parent | 10fc7a5b494822a944bbada33b2cb25926447d76 (diff) | |
Merge pull request #2286 from RyanDwyer/default-floating-border
Implement default_floating_border command and adjust CSD behaviour
Diffstat (limited to 'sway/tree/view.c')
| -rw-r--r-- | sway/tree/view.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 8d8d213a..70ab9364 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -316,11 +316,15 @@ void view_set_activated(struct sway_view *view, bool activated) { } void view_set_tiled(struct sway_view *view, bool tiled) { - bool csd = true; - if (view->impl->has_client_side_decorations) { - csd = view->impl->has_client_side_decorations(view); + if (!tiled) { + view->using_csd = true; + if (view->impl->has_client_side_decorations) { + view->using_csd = view->impl->has_client_side_decorations(view); + } + } else { + view->using_csd = false; } - view->border = tiled || !csd ? config->border : B_NONE; + if (view->impl->set_tiled) { view->impl->set_tiled(view, tiled); } @@ -573,8 +577,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { view->surface = wlr_surface; view->swayc = cont; - view->border = config->border; - view->border_thickness = config->border_thickness; view_init_subsurfaces(view, wlr_surface); wl_signal_add(&wlr_surface->events.new_subsurface, @@ -585,8 +587,12 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { view->container_reparent.notify = view_handle_container_reparent; if (view->impl->wants_floating && view->impl->wants_floating(view)) { + view->border = config->floating_border; + view->border_thickness = config->floating_border_thickness; container_set_floating(view->swayc, true); } else { + view->border = config->border; + view->border_thickness = config->border_thickness; view_set_tiled(view, true); } |