Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-01-24 14:48:01 +01:00
commit 6281deb90f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
15 changed files with 328 additions and 76 deletions

View file

@ -314,6 +314,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
view->type = ROOTS_XWAYLAND_VIEW;
view->x = (double)surface->x;
view->y = (double)surface->y;
view->xwayland_surface = surface;
view->roots_xwayland_surface = roots_surface;
view->wlr_surface = surface->surface;
@ -329,6 +330,12 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
wl_list_insert(&desktop->views, &view->link);
if (!surface->override_redirect) {
if (surface->decorations == WLR_XWAYLAND_SURFACE_DECORATIONS_ALL) {
view->decorated = true;
view->border_width = 4;
view->titlebar_height = 12;
}
view_setup(view);
}
}