summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-07-16 21:40:31 +0200
committerwm4 <wm4@nowhere>2013-07-18 14:17:30 +0200
commitc5b76714a0c9d57521b08e135f4f3c4e35c8b245 (patch)
tree7f83a7ccd45d3a9695ff112017ef33a65e718022 /video
parentc4b08a9a1149a83d7374eaea9863dd4c7cbd12d7 (diff)
downloadmpv-c5b76714a0c9d57521b08e135f4f3c4e35c8b245.tar.bz2
mpv-c5b76714a0c9d57521b08e135f4f3c4e35c8b245.tar.xz
wayland: don't resize in gl_wayland.c
The vo_wayland_fullscreen handles resizing for the video, because the video could still be in fullscreen mode and resizing it in gl_wayland could make it grow or shrink.
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_wayland.c6
-rw-r--r--video/out/wayland_common.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/video/out/gl_wayland.c b/video/out/gl_wayland.c
index 14ef84cf92..cb5cba0758 100644
--- a/video/out/gl_wayland.c
+++ b/video/out/gl_wayland.c
@@ -220,11 +220,7 @@ static bool config_window_wayland(struct MPGLContext *ctx,
return ret;
}
else {
- /* If the window exists just resize it */
- if (egl_ctx->egl_window)
- egl_resize_func(wl, 0, d_width, d_height, egl_ctx);
-
- else {
+ if (!egl_ctx->egl_window) {
/* If the context exists and the hidden flag is unset then
* create the window */
if (!(VOFLAG_HIDDEN & flags))
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 3ca40fc3c1..e15b0c6f2f 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -695,8 +695,6 @@ void vo_wayland_uninit (struct vo *vo)
static void vo_wayland_ontop (struct vo *vo)
{
- struct vo_wayland_state *wl = vo->wayland;
-
vo->opts->ontop = !vo->opts->ontop;
vo->opts->fullscreen = !vo->opts->fullscreen;