From 2e4a791bd60049b5a0a2935b4080239af18f4f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Sat, 5 Jan 2019 00:52:11 +0100 Subject: [PATCH] Started some fixes for Windows --- src/SFML/Window/Win32/WindowImplWin32.cpp | 3 +-- src/SFML/Window/Window.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp index bb3ef8480..49651c233 100755 --- a/src/SFML/Window/Win32/WindowImplWin32.cpp +++ b/src/SFML/Window/Win32/WindowImplWin32.cpp @@ -127,7 +127,7 @@ namespace DWORD translateStyle(sf::Uint32 style) { // Choose the window style according to the Style parameter - DWORD win32Style = WS_VISIBLE; + DWORD win32Style = 0; if (style == sf::Style::None) { win32Style |= WS_POPUP; @@ -593,7 +593,6 @@ void WindowImplWin32::switchToWindowed() SetWindowPos(m_handle, HWND_TOP, left, top, width, height, SWP_FRAMECHANGED); - fullscreenWindow = NULL; } diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp index 8cf5fa829..afb1d13e9 100644 --- a/src/SFML/Window/Window.cpp +++ b/src/SFML/Window/Window.cpp @@ -379,7 +379,7 @@ void Window::setState(State state) if (state == State::Windowed) { if (this == fullscreenWindow) - fullscreenWindow == NULL; + fullscreenWindow = NULL; } if (state == State::Fullscreen)