summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorNils Maier <maierman@web.de>2016-10-30 14:38:26 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2016-11-03 21:30:25 +0100
commit7c9f32620f2d5f0f19130e7f6b2fa7bf38d3729b (patch)
tree100cb5d894621d6676036ab3bcb0961828d3c091 /video
parent3f5b41dfa30ca282fd99176bf879493dd72b3119 (diff)
downloadmpv-7c9f32620f2d5f0f19130e7f6b2fa7bf38d3729b.tar.bz2
mpv-7c9f32620f2d5f0f19130e7f6b2fa7bf38d3729b.tar.xz
Apply autofit-larger after autofit-smaller
This prevents the window scaling beyond screen dimensions Fixes #3753
Diffstat (limited to 'video')
-rw-r--r--video/out/win_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/win_state.c b/video/out/win_state.c
index a80a650315..29eaa1b663 100644
--- a/video/out/win_state.c
+++ b/video/out/win_state.c
@@ -101,8 +101,8 @@ void vo_calc_window_geometry(struct vo *vo, const struct mp_rect *screen,
calc_monitor_aspect(opts, scr_w, scr_h, &out_geo->monitor_par, &d_w, &d_h);
apply_autofit(&d_w, &d_h, scr_w, scr_h, &opts->autofit, true, true);
- apply_autofit(&d_w, &d_h, scr_w, scr_h, &opts->autofit_larger, false, true);
apply_autofit(&d_w, &d_h, scr_w, scr_h, &opts->autofit_smaller, true, false);
+ apply_autofit(&d_w, &d_h, scr_w, scr_h, &opts->autofit_larger, false, true);
out_geo->win.x0 = (int)(scr_w - d_w) / 2;
out_geo->win.y0 = (int)(scr_h - d_h) / 2;