Merge branch 'sdl_mac_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sdl_mac_fixes

This commit is contained in:
2026-04-09 10:16:50 +02:00
91 changed files with 1210 additions and 182 deletions
+1 -1
View File
@@ -654,7 +654,7 @@ Window* Editor::CreateMainWindow()
PROFILE_MEM(Editor);
Window* window = Managed->GetMainWindow();
#if PLATFORM_LINUX
#if PLATFORM_LINUX || PLATFORM_MAC
// Set window icon
const String iconPath = Globals::BinariesFolder / TEXT("Logo.png");
if (FileSystem::FileExists(iconPath))
@@ -32,7 +32,7 @@ namespace FlaxEditor.GUI.Docking
return base.OnMouseDown(location, button);
}
#if !PLATFORM_WINDOWS
#if PLATFORM_LINUX
/// <inheritdoc />
protected override WindowHitCodes OnHitTest(ref Float2 mouse)
{