mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

w32_common: respect --fit-border on size check

Browse Source 
Fit whole window or just a client area in accord with value of --fit-border option.

Fixes #2935.
This commit is contained in:
maniak1349 2016-04-26 04:47:14 +03:00 committed by wm4
parent 70f64f3ca9
commit 949247d6e6
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
video/out/w32_common.c
View File

@ -1067,15 +1067,31 @@ static void reinit_window_state(struct vo_w32_state *w32)
RECT cr = r;
add_window_borders(w32->window, &r);
// Check on client area size instead of window size on --fit-border=no
long o_w;
long o_h;
if( w32->opts->fit_border ) {
o_w = r.right - r.left;
o_h = r.bottom - r.top;
} else {
o_w = cr.right - cr.left;
o_h = cr.bottom - cr.top;
}
if (!w32->current_fs &&
((r.right - r.left) > screen_w || (r.bottom - r.top) > screen_h))
if ( !w32->current_fs && ( o_w > screen_w || o_h > screen_h ) )
{
MP_VERBOSE(w32, "requested window size larger than the screen\n");
// Use the aspect of the client area, not the full window size.
// Basically, try to compute the maximum window size.
long n_w = screen_w - (r.right - cr.right) - (cr.left - r.left);
long n_h = screen_h - (r.bottom - cr.bottom) - (cr.top - r.top);
long n_w;
long n_h;
if( w32->opts->fit_border ) {
n_w = screen_w - (r.right - cr.right) - (cr.left - r.left);
n_h = screen_h - (r.bottom - cr.bottom) - (cr.top - r.top);
} else {
n_w = screen_w;
n_h = screen_h;
}
// Letterbox
double asp = (cr.right - cr.left) / (double)(cr.bottom - cr.top);
double s_asp = n_w / (double)n_h;