Merge branch 'master' into diagonal-dpi

This commit is contained in:
Daniel Eklöf 2020-07-28 20:01:56 +02:00
commit 295083059c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
19 changed files with 423 additions and 68 deletions

View file

@ -1212,6 +1212,11 @@ wayl_win_destroy(struct wl_window *win)
* nor mouse focus).
*/
if (win->scrollback_indicator_surface != NULL) {
wl_surface_attach(win->scrollback_indicator_surface, NULL, 0, 0);
wl_surface_commit(win->scrollback_indicator_surface);
}
/* Scrollback search */
if (win->search_surface != NULL) {
wl_surface_attach(win->search_surface, NULL, 0, 0);
@ -1236,6 +1241,10 @@ wayl_win_destroy(struct wl_window *win)
tll_free(win->on_outputs);
csd_destroy(win);
if (win->scrollback_indicator_sub_surface != NULL)
wl_subsurface_destroy(win->scrollback_indicator_sub_surface);
if (win->scrollback_indicator_surface != NULL)
wl_surface_destroy(win->scrollback_indicator_surface);
if (win->search_sub_surface != NULL)
wl_subsurface_destroy(win->search_sub_surface);
if (win->search_surface != NULL)