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

win32: fit_window_on_screen: centralize logic (no-op)

Browse Source 
fit_on_screen is called only from reinit_window_state.

Move the yes/no logic unmodified from fit_on_screen to
reinit_window_state, and remove the w32->parent condition because it's
already checked earlier at reinit_window_state.
This commit is contained in:
Avi Halachmi (:avih) 2021-04-17 15:57:14 +03:00
parent e00ae12bbb
commit 954f6ac7bf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
video/out/w32_common.c
View File

@ -824,9 +824,6 @@ static bool fit_rect_size(RECT *rc, long n_w, long n_h)
// Also, if the top edge is above the working area, move down to align.
static void fit_window_on_screen(struct vo_w32_state *w32)
{
if (w32->parent || w32->current_fs || IsMaximized(w32->window))
return;
RECT screen = get_working_area(w32);
if (w32->opts->border)
subtract_window_borders(w32, w32->window, &screen);
@ -986,7 +983,9 @@ static void reinit_window_state(struct vo_w32_state *w32)
// Assume that the window has already been fit on screen before switching fs
if (!toggle_fs || w32->fit_on_screen) {
if (!w32->current_fs && !IsMaximized(w32->window))
fit_window_on_screen(w32);
// The fullscreen state might still be active, so set the flag
// to fit on screen next time the window leaves the fullscreen.
w32->fit_on_screen = w32->current_fs;