From 59f970d492869356ad9627875c7a94e2ee446930 Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Sat, 4 Jan 2014 20:54:51 +0100 Subject: 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. --- video/out/wayland_common.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 3aa087b4aa..4bab0d0f2e 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -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; -- cgit v1.2.3