wayland_common: fix changing videos when fullscreen

I broke it again.
This commit is contained in:
Alexander Preisinger 2014-09-10 19:20:56 +02:00
parent 94fe57856d
commit 369868e404
2 changed files with 3 additions and 15 deletions

View File

@ -1201,20 +1201,9 @@ bool vo_wayland_config (struct vo *vo, uint32_t flags)
wl->window.aspect = vo->dwidth / (float) MPMAX(vo->dheight, 1);
if (!(flags & VOFLAG_HIDDEN)) {
if (!wl->window.is_init) {
wl->window.width = vo->dwidth;
wl->window.height = vo->dheight;
}
if (vo->opts->fullscreen) {
if (wl->window.is_fullscreen)
schedule_resize(wl, 0, wl->window.fs_width, wl->window.fs_height);
else
vo_wayland_fullscreen(vo);
}
else
vo_wayland_ontop(vo);
wl->window.is_init = true;
wl->window.width = vo->dwidth;
wl->window.height = vo->dheight;
vo_wayland_fullscreen(vo);
}
return true;

View File

@ -95,7 +95,6 @@ struct vo_wayland_state {
int32_t sh_y;
float aspect;
bool is_init; // true if the window has a valid size
bool is_fullscreen; // don't keep aspect ratio in fullscreen mode
int32_t fs_width; // fullscreen sizes
int32_t fs_height;