sixtenhugosson
/
vn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed my botched attempt at a merge.

main
sixten.hugosson 2023-06-18 16:53:17 +02:00
parent d70b6db7af
commit aefb393dcc
1 changed files with 543 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/win32_main.cpp
View File

@ -228,11 +228,6 @@ static PLATFORM_TOGGLE_FULLSCREEN(Win32_ToggleFullscreen)
DWORD Style = GetWindowLong(Window, GWL_STYLE); DWORD Style = GetWindowLong(Window, GWL_STYLE);
if(Style & WS_OVERLAPPEDWINDOW) if(Style & WS_OVERLAPPEDWINDOW)
{ {
MONITORINFO MonitorInfo = {sizeof(MonitorInfo)};
if(GetWindowPlacement(Window, &Global_WindowPosition) &&
GetMonitorInfo(MonitorFromWindow(Window, MONITOR_DEFAULTTOPRIMARY), &MonitorInfo))
{
<<<<<<< HEAD
MONITORINFO MonitorInfo = {sizeof(MonitorInfo)}; MONITORINFO MonitorInfo = {sizeof(MonitorInfo)};
if(GetWindowPlacement(Window, &Global_WindowPosition) && if(GetWindowPlacement(Window, &Global_WindowPosition) &&
GetMonitorInfo(MonitorFromWindow(Window, MONITOR_DEFAULTTOPRIMARY), &MonitorInfo)) GetMonitorInfo(MonitorFromWindow(Window, MONITOR_DEFAULTTOPRIMARY), &MonitorInfo))
@ -253,20 +248,6 @@ static PLATFORM_TOGGLE_FULLSCREEN(Win32_ToggleFullscreen)
SetWindowPlacement(Window, &Global_WindowPosition); SetWindowPlacement(Window, &Global_WindowPosition);
SetWindowPos(Window, 0, 0, 0, 0, 0, SetWindowPos(Window, 0, 0, 0, 0, 0,
SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOOWNERZORDER|SWP_FRAMECHANGED); SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOOWNERZORDER|SWP_FRAMECHANGED);
=======
SetWindowPos(Window, HWND_TOP,
MonitorInfo.rcMonitor.left, MonitorInfo.rcMonitor.top,
MonitorInfo.rcMonitor.right - MonitorInfo.rcMonitor.left,
MonitorInfo.rcMonitor.bottom - MonitorInfo.rcMonitor.top,
SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
>>>>>>> 376349b92227dcf5369dee77701a9ad8570ab639
}
}
else
{
SetWindowPlacement(Window, &Global_WindowPosition);
SetWindowPos(Window, 0, 0, 0, 0, 0,
SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOOWNERZORDER|SWP_FRAMECHANGED);
} }
} }