diff options
author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-01-04 20:54:51 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-01-06 20:22:41 +0100 |
commit | 59f970d492869356ad9627875c7a94e2ee446930 (patch) | |
tree | d2b730d4a84760a0c12dfa4aff7eac5ac71b558a /video | |
parent | 29c74b42b4f9edc6a197ee884d723f8901c8de97 (diff) | |
download | mpv-59f970d492869356ad9627875c7a94e2ee446930.tar.bz2 mpv-59f970d492869356ad9627875c7a94e2ee446930.tar.xz |
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.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/wayland_common.c | 9 |
1 files 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; |