diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
| commit | 497c32cdadb9da9bc20a3650b3056e2657358136 (patch) | |
| tree | ed3d48e5f9631d2951d8569b48a00d025c20ab08 /libvo | |
| parent | 626373af3840220d40217b7bbe81f5fb452882bb (diff) | |
| parent | def243261a0b8e3ab0d043cd89b97f8c9826e573 (diff) | |
| download | mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.bz2 mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.xz | |
Merge svn changes up to r31291
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/x11_common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index b9da242c46..5f433f478e 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1060,7 +1060,9 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, XSelectInput(mDisplay, x11->window, StructureNotifyMask); hint.x = x; hint.y = y; hint.width = width; hint.height = height; - hint.flags = PPosition | PSize; + hint.flags = PSize; + if (geometry_xy_changed) + hint.flags |= PPosition; XSetStandardProperties(mDisplay, x11->window, title, title, None, NULL, 0, &hint); if (!vo_border) vo_x11_decoration(vo, 0); // map window @@ -1077,6 +1079,8 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, ButtonPressMask | ButtonReleaseMask | ExposureMask); } if (opts->vo_ontop) vo_x11_setlayer(vo, x11->window, opts->vo_ontop); + if (!geometry_xy_changed) + vo_x11_update_geometry(vo); vo_x11_nofs_sizepos(vo, vo->dx, vo->dy, width, height); if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN)) vo_x11_fullscreen(vo); |