Merge pull request #367 from DrChat/fullscreen_fix

Fix fullscreen
This commit is contained in:
Ben Vanik 2015-07-25 08:40:57 -07:00
commit dae37b66a3
1 changed files with 4 additions and 4 deletions

View File

@ -242,8 +242,8 @@ void Win32Window::set_focus(bool value) {
void Win32Window::Resize(int32_t width, int32_t height) { void Win32Window::Resize(int32_t width, int32_t height) {
RECT rc = {0, 0, width, height}; RECT rc = {0, 0, width, height};
bool has_menu = main_menu_ ? true : false; bool has_menu = !is_fullscreen() && (main_menu_ ? true : false);
AdjustWindowRect(&rc, WS_OVERLAPPEDWINDOW, has_menu); AdjustWindowRect(&rc, GetWindowLong(hwnd_, GWL_STYLE), has_menu);
if (true) { if (true) {
rc.right += 100 - rc.left; rc.right += 100 - rc.left;
rc.left = 100; rc.left = 100;
@ -257,8 +257,8 @@ void Win32Window::Resize(int32_t width, int32_t height) {
void Win32Window::Resize(int32_t left, int32_t top, int32_t right, void Win32Window::Resize(int32_t left, int32_t top, int32_t right,
int32_t bottom) { int32_t bottom) {
RECT rc = {left, top, right, bottom}; RECT rc = {left, top, right, bottom};
bool has_menu = main_menu_ ? true : false; bool has_menu = !is_fullscreen() && (main_menu_ ? true : false);
AdjustWindowRect(&rc, WS_OVERLAPPEDWINDOW, has_menu); AdjustWindowRect(&rc, GetWindowLong(hwnd_, GWL_STYLE), has_menu);
MoveWindow(hwnd_, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, MoveWindow(hwnd_, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
TRUE); TRUE);
} }