1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-01 20:00:37 +00:00

wayland: remove workaround

The changes in the vo_wayland_ontop function have no effect on the workaround.

Somehow the problem just disappeared. I guess it is because of the new control
function in gl_wayland.c where the resize happens immediatly after the event
dispatch/flush.
This commit is contained in:
Alexander Preisinger 2014-01-04 20:54:51 +01:00 committed by wm4
parent 29c74b42b4
commit 59f970d492

View File

@ -786,8 +786,9 @@ void vo_wayland_uninit (struct vo *vo)
static void vo_wayland_ontop (struct vo *vo)
{
vo->opts->ontop = !vo->opts->ontop;
vo->opts->fullscreen = !vo->opts->fullscreen;
MP_DBG(vo->wayland, "going ontop\n");
vo->opts->ontop = 0;
vo->opts->fullscreen = 1;
/* use the already existing code to leave fullscreen mode and go into
* toplevel mode */
@ -814,10 +815,6 @@ static void vo_wayland_fullscreen (struct vo *vo)
struct wl_output *fs_output = wl->display.fs_output;
if (vo->opts->fullscreen) {
if (!!vo->opts->fullscreen == wl->window.is_fullscreen)
vo_wayland_ontop(vo); // workaround for weston bug
// switch back to toplevel first before going fullscreen again
MP_DBG(wl, "going fullscreen\n");
wl->window.is_fullscreen = true;
wl->window.p_width = wl->window.width;