LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 04:06:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure love.window.getMode returns up-to-date information about the window, remove some Mac-specific windowing code now unnecessary with SDL 2.0.2.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-03-03 03:36:17 -04:00
parent d5096840ba
commit f7c0fc1888
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/sdl/Window.cpp
+3 -6
View File
@@ -371,13 +371,10 @@ void Window::updateSettings(const WindowSettings &newsettings)
#endif #endif
// Only minimize on focus loss if the window is in exclusive-fullscreen // Only minimize on focus loss if the window is in exclusive-fullscreen
// mode (mimics behaviour of SDL 2.0.2+). // mode.
// In OS X we always disable this to prevent dock minimization weirdness.
#ifndef LOVE_MACOSX
if (curMode.settings.fullscreen && curMode.settings.fstype == FULLSCREEN_TYPE_NORMAL) if (curMode.settings.fullscreen && curMode.settings.fstype == FULLSCREEN_TYPE_NORMAL)
SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1"); SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1");
else else
#endif
SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");
curMode.settings.sRGB = newsettings.sRGB; curMode.settings.sRGB = newsettings.sRGB;
@@ -385,9 +382,9 @@ void Window::updateSettings(const WindowSettings &newsettings)
void Window::getWindow(int &width, int &height, WindowSettings &settings) void Window::getWindow(int &width, int &height, WindowSettings &settings)
{ {
// Window position may be different from creation - update display index. // The window might have been modified (moved, resized, etc.) by the user.
if (window) if (window)
curMode.settings.display = std::max(SDL_GetWindowDisplayIndex(window), 0); updateSettings(curMode.settings);
width = curMode.width; width = curMode.width;
height = curMode.height; height = curMode.height;