epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compatibility with macOS's dark mode.

Browse Source
This commit is contained in:
Paul Chote
2018-12-17 21:04:22 +00:00
parent 1facff6ab1
commit cc004b3546
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Platforms.Default/Sdl2PlatformWindow.cs
View File

@@ -113,6 +113,31 @@ namespace OpenRA.Platforms.Default
window = SDL.SDL_CreateWindow("OpenRA", SDL.SDL_WINDOWPOS_CENTERED, SDL.SDL_WINDOWPOS_CENTERED,
windowSize.Width, windowSize.Height, windowFlags);
// Work around an issue in macOS's GL backend where the window remains permanently black
// (if dark mode is enabled) unless we drain the event queue before initializing GL
if (Platform.CurrentPlatform == PlatformType.OSX)
{
SDL.SDL_Event e;
while (SDL.SDL_PollEvent(out e) != 0)
{
// We can safely ignore all mouse/keyboard events and window size changes
// (these will be caught in the window setup below), but do need to process focus
if (e.type == SDL.SDL_EventType.SDL_WINDOWEVENT)
{
switch (e.window.windowEvent)
{
case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_FOCUS_LOST:
Game.HasInputFocus = false;
break;
case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_FOCUS_GAINED:
Game.HasInputFocus = true;
break;
}
}
}
}
surfaceSize = windowSize;
windowScale = 1;

2
packaging/osx/buildpackage.sh
View File

@@ -9,7 +9,7 @@ if [[ "$OSTYPE" != "darwin"* ]]; then
command -v genisoimage >/dev/null 2>&1 || { echo >&2 "macOS packaging requires genisoimage."; exit 1; }
fi
LAUNCHER_TAG="osx-launcher-20171118"
LAUNCHER_TAG="osx-launcher-20181118"
if [ $# -ne "2" ]; then
echo "Usage: $(basename "$0") tag outputdir"

2
thirdparty/fetch-thirdparty-deps-osx.sh vendored
View File

@@ -1,6 +1,6 @@
#!/bin/bash
LAUNCHER_TAG="osx-launcher-20171118"
LAUNCHER_TAG="osx-launcher-20181118"
download_dir="${0%/*}/download/osx"
mkdir -p "$download_dir"