RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "wayland: conditionally commit surface on resize" 

30dcfbc is a workaround for incorrect border sizes that could occur on
sway/wlroots in certain edge cases. This seemed harmless enough, but it
turns out that on mutter the extra wl_surface_commit somehow causes the
window always go to the top left of the screen after you leave
fullscreen. No idea why this occurs, but the original commit is a
workaround a sway bug and causing regressions for other users isn't
right despite the author being biased towards sway/wlroots.

This reverts commit 30dcfbc9cb.
This commit is contained in:
Dudemanguy 2020-11-08 09:51:52 -06:00
parent 790647314c
commit dae6b1be96
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/opengl/context_wayland.c
View File

@ -128,8 +128,6 @@ static void resize(struct ra_ctx *ctx)
if (p->egl_window)
wl_egl_window_resize(p->egl_window, width, height, 0, 0);
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized)
wl_surface_commit(wl->surface);
wl->vo->dwidth = width;
wl->vo->dheight = height;
}

5
video/out/vo_wlshm.c
View File

@ -219,10 +219,7 @@ static int resize(struct vo *vo)
p->free_buffers = buf->next;
talloc_free(buf);
}
int ret = mp_sws_reinit(p->sws);
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized)
wl_surface_commit(wl->surface);
return ret;
return mp_sws_reinit(p->sws);
}
static int control(struct vo *vo, uint32_t request, void *data)

5
video/out/vulkan/context_wayland.c
View File

@ -210,10 +210,7 @@ static bool resize(struct ra_ctx *ctx)
vo_wayland_set_opaque_region(wl, ctx->opts.want_alpha);
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
bool ok = ra_vk_ctx_resize(ctx, width, height);
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized)
wl_surface_commit(wl->surface);
return ok;
return ra_vk_ctx_resize(ctx, width, height);
}
static bool wayland_vk_reconfig(struct ra_ctx *ctx)