summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2014-01-04 20:54:51 +0100
committerAlexander Preisinger <alexander.preisinger@gmail.com>2014-01-04 20:54:51 +0100
commit68e179bcf0694ad921cd18812825cbd2f1d862ca (patch)
tree60b8ed378016ce61c62ca994553ee6931d97f73c /video
parent148918dd53368156f616e21a568fd1b97a1890a9 (diff)
downloadmpv-68e179bcf0694ad921cd18812825cbd2f1d862ca.tar.bz2
mpv-68e179bcf0694ad921cd18812825cbd2f1d862ca.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.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 7e7f3f6b55..0948fb0ca5 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -897,8 +897,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 */
@@ -925,10 +926,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;