mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into screencontent

Browse source
This commit is contained in:
emersion 2018-05-31 12:33:27 +01:00
commit 21928cbe61
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
39 changed files with 163 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rootston/main.c
View file

@ -72,6 +72,7 @@ int main(int argc, char **argv) {
}
wl_display_run(server.wl_display);
wl_display_destroy_clients(server.wl_display);
wl_display_destroy(server.wl_display);
return 0;
}

7
rootston/xdg_shell.c
View file

@ -135,11 +135,10 @@ static void get_size(const struct roots_view *view, struct wlr_box *box) {
if (surface->geometry.width > 0 && surface->geometry.height > 0) {
box->width = surface->geometry.width;
box->height = surface->geometry.height;
} else if (view->wlr_surface != NULL) {
box->width = view->wlr_surface->current->width;
box->height = view->wlr_surface->current->height;
} else {
box->width = box->height = 0;
assert(surface->surface);
box->width = surface->surface->current->width;
box->height = surface->surface->current->height;
}
}

7
rootston/xdg_shell_v6.c
View file

@ -136,11 +136,10 @@ static void get_size(const struct roots_view *view, struct wlr_box *box) {
if (surface->geometry.width > 0 && surface->geometry.height > 0) {
box->width = surface->geometry.width;
box->height = surface->geometry.height;
} else if (view->wlr_surface != NULL) {
box->width = view->wlr_surface->current->width;
box->height = view->wlr_surface->current->height;
} else {
box->width = box->height = 0;
assert(surface->surface);
box->width = surface->surface->current->width;
box->height = surface->surface->current->height;
}
}