summaryrefslogtreecommitdiffstats
path: root/video/out/wayland_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-08-30 23:52:16 +0200
committerwm4 <wm4@nowhere>2016-08-30 23:52:16 +0200
commit4d755143216e4d8dec22b4918c1dd290a5efe814 (patch)
tree177ef8dba13d14853fb79175d9dc8370d4823fbd /video/out/wayland_common.c
parentaf1379c43d6a5274b75bce0adeef9e3a9ce87bdf (diff)
downloadmpv-4d755143216e4d8dec22b4918c1dd290a5efe814.tar.bz2
mpv-4d755143216e4d8dec22b4918c1dd290a5efe814.tar.xz
vo: change messy handling of fullscreen and other flags
Before this commit, all VOs had to toggle the option flag themselves, now command.c does it. I can't really comprehend why it required every VO to do this manually. Maybe it was for rejecting the property/option change if the VO didn't support a specific capability. But then it could have checked the VOCTRL result. In any case, I don't care, and successfully changing the property without doing anything (With some VOs) is fine too. Many things work this way now, and it's simpler overall. This change will be useful for cleaning up VO option handling.
Diffstat (limited to 'video/out/wayland_common.c')
-rw-r--r--video/out/wayland_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index e42af8438e..480f29638b 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -957,8 +957,9 @@ void vo_wayland_uninit(struct vo *vo)
static void vo_wayland_ontop(struct vo *vo)
{
struct vo_wayland_state *wl = vo->wayland;
+ if (!vo->opts->ontop)
+ return;
MP_DBG(wl, "going ontop\n");
- vo->opts->ontop = 1;
window_set_toplevel(wl);
schedule_resize(wl, 0, wl->window.width, wl->window.height);
}
@@ -1046,7 +1047,6 @@ int vo_wayland_control(struct vo *vo, int *events, int request, void *arg)
wl->window.events = 0;
return VO_TRUE;
case VOCTRL_FULLSCREEN:
- vo->opts->fullscreen = !vo->opts->fullscreen;
vo_wayland_fullscreen(vo);
return VO_TRUE;
case VOCTRL_ONTOP: