Merge remote-tracking branch 'origin/1.12' into 1.12

Source/Editor/Editor.cpp

@@ -654,7 +654,7 @@ Window* Editor::CreateMainWindow()
     PROFILE_MEM(Editor);
     Window* window = Managed->GetMainWindow();
 
-#if PLATFORM_LINUX
+#if PLATFORM_LINUX || (PLATFORM_MAC && PLATFORM_SDL)
     // Set window icon
     const String iconPath = Globals::BinariesFolder / TEXT("Logo.png");
     if (FileSystem::FileExists(iconPath))

Source/Editor/GUI/Docking/FloatWindowDockPanel.cs

@@ -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)
             {