vlc | branch: master | Steve Lhomme <[email protected]> | Mon Mar 25 16:10:28 2019 +0100| [6c43fff20daafbd036d6a3ea98ee2e893826e433] | committer: Steve Lhomme
vout:win32: reindent > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c43fff20daafbd036d6a3ea98ee2e893826e433 --- modules/video_output/win32/common.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c index c19eeeb88f..6ea32c688b 100644 --- a/modules/video_output/win32/common.c +++ b/modules/video_output/win32/common.c @@ -394,19 +394,19 @@ int CommonControl(vout_display_t *vd, display_win32_area_t *area, vout_display_s if (sys != NULL) { #ifdef MODULE_NAME_IS_direct3d9 - if (sys->use_desktop && is_on_top) - return VLC_EGENERIC; + if (sys->use_desktop && is_on_top) + return VLC_EGENERIC; #endif - HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE); - - if (is_on_top && !(GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) { - CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_CHECKED); - SetWindowPos(sys->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); - } else if (!is_on_top && (GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) { - CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_UNCHECKED); - SetWindowPos(sys->hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - } - sys->is_on_top = is_on_top; + HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE); + + if (is_on_top && !(GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) { + CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_CHECKED); + SetWindowPos(sys->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + } else if (!is_on_top && (GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) { + CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_UNCHECKED); + SetWindowPos(sys->hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + } + sys->is_on_top = is_on_top; } return VLC_SUCCESS; } @@ -414,9 +414,9 @@ int CommonControl(vout_display_t *vd, display_win32_area_t *area, vout_display_s bool fs = va_arg(args, int); if (sys != NULL) { - if (CommonControlSetFullscreen(VLC_OBJECT(vd), sys, fs)) - return VLC_EGENERIC; - UpdateRects(vd, area, sys); + if (CommonControlSetFullscreen(VLC_OBJECT(vd), sys, fs)) + return VLC_EGENERIC; + UpdateRects(vd, area, sys); } return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
