some mac changes?

#2800

.github/workflows/build_linux.yml

@@ -16,7 +16,8 @@ jobs:
       uses: actions/checkout@v3
     - name: Install dependencies
       run: |
-        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
+        sudo apt-get update
+        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET

.github/workflows/cd.yml

@@ -87,7 +87,8 @@ jobs:
         git ${{ env.GIT_LFS_PULL_OPTIONS }} lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
+        sudo apt-get update
+        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET
@@ -118,7 +119,8 @@ jobs:
         git ${{ env.GIT_LFS_PULL_OPTIONS }} lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
+        sudo apt-get update
+        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET

.github/workflows/tests.yml

@@ -28,7 +28,8 @@ jobs:
         git lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
+        sudo apt-get update
+        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
     - name: Build
       run: |
         ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -4,8 +4,8 @@
 #define MAX_LOCAL_LIGHTS 4
 @1// Forward Shading: Includes
 #include "./Flax/LightingCommon.hlsl"
-#if USE_REFLECTIONS
 #include "./Flax/ReflectionsCommon.hlsl"
+#if USE_REFLECTIONS
 #define MATERIAL_REFLECTIONS_SSR 1
 #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
 #include "./Flax/SSR.hlsl"
@@ -14,11 +14,13 @@
 #include "./Flax/Lighting.hlsl"
 #include "./Flax/ShadowsSampling.hlsl"
 #include "./Flax/ExponentialHeightFog.hlsl"
+#include "./Flax/VolumetricFog.hlsl"
 @2// Forward Shading: Constants
 LightData DirectionalLight;
 LightData SkyLight;
-ProbeData EnvironmentProbe;
+EnvProbeData EnvironmentProbe;
 ExponentialHeightFogData ExponentialHeightFog;
+VolumetricFogData VolumetricFog;
 float3 Dummy2;
 uint LocalLightsCount;
 LightData LocalLights[MAX_LOCAL_LIGHTS];
@@ -28,12 +30,14 @@ TextureCube SkyLightTexture : register(t__SRV__);
 Buffer<float4> ShadowsBuffer : register(t__SRV__);
 Texture2D<float> ShadowMap : register(t__SRV__);
 Texture3D VolumetricFogTexture : register(t__SRV__);
+Texture2D PreIntegratedGF : register(t__SRV__);
 @4// Forward Shading: Utilities
 // Public accessors for lighting data, use them as data binding might change but those methods will remain.
 LightData GetDirectionalLight() { return DirectionalLight; }
 LightData GetSkyLight() { return SkyLight; }
-ProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
+EnvProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
 ExponentialHeightFogData GetExponentialHeightFog() { return ExponentialHeightFog; }
+VolumetricFogData GetVolumetricFog() { return VolumetricFog; }
 uint GetLocalLightsCount() { return LocalLightsCount; }
 LightData GetLocalLight(uint i) { return LocalLights[i]; }
 @5// Forward Shading: Shaders
@@ -108,7 +112,8 @@ void PS_Forward(
 
 	// Calculate reflections
 #if USE_REFLECTIONS
-	float3 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness).rgb;
+	float4 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness);
+	reflections.rgb *= reflections.a;
 
 #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
 	// Screen Space Reflections
@@ -116,7 +121,7 @@ void PS_Forward(
 	Texture2D sceneColorTexture = MATERIAL_REFLECTIONS_SSR_COLOR;
 	float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
 	float stepSize = ScreenSize.z; // 1 / screenWidth
-	float maxSamples = 48;
+	float maxSamples = 50;
 	float worldAntiSelfOcclusionBias = 0.1f;
 	float brdfBias = 0.82f;
 	float drawDistance = 5000.0f;
@@ -124,7 +129,7 @@ void PS_Forward(
 	if (hit.z > 0)
 	{
 		float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
-		reflections = lerp(reflections, screenColor, hit.z);
+		reflections.rgb = lerp(reflections.rgb, screenColor, hit.z);
 	}
 
 	// Fallback to software tracing if possible
@@ -136,17 +141,17 @@ void PS_Forward(
 		if (TraceSDFSoftwareReflections(gBuffer, reflectWS, surfaceAtlas))
 		{
 			float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
-        	reflections = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
+        	reflections.rgb = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
 		}
 	}
 #endif
 #endif
 
-	light.rgb += reflections * GetReflectionSpecularLighting(ViewPos, gBuffer) * light.a;	
+	light.rgb += reflections.rgb * GetReflectionSpecularLighting(PreIntegratedGF, ViewPos, gBuffer);
 #endif
 
-	// Add lighting (apply ambient occlusion)
-	output.rgb += light.rgb * gBuffer.AO;
+	// Add lighting
+	output.rgb += light.rgb;
 
 #endif
 
@@ -158,17 +163,13 @@ void PS_Forward(
 #else
 	float fogSceneDistance = gBuffer.ViewPos.z;
 #endif
-	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, fogSceneDistance);
-
+	float fogSkipDistance = max(ExponentialHeightFog.VolumetricFogMaxDistance - 100, 0);
+	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, fogSkipDistance, fogSceneDistance);
 	if (ExponentialHeightFog.VolumetricFogMaxDistance > 0)
 	{
 		// Sample volumetric fog and mix it in
 		float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
-		float3 viewVector = materialInput.WorldPosition - ViewPos;
-		float sceneDepth = length(viewVector);
-		float depthSlice = sceneDepth / ExponentialHeightFog.VolumetricFogMaxDistance;
-		float3 volumeUV = float3(screenUV, depthSlice);
-		float4 volumetricFog = VolumetricFogTexture.SampleLevel(SamplerLinearClamp, volumeUV, 0);
+		float4 volumetricFog = SampleVolumetricFog(VolumetricFogTexture, VolumetricFog, materialInput.WorldPosition - ViewPos, screenUV, TemporalAAJitter);
 		fog = CombineVolumetricFog(fog, volumetricFog);
 	}
 

Content/Editor/MaterialTemplates/GUI.shader

@@ -38,6 +38,7 @@ struct VertexOutput
 #endif
 	float4 ClipExtents       : TEXCOORD3;
 	float2 ClipOrigin        : TEXCOORD4;
+    float2 CustomData        : TEXCOORD5; // x-per-geometry type, y-features mask
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
 #endif
@@ -55,6 +56,7 @@ struct PixelInput
 #endif
 	float4 ClipExtents       : TEXCOORD3;
 	float2 ClipOrigin        : TEXCOORD4;
+    float2 CustomData        : TEXCOORD5; // x-per-geometry type, y-features mask
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
 #endif
@@ -67,6 +69,7 @@ struct MaterialInput
 	float3 WorldPosition;
 	float TwoSidedSign;
 	float2 TexCoord;
+    float2 CustomData; // x-per-geometry type, y-features mask
 #if USE_VERTEX_COLOR
 	half4 VertexColor;
 #endif
@@ -84,6 +87,7 @@ MaterialInput GetMaterialInput(Render2DVertex input, VertexOutput output)
 	MaterialInput result;
 	result.WorldPosition = output.WorldPosition;
 	result.TexCoord = output.TexCoord;
+	result.CustomData = input.CustomDataAndClipOrigin.xy;
 #if USE_VERTEX_COLOR
 	result.VertexColor = output.VertexColor;
 #endif
@@ -103,6 +107,7 @@ MaterialInput GetMaterialInput(PixelInput input)
 	MaterialInput result;
 	result.WorldPosition = input.WorldPosition;
 	result.TexCoord = input.TexCoord;
+	result.CustomData = input.CustomData;
 #if USE_VERTEX_COLOR
 	result.VertexColor = input.VertexColor;
 #endif
@@ -229,6 +234,7 @@ VertexOutput VS_GUI(Render2DVertex input)
 #if USE_VERTEX_COLOR
 	output.VertexColor = input.Color;
 #endif
+	output.CustomData = input.CustomDataAndClipOrigin.xy;
 	output.ClipOrigin = input.CustomDataAndClipOrigin.zw;
 	output.ClipExtents = input.ClipExtents;
 

Content/Editor/MaterialTemplates/VolumeParticle.shader

@@ -8,6 +8,7 @@
 #include "./Flax/Common.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
 #include "./Flax/GBufferCommon.hlsl"
+#include "./Flax/VolumetricFog.hlsl"
 @7
 
 // Primary constant buffer (with additional material parameters)
@@ -21,6 +22,7 @@ float Dummy0;
 float VolumetricFogMaxDistance;
 int ParticleStride;
 int ParticleIndex;
+float4 GridSliceParameters;
 @1META_CB_END
 
 // Particles attributes buffer
@@ -202,19 +204,19 @@ Material GetMaterialPS(MaterialInput input)
 META_PS(true, FEATURE_LEVEL_SM5)
 void PS_VolumetricFog(Quad_GS2PS input, out float4 VBufferA : SV_Target0, out float4 VBufferB : SV_Target1)
 {
+	// Reproject grid position back to the screen and world space
 	uint3 gridCoordinate = uint3(input.Vertex.Position.xy, input.LayerIndex);
 	float3 cellOffset = 0.5f;
 	float2 volumeUV = (gridCoordinate.xy + cellOffset.xy) / GridSize.xy;
-	float zSlice = gridCoordinate.z + cellOffset.z;
-	float sceneDepth = (zSlice / GridSize.z) * VolumetricFogMaxDistance / ViewFar;
+	float sceneDepth = GetDepthFromSlice(GridSliceParameters, gridCoordinate.z + cellOffset.z) / ViewFar;
 	float deviceDepth = (ViewInfo.w / sceneDepth) + ViewInfo.z;
 	float4 clipPos = float4(volumeUV * float2(2.0, -2.0) + float2(-1.0, 1.0), deviceDepth, 1.0);
 	float4 wsPos = mul(clipPos, InverseViewProjectionMatrix);
-	float3 positionWS = wsPos.xyz / wsPos.w;
+	wsPos.xyz /= wsPos.w;
 
 	// Get material parameters
 	MaterialInput materialInput = (MaterialInput)0;
-	materialInput.WorldPosition = positionWS;
+	materialInput.WorldPosition = wsPos.xyz;
 	materialInput.TexCoord = input.Vertex.TexCoord;
 	materialInput.ParticleIndex = ParticleIndex;
 	materialInput.TBN = float3x3(float3(1, 0, 0), float3(0, 1, 0), float3(0, 0, 1));
@@ -225,9 +227,10 @@ void PS_VolumetricFog(Quad_GS2PS input, out float4 VBufferA : SV_Target0, out fl
 	Material material = GetMaterialPS(materialInput);
 
 	// Compute fog properties
+	material.Opacity *= material.Mask;
 	float3 albedo = material.Color;
-	float extinction = material.Opacity * material.Mask * 0.001f;
-	float3 emission = material.Emissive;
+	float extinction = material.Opacity * 0.001f;
+	float3 emission = material.Emissive * material.Opacity;
 	float3 scattering = albedo * extinction;
 	float absorption = max(0.0f, extinction - Luminance(scattering));
 

Content/Shaders/GI/GlobalSurfaceAtlas.flax

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f34bf867df5f4296ca66ac691c2bca4efa168fb9e21ca4e613e8086669575cf
-size 13296
+oid sha256:615dff65b01507be6c4de722e126324aba20fc197f8e12dafaa94a05e46cba6e
+size 13222

Content/Shaders/GlobalSignDistanceField.flax

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:064f54786958f109222c49cbc0358ff4f345b30010fcd5e8cc1fab7bdc68c4fe
-size 13349
+oid sha256:1f07ebb16820897e8598ae7a0627cb75b3d28e9dceea3ad4bd9ff543d5cdd01c
+size 13979

Content/Shaders/VolumetricFog.flax

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:872ac3560279bfd0aeb989ebac1b49750dd142b985bc40058888dfd2b63fe9b2
-size 13214
+oid sha256:706adde844360c2b0e65ecabaf1d2e2cc4eb4ac7ca9d483d0dd04ec8163b3d97
+size 13081

Flax.flaxproj

@@ -2,12 +2,12 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 11,
+    "Minor": 12,
     "Revision": 0,
-    "Build": 6805
+    "Build": 6905
   },
   "Company": "Flax",
-  "Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",
+  "Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",
   "GameTarget": "FlaxGame",
   "EditorTarget": "FlaxEditor",
   "Configuration": {

Flax.sln.DotSettings

@@ -188,7 +188,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_CASE_STATEMENT_ON_SAME_LINE/@EntryValue">ALWAYS</s:String>
+	
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_CASE_STATEMENT_STYLE/@EntryValue">ON_SINGLE_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>

GenerateProjectFiles.bat

@@ -15,7 +15,7 @@ if errorlevel 1 goto BuildToolFailed
 
 :: Build bindings for all editor configurations
 echo Building C# bindings...
-Binaries\Tools\Flax.Build.exe -build -BuildBindingsOnly -arch=x64 -platform=Windows --buildTargets=FlaxEditor,FlaxGame
+Binaries\Tools\Flax.Build.exe -build -BuildBindingsOnly -arch=x64 -platform=Windows --buildTargets=FlaxEditor
 
 popd
 echo Done!

GenerateProjectFiles.command

@@ -12,6 +12,6 @@ cd "`dirname "$0"`"
 bash ./Development/Scripts/Mac/CallBuildTool.sh --genproject "$@"
 
 # Build bindings for all editor configurations
-echo Building C# bindings...
+#echo Building C# bindings...
 # TODO: Detect the correct architecture here
-Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=ARM64 -platform=Mac --buildTargets=FlaxEditor
+#Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=ARM64 -platform=Mac --buildTargets=FlaxEditor

Source/Editor/Content/Import/TextureImportEntry.cs

@@ -187,6 +187,11 @@ namespace FlaxEditor.Content.Import
                 // Glossiness, metalness, ambient occlusion, displacement, height, cavity or specular
                 _settings.Settings.Type = TextureFormatType.GrayScale;
             }
+            else if (_settings.Settings.Type == TextureFormatType.ColorRGB)
+            {
+                // Blind guess that common color texture is sRGB
+                _settings.Settings.sRGB = true;
+            }
 
             // Try to restore target asset texture import options (useful for fast reimport)
             Editor.TryRestoreImportOptions(ref _settings.Settings, ResultUrl);

Source/Editor/Content/Items/ContentItem.cs

@@ -749,7 +749,7 @@ namespace FlaxEditor.Content
             }
 
             // Draw short name
-            Render2D.PushClip(textRect);
+            Render2D.PushClip(ref textRect);
             var scale = 0.95f * view.ViewScale;
             Render2D.DrawText(style.FontMedium, ShowFileExtension || view.ShowFileExtensions ? FileName : ShortName, textRect, style.Foreground, nameAlignment, TextAlignment.Center, TextWrapping.WrapWords, 1f, scale);
             Render2D.PopClip();

Source/Editor/Content/Thumbnails/ThumbnailsModule.cs

@@ -263,7 +263,7 @@ namespace FlaxEditor.Content.Thumbnails
             // Create render task but disabled for now
             _output = GPUDevice.Instance.CreateTexture("ThumbnailsOutput");
             var desc = GPUTextureDescription.New2D(PreviewsCache.AssetIconSize, PreviewsCache.AssetIconSize, PreviewsCache.AssetIconsAtlasFormat);
-            _output.Init(desc);
+            _output.Init(ref desc);
             _task = Object.New<RenderTask>();
             _task.Order = 50; // Render this task later
             _task.Enabled = false;

Source/Editor/CustomEditors/CustomEditorsUtil.cs

@@ -139,7 +139,7 @@ namespace FlaxEditor.CustomEditors
             return new GenericEditor();
         }
 
-        [LibraryImport("FlaxEngine", EntryPoint = "CustomEditorsUtilInternal_GetCustomEditor", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "CustomEditorsUtilInternal_GetCustomEditor", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalUsing(typeof(SystemTypeMarshaller))]
         internal static partial Type Internal_GetCustomEditor([MarshalUsing(typeof(SystemTypeMarshaller))] Type targetType);
     }

Source/Editor/CustomEditors/Dedicated/ActorEditor.cs

@@ -60,14 +60,14 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 if (prefab && !prefab.WaitForLoaded())
                 {
                     var prefabObjectId = actor.PrefabObjectID;
-                    var prefabInstance = prefab.GetDefaultInstance(prefabObjectId);
+                    var prefabInstance = prefab.GetDefaultInstance(ref prefabObjectId);
                     if (prefabInstance != null)
                     {
                         // Use default prefab instance as a reference for the editor
                         Values.SetReferenceValue(prefabInstance);
 
                         // Display prefab UI (when displaying object inside Prefab Window then display only nested prefabs)
-                        prefab.GetNestedObject(prefabObjectId, out var nestedPrefabId, out var nestedPrefabObjectId);
+                        prefab.GetNestedObject(ref prefabObjectId, out var nestedPrefabId, out var nestedPrefabObjectId);
                         var nestedPrefab = FlaxEngine.Content.Load<Prefab>(nestedPrefabId);
                         var panel = layout.UniformGrid();
                         panel.CustomControl.Height = 20.0f;
@@ -207,7 +207,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 {
                     var actor = (Actor)Values[0];
                     var prefabObjectId = actor.PrefabObjectID;
-                    var prefabInstance = prefab.GetDefaultInstance(prefabObjectId);
+                    var prefabInstance = prefab.GetDefaultInstance(ref prefabObjectId);
                     if (prefabInstance != null)
                     {
                         Values.SetReferenceValue(prefabInstance);
@@ -525,7 +525,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var restored = actor.AddScript(removed.PrefabObject.GetType());
                 var prefabId = actor.PrefabID;
                 var prefabObjectId = restored.PrefabObjectID;
-                Script.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), prefabId, prefabObjectId);
+                Script.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), ref prefabId, ref prefabObjectId);
                 string data = JsonSerializer.Serialize(removed.PrefabObject);
                 JsonSerializer.Deserialize(restored, data);
 
@@ -547,7 +547,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 string data = JsonSerializer.Serialize(removedActor.PrefabObject);
                 JsonSerializer.Deserialize(restored, data);
                 Presenter.Owner.SceneContext.Spawn(restored, parentActor, removedActor.OrderInParent);
-                Actor.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), prefabId, prefabObjectId);
+                Actor.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), ref prefabId, ref prefabObjectId);
                 return;
             }
 

Source/Editor/CustomEditors/Dedicated/EnvironmentProbeEditor.cs

@@ -21,10 +21,12 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             if (Values.HasDifferentTypes == false)
             {
-                var group = layout.Group("Bake");
+                var group = layout.Group("Probe");
                 group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
                 _bake = group.Button("Bake").Button;
                 _bake.Clicked += BakeButtonClicked;
+                var view = group.Button("View", "Opens the probe texture viewer");
+                view.Button.Clicked += OnViewButtonClicked;
             }
         }
 
@@ -50,5 +52,14 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 }
             }
         }
+
+        private void OnViewButtonClicked()
+        {
+            foreach (var value in Values)
+            {
+                if (value is EnvironmentProbe probe && probe.ProbeAsset)
+                    Editor.Instance.ContentEditing.Open(probe.ProbeAsset);
+            }
+        }
     }
 }

Source/Editor/CustomEditors/Dedicated/LocalizationSettingsEditor.cs

@@ -195,7 +195,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     filesCount += files.Length;
                     foreach (var file in files)
                         FindNewKeysCpp(file, newKeys, allKeys);
-                    files = Directory.GetFiles(Globals.ProjectSourceFolder, "*.h", SearchOption.AllDirectories).Concat(Directory.GetFiles(Globals.ProjectSourceFolder, "*.hpp", SearchOption.AllDirectories)).ToArray();;
+                    files = Directory.GetFiles(Globals.ProjectSourceFolder, "*.h", SearchOption.AllDirectories).Concat(Directory.GetFiles(Globals.ProjectSourceFolder, "*.hpp", SearchOption.AllDirectories)).ToArray();
                     filesCount += files.Length;
                     foreach (var file in files)
                         FindNewKeysCpp(file, newKeys, allKeys);

Source/Editor/CustomEditors/Dedicated/MeshReferenceEditor.cs

@@ -164,11 +164,11 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
 
                 // Deselect
-                if (isSelected && button1Rect.Contains(location))
+                if (isSelected && button1Rect.Contains(ref location))
                     Value = new ModelInstanceActor.MeshReference { Actor = null, LODIndex = -1, MeshIndex = -1 };
 
                 // Picker dropdown menu
-                if ((isSelected ? button2Rect : button1Rect).Contains(location))
+                if ((isSelected ? button2Rect : button1Rect).Contains(ref location))
                     ShowDropDownMenu();
 
                 return base.OnMouseUp(location, button);

Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs

@@ -40,7 +40,7 @@ public class ModelPrefabEditor : GenericEditor
             if (prefab)
             {
                 var prefabObjectId = modelPrefab.PrefabObjectID;
-                var prefabObject = prefab.GetDefaultInstance(prefabObjectId);
+                var prefabObject = prefab.GetDefaultInstance(ref prefabObjectId);
                 if (prefabObject.PrefabID == _prefabId)
                     break;
                 _prefabId = prefabObject.PrefabID;

Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+using FlaxEngine;
+
+namespace FlaxEditor.CustomEditors.Dedicated
+{
+    /// <summary>
+    /// Custom editor for <see cref="NavMeshBoundsVolume"/>.
+    /// </summary>
+    /// <seealso cref="ActorEditor" />
+    [CustomEditor(typeof(NavMeshBoundsVolume)), DefaultEditor]
+    internal class NavMeshBoundsVolumeEditor : ActorEditor
+    {
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            base.Initialize(layout);
+
+            if (Values.HasDifferentTypes == false)
+            {
+                var button = layout.Button("Build");
+                button.Button.Clicked += OnBuildClicked;
+            }
+        }
+
+        private void OnBuildClicked()
+        {
+            foreach (var value in Values)
+            {
+                if (value is NavMeshBoundsVolume volume)
+                {
+                    Navigation.BuildNavMesh(volume.Box, volume.Scene);
+                    Editor.Instance.Scene.MarkSceneEdited(volume.Scene);
+                }
+            }
+        }
+    }
+}

Source/Editor/CustomEditors/Dedicated/RigidBodyEditor.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
-using System.Reflection.Emit;
 using FlaxEditor.CustomEditors.GUI;
 using FlaxEngine;
 using FlaxEngine.GUI;

Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs

@@ -909,7 +909,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 settingsButton.Tag = script;
                 settingsButton.Clicked += OnSettingsButtonClicked;
 
-                group.Panel.HeaderTextMargin = new Margin(scriptDrag.Right - 12, 15, 2, 2);
+                // Adjust margin to not overlap with other ui elements in the header
+                group.Panel.HeaderTextMargin = group.Panel.HeaderTextMargin with { Left = scriptDrag.Right - 12, Right = settingsButton.Width + Utilities.Constants.UIMargin };
                 group.Object(values, editor);
                 // Remove drop down arrows and containment lines if no objects in the group
                 if (group.Children.Count == 0)

Source/Editor/CustomEditors/Editors/AssetRefEditor.cs

@@ -192,7 +192,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
-                if (DropdownRect.Contains(location))
+                if (DropdownRect.Contains(ref location))
                 {
                     Focus();
                     ShowPicker();
@@ -206,7 +206,7 @@ namespace FlaxEditor.CustomEditors.Editors
             {
                 base.OnMouseMove(location);
 
-                if (DropdownRect.Contains(location))
+                if (DropdownRect.Contains(ref location))
                     Cursor = CursorType.Default;
                 else
                     Cursor = CursorType.IBeam;

Source/Editor/CustomEditors/Editors/CollectionEditor.cs

@@ -155,7 +155,7 @@ namespace FlaxEditor.CustomEditors.Editors
             /// <inheritdoc />
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
-                if (button == MouseButton.Left && _arrangeButtonRect.Contains(location))
+                if (button == MouseButton.Left && _arrangeButtonRect.Contains(ref location))
                 {
                     _arrangeButtonInUse = true;
                     Focus();
@@ -371,7 +371,7 @@ namespace FlaxEditor.CustomEditors.Editors
             /// <inheritdoc />
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
-                if (button == MouseButton.Left && _arrangeButtonRect.Contains(location))
+                if (button == MouseButton.Left && _arrangeButtonRect.Contains(ref location))
                 {
                     _arrangeButtonInUse = true;
                     Focus();
@@ -450,6 +450,7 @@ namespace FlaxEditor.CustomEditors.Editors
         protected bool NotNullItems;
 
         private IntValueBox _sizeBox;
+        private Label _label;
         private Color _background;
         private int _elementsCount, _minCount, _maxCount;
         private bool _readOnly;
@@ -566,7 +567,7 @@ namespace FlaxEditor.CustomEditors.Editors
                     Parent = dropPanel,
                 };
 
-                var label = new Label
+                _label = new Label
                 {
                     Text = "Size",
                     AnchorPreset = AnchorPresets.TopRight,
@@ -592,11 +593,12 @@ namespace FlaxEditor.CustomEditors.Editors
                 panel.Panel.Offsets = new Margin(7, 7, 0, 0);
                 panel.Panel.BackgroundColor = _background;
                 var elementType = ElementType;
+                var bindingAttr = System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public;
                 bool single = elementType.IsPrimitive ||
                               elementType.Equals(new ScriptType(typeof(string))) ||
                               elementType.IsEnum ||
-                              (elementType.GetFields().Length == 1 && elementType.GetProperties().Length == 0) ||
-                              (elementType.GetProperties().Length == 1 && elementType.GetFields().Length == 0) ||
+                              (elementType.GetFields(bindingAttr).Length == 1 && elementType.GetProperties(bindingAttr).Length == 0) ||
+                              (elementType.GetProperties(bindingAttr).Length == 1 && elementType.GetFields(bindingAttr).Length == 0) ||
                               elementType.Equals(new ScriptType(typeof(JsonAsset))) ||
                               elementType.Equals(new ScriptType(typeof(SettingsBase)));
                 if (_cachedDropPanels == null)
@@ -672,8 +674,10 @@ namespace FlaxEditor.CustomEditors.Editors
                     Resize(Count + 1);
                 };
             }
-        }
 
+            Layout.ContainerControl.SizeChanged += OnLayoutSizeChanged;
+        }
+        
         private void OnSetupContextMenu(ContextMenu menu, DropPanel panel)
         {
             if (menu.Items.Any(x => x is ContextMenuButton b && b.Text.Equals("Open All", StringComparison.Ordinal)))
@@ -696,10 +700,24 @@ namespace FlaxEditor.CustomEditors.Editors
             });
         }
 
+        private void OnLayoutSizeChanged(Control control)
+        {
+            if (Layout.ContainerControl is DropPanel dropPanel)
+            {
+                // Hide "Size" text when array editor title overlaps
+                var headerTextSize = dropPanel.HeaderTextFont.GetFont().MeasureText(dropPanel.HeaderText);
+                if (headerTextSize.X + DropPanel.DropDownIconSize >= _label.Left)
+                    _label.TextColor = _label.TextColorHighlighted = Color.Transparent;
+                else
+                    _label.TextColor = _label.TextColorHighlighted = FlaxEngine.GUI.Style.Current.Foreground;
+            }
+        }
+
         /// <inheritdoc />
         protected override void Deinitialize()
         {
             _sizeBox = null;
+            Layout.ContainerControl.SizeChanged -= OnLayoutSizeChanged;
 
             base.Deinitialize();
         }

Source/Editor/CustomEditors/Editors/FlaxObjectRefEditor.cs

@@ -321,11 +321,11 @@ namespace FlaxEditor.CustomEditors.Editors
             var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
 
             // Deselect
-            if (_value != null && button1Rect.Contains(location))
+            if (_value != null && button1Rect.Contains(ref location))
                 Value = null;
 
             // Picker dropdown menu
-            if (_supportsPickDropDown && (isSelected ? button2Rect : button1Rect).Contains(location))
+            if (_supportsPickDropDown && (isSelected ? button2Rect : button1Rect).Contains(ref location))
             {
                 ShowDropDownMenu();
                 return true;

Source/Editor/CustomEditors/Editors/GenericEditor.cs

@@ -247,7 +247,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <returns>The items.</returns>
         protected virtual List<ItemInfo> GetItemsForType(ScriptType type)
         {
-            return GetItemsForType(type, type.IsClass, true, true);
+            return GetItemsForType(type, type.IsClass, true);
         }
 
         /// <summary>
@@ -273,14 +273,10 @@ namespace FlaxEditor.CustomEditors.Editors
                     var attributes = p.GetAttributes(true);
                     var showInEditor = attributes.Any(x => x is ShowInEditorAttribute);
 
-                    // Skip properties without getter
+                    // Skip properties without getter or setter
                     if (!p.HasGet || (!p.HasSet && !showInEditor && !usePropertiesWithoutSetter))
                         continue;
 
-                    // Skip getter-only properties declared in built-in types
-                    if (!p.HasSet && usePropertiesWithoutSetter && p.Type.DeclaringType.Assembly == typeof(Editor).Assembly)
-                        continue;
-
                     // Skip hidden fields, handle special attributes
                     if ((!p.IsPublic && !showInEditor) || attributes.Any(x => x is HideInEditorAttribute))
                         continue;

Source/Editor/CustomEditors/Editors/InputEditor.cs

@@ -47,6 +47,8 @@ namespace FlaxEditor.CustomEditors.Editors
                 return inputEvent;
             if (Values[0] is string str)
                 return str;
+            if (Values.Type.Type == typeof(InputEvent))
+                return new InputEvent();
             if (Values.Type.Type == typeof(string))
                 return string.Empty;
             return null;

Source/Editor/CustomEditors/Editors/TypeEditor.cs

@@ -219,11 +219,11 @@ namespace FlaxEditor.CustomEditors.Editors
             var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
 
             // Deselect
-            if (_value && button1Rect.Contains(location) && _type == ScriptType.Null)
+            if (_value && button1Rect.Contains(ref location) && _type == ScriptType.Null)
                 Value = ScriptType.Null;
 
             // Picker dropdown menu
-            if ((isSelected && _type == ScriptType.Null ? button2Rect : button1Rect).Contains(location))
+            if ((isSelected && _type == ScriptType.Null ? button2Rect : button1Rect).Contains(ref location))
                 ShowDropDownMenu();
 
             return base.OnMouseUp(location, button);

Source/Editor/CustomEditors/Elements/Container/GroupElement.cs

@@ -44,7 +44,8 @@ namespace FlaxEditor.CustomEditors.Elements
         {
             var style = Style.Current;
             var settingsButtonSize = Panel.HeaderHeight;
-            return new Image
+            Panel.HeaderTextMargin = Panel.HeaderTextMargin with { Right = settingsButtonSize + Utilities.Constants.UIMargin };
+;           return new Image
             {
                 TooltipText = "Settings",
                 AutoFocus = true,

Source/Editor/Editor.cpp

@@ -526,23 +526,6 @@ int32 Editor::LoadProduct()
             return 12;
     }
 
-    // Get the last opened project path
-    String localCachePath;
-    FileSystem::GetSpecialFolderPath(SpecialFolder::AppData, localCachePath);
-    String editorConfigPath = localCachePath / TEXT("Flax");
-    String lastProjectSettingPath = editorConfigPath / TEXT("LastProject.txt");
-    if (!FileSystem::DirectoryExists(editorConfigPath))
-        FileSystem::CreateDirectory(editorConfigPath);
-    String lastProjectPath;
-    if (FileSystem::FileExists(lastProjectSettingPath))
-        File::ReadAllText(lastProjectSettingPath, lastProjectPath);
-    if (!FileSystem::DirectoryExists(lastProjectPath))
-        lastProjectPath = String::Empty;
-
-    // Try to open the last project when requested
-    if (projectPath.IsEmpty() && CommandLine::Options.LastProject.IsTrue() && !lastProjectPath.IsEmpty())
-        projectPath = lastProjectPath;
-
     // Missing project case
     if (projectPath.IsEmpty())
     {
@@ -558,7 +541,7 @@ int32 Editor::LoadProduct()
         Array<String> files;
         if (FileSystem::ShowOpenFileDialog(
             nullptr,
-            lastProjectPath,
+            StringView::Empty,
             TEXT("Project files (*.flaxproj)\0*.flaxproj\0All files (*.*)\0*.*\0"),
             false,
             TEXT("Select project to open in Editor"),
@@ -642,10 +625,6 @@ int32 Editor::LoadProduct()
         }
     }
 
-    // Update the last opened project path
-    if (lastProjectPath.Compare(Project->ProjectFolderPath) != 0)
-        File::WriteAllText(lastProjectSettingPath, Project->ProjectFolderPath, Encoding::UTF8);
-
     return 0;
 }
 

Source/Editor/Editor.cs

@@ -23,6 +23,7 @@ using FlaxEngine.Assertions;
 using FlaxEngine.GUI;
 using FlaxEngine.Interop;
 using FlaxEngine.Json;
+using FlaxEngine.Utilities;
 
 #pragma warning disable CS1591
 
@@ -69,18 +70,18 @@ namespace FlaxEditor
         /// <summary>
         /// Gets a value indicating whether this Editor is running a dev instance of the engine.
         /// </summary>
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsDevInstance")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsDevInstance", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool IsDevInstance();
 
         /// <summary>
         /// Gets a value indicating whether this Editor is running as official build (distributed via Flax services).
         /// </summary>
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsOfficialBuild")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsOfficialBuild", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool IsOfficialBuild();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsPlayMode")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsPlayMode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_IsPlayMode();
 
@@ -1056,7 +1057,7 @@ namespace FlaxEditor
             if (actor)
             {
                 Internal_GetEditorBoxWithChildren(FlaxEngine.Object.GetUnmanagedPtr(actor), out var box);
-                BoundingSphere.FromBox(box, out sphere);
+                BoundingSphere.FromBox(ref box, out sphere);
                 if (sphere == BoundingSphere.Empty)
                     sphere = new BoundingSphere(actor.Position, sphere.Radius);
                 sphere.Radius = Math.Max(sphere.Radius, 15.0f);
@@ -1370,7 +1371,7 @@ namespace FlaxEditor
         public void BuildCSG()
         {
             var scenes = Level.Scenes;
-            scenes.ToList().ForEach(x => x.BuildCSG(0));
+            scenes.ForEach(x => x.BuildCSG(0));
             Scene.MarkSceneEdited(scenes);
         }
 
@@ -1380,7 +1381,7 @@ namespace FlaxEditor
         public void BuildNavMesh()
         {
             var scenes = Level.Scenes;
-            scenes.ToList().ForEach(x => Navigation.BuildNavMesh(x, 0));
+            Navigation.BuildNavMesh();
             Scene.MarkSceneEdited(scenes);
         }
 
@@ -1647,103 +1648,96 @@ namespace FlaxEditor
         }
 
         [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_ReadOutputLogs", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
-        internal static partial int Internal_ReadOutputLogs([MarshalUsing(typeof(FlaxEngine.Interop.NativeArrayMarshaller<string, FlaxEngine.Interop.NativeString>), CountElementName = "outCapacity")] ref string[] outMessages, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U1, SizeParamIndex = 3)] ref byte[] outLogTypes, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.I8, SizeParamIndex = 3)] ref long[] outLogTimes, int outCapacity);
+        internal static partial int Internal_ReadOutputLogs([MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "outCapacity")] ref string[] outMessages, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "outCapacity")] ref byte[] outLogTypes, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "outCapacity")] ref long[] outLogTimes, int outCapacity);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetPlayMode")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetPlayMode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
         internal static partial void Internal_SetPlayMode([MarshalAs(UnmanagedType.U1)] bool value);
 
-        internal static string Internal_GetProjectPath()
-        {
-            Internal_GetProjectPath(out string projectPath);
-            return projectPath;
-        }
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetProjectPath", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
+        internal static partial string Internal_GetProjectPath();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetProjectPath", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
-        internal static partial void Internal_GetProjectPath([MarshalUsing(typeof(FlaxEngine.Interop.StringViewMarshaller))] out string projectPath);
-
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloneAssetFile", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloneAssetFile", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CloneAssetFile(string dstPath, string srcPath, ref Guid dstId);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAudioClipMetadata")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAudioClipMetadata", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_GetAudioClipMetadata(IntPtr obj, out int originalSize, out int importedSize);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SaveJsonAsset", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SaveJsonAsset", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_SaveJsonAsset(string outputPath, string data, string typename);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CopyCache")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CopyCache", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_CopyCache(ref Guid dstId, ref Guid srcId);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_BakeLightmaps")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_BakeLightmaps", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_BakeLightmaps([MarshalAs(UnmanagedType.U1)] bool cancel);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetShaderAssetSourceCode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
-        [return: MarshalUsing(typeof(FlaxEngine.Interop.StringViewMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetShaderAssetSourceCode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial string Internal_GetShaderAssetSourceCode(IntPtr obj);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CookMeshCollision", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CookMeshCollision", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CookMeshCollision(string path, CollisionDataType type, IntPtr model, int modelLodIndex, uint materialSlotsMask, ConvexMeshGenerationFlags convexFlags, int convexVertexLimit);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetCollisionWires")]
-        internal static partial void Internal_GetCollisionWires(IntPtr collisionData, [MarshalUsing(typeof(FlaxEngine.Interop.NativeArrayMarshaller<,>), CountElementName = "trianglesCount")] out Float3[] triangles, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "indicesCount")] out int[] indices, out int trianglesCount, out int indicesCount);
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetCollisionWires", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
+        internal static partial void Internal_GetCollisionWires(IntPtr collisionData, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "trianglesCount")] out Float3[] triangles, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "indicesCount")] out int[] indices, out int trianglesCount, out int indicesCount);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetEditorBoxWithChildren")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetEditorBoxWithChildren", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_GetEditorBoxWithChildren(IntPtr obj, out BoundingBox resultAsRef);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetOptions")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetOptions", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_SetOptions(ref InternalOptions options);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DrawNavMesh")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DrawNavMesh", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_DrawNavMesh();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloseSplashScreen")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloseSplashScreen", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_CloseSplashScreen();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CreateVisualScript", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CreateVisualScript", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CreateVisualScript(string outputPath, string baseTypename);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanImport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanImport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial string Internal_CanImport(string extension);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanExport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanExport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CanExport(string path);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_Export", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_Export", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_Export(string inputPath, string outputFolder);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsEveryAssemblyLoaded")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsEveryAssemblyLoaded", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_GetIsEveryAssemblyLoaded();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetLastProjectOpenedEngineBuild")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetLastProjectOpenedEngineBuild", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial int Internal_GetLastProjectOpenedEngineBuild();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsCSGActive")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsCSGActive", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_GetIsCSGActive();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_RunVisualScriptBreakpointLoopTick")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_RunVisualScriptBreakpointLoopTick", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_RunVisualScriptBreakpointLoopTick(float deltaTime);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DeserializeSceneObject", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DeserializeSceneObject", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_DeserializeSceneObject(IntPtr sceneObject, string json);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_LoadAsset")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_LoadAsset", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_LoadAsset(ref Guid id);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanSetToRoot")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanSetToRoot", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CanSetToRoot(IntPtr prefab, IntPtr newRoot);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAnimationTime")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAnimationTime", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial float Internal_GetAnimationTime(IntPtr animatedModel);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetAnimationTime")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetAnimationTime", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_SetAnimationTime(IntPtr animatedModel, float time);
 
         #endregion

Source/Editor/GUI/AssetPicker.cs

@@ -96,7 +96,7 @@ namespace FlaxEditor.GUI
         private void DoDrag()
         {
             // Do the drag drop operation if has selected element
-            if (new Rectangle(Float2.Zero, Size).Contains(_mouseDownPos))
+            if (new Rectangle(Float2.Zero, Size).Contains(ref _mouseDownPos))
             {
                 if (Validator.SelectedAsset != null)
                     DoDragDrop(DragAssets.GetDragData(Validator.SelectedAsset));

Source/Editor/GUI/ContextMenu/ContextMenu.cs

@@ -502,6 +502,7 @@ namespace FlaxEditor.GUI.ContextMenu
             if (base.OnKeyDown(key))
                 return true;
 
+            // Keyboard navigation around the menu
             switch (key)
             {
             case KeyboardKeys.ArrowDown:
@@ -526,6 +527,20 @@ namespace FlaxEditor.GUI.ContextMenu
                     }
                 }
                 break;
+            case KeyboardKeys.ArrowRight:
+                for (int i = 0; i < _panel.Children.Count; i++)
+                {
+                    if (_panel.Children[i] is ContextMenuChildMenu item && item.Visible && item.IsFocused && !item.ContextMenu.IsOpened)
+                    {
+                        item.ShowChild(this);
+                        item.ContextMenu._panel.Children.FirstOrDefault(x => x is ContextMenuButton && x.Visible)?.Focus();
+                        break;
+                    }
+                }
+                break;
+            case KeyboardKeys.ArrowLeft:
+                ParentCM?.RootWindow.Focus();
+                break;
             }
 
             return false;

Source/Editor/GUI/ContextMenu/ContextMenuBase.cs

@@ -75,6 +75,11 @@ namespace FlaxEditor.GUI.ContextMenu
         /// </summary>
         public bool HasChildCMOpened => _childCM != null;
 
+        /// <summary>
+        /// Gets the parent context menu (if exists).
+        /// </summary>
+        public ContextMenuBase ParentCM => _parentCM;
+
         /// <summary>
         /// Gets the topmost context menu.
         /// </summary>
@@ -84,9 +89,7 @@ namespace FlaxEditor.GUI.ContextMenu
             {
                 var cm = this;
                 while (cm._parentCM != null && cm._isSubMenu)
-                {
                     cm = cm._parentCM;
-                }
                 return cm;
             }
         }
@@ -111,6 +114,11 @@ namespace FlaxEditor.GUI.ContextMenu
         /// </summary>
         public bool UseInput = true;
 
+        /// <summary>
+        /// Optional flag that can disable UI navigation (tab/enter).
+        /// </summary>
+        public bool UseNavigation = true;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ContextMenuBase"/> class.
         /// </summary>
@@ -271,7 +279,7 @@ namespace FlaxEditor.GUI.ContextMenu
                     _window.GotFocus += OnWindowGotFocus;
                     _window.LostFocus += OnWindowLostFocus;
                 }
-                
+
 #if USE_IS_FOREGROUND && USE_SDL_WORKAROUNDS
                 // The focus between popup and parent windows doesn't change, force hide the popup when clicked on parent
                 parentWin.Window.MouseDown += OnWindowMouseDown;
@@ -622,6 +630,21 @@ namespace FlaxEditor.GUI.ContextMenu
             case KeyboardKeys.Escape:
                 Hide();
                 return true;
+            case KeyboardKeys.Return:
+                if (UseNavigation && Root?.FocusedControl != null)
+                {
+                    Root.SubmitFocused();
+                    return true;
+                }
+                break;
+            case KeyboardKeys.Tab:
+                if (UseNavigation && Root != null)
+                {
+                    bool shiftDown = Root.GetKey(KeyboardKeys.Shift);
+                    Root.Navigate(shiftDown ? NavDirection.Previous : NavDirection.Next);
+                    return true;
+                }
+                break;
             }
             return false;
         }

Source/Editor/GUI/ContextMenu/ContextMenuChildMenu.cs

@@ -29,7 +29,7 @@ namespace FlaxEditor.GUI.ContextMenu
             CloseMenuOnClick = false;
         }
 
-        private void ShowChild(ContextMenu parentContextMenu)
+        internal void ShowChild(ContextMenu parentContextMenu)
         {
             // Hide parent CM popups and set itself as child
             var vAlign = parentContextMenu.ItemsAreaMargin.Top;

Source/Editor/GUI/CurveEditor.Contents.cs

@@ -62,7 +62,7 @@ namespace FlaxEditor.GUI
                 for (int i = 0; i < children.Count; i++)
                 {
                     if (children[i] is KeyframePoint p)
-                        p.IsSelected = p.Bounds.Intersects(selectionRect);
+                        p.IsSelected = p.Bounds.Intersects(ref selectionRect);
                 }
                 _editor.UpdateTangents();
             }
@@ -85,7 +85,7 @@ namespace FlaxEditor.GUI
             internal void OnMove(Float2 location)
             {
                 // Skip updating keyframes until move actual starts to be meaningful
-                if (Float2.Distance(_movingSelectionStartPosLock, location) < 1.5f)
+                if (Float2.Distance(ref _movingSelectionStartPosLock, ref location) < 1.5f)
                     return;
                 _movingSelectionStartPosLock = Float2.Minimum;
 
@@ -522,6 +522,16 @@ namespace FlaxEditor.GUI
                             cm.AddButton("Show whole curve", _editor.ShowWholeCurve);
                             cm.AddButton("Reset view", _editor.ResetView);
                         }
+                        cm.AddSeparator();
+                        var presetCm = cm.AddChildMenu("Apply preset");
+                        foreach (var value in Enum.GetValues(typeof(CurvePreset)))
+                        {
+                            CurvePreset preset = (CurvePreset)value;
+                            string name = Utilities.Utils.GetPropertyNameUI(preset.ToString());
+                            var b = presetCm.ContextMenu.AddButton(name, () => _editor.ApplyPreset(preset));
+                            b.Enabled = !(_editor is LinearCurveEditor<T> && (preset != CurvePreset.Constant && preset != CurvePreset.Linear));
+                        }
+                        
                         _editor.OnShowContextMenu(cm, selectionCount);
                         cm.Show(this, location);
                     }
@@ -619,6 +629,33 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <summary>
+        /// A list of avaliable curve presets for the <see cref="CurveEditor{T}"/>.
+        /// </summary>
+        public enum CurvePreset
+        {
+            /// <summary>
+            /// A curve where every point has the same value.
+            /// </summary>
+            Constant,
+            /// <summary>
+            /// A curve linear curve.
+            /// </summary>
+            Linear,
+            /// <summary>
+            /// A curve that starts a slowly and then accelerates until the end.
+            /// </summary>
+            EaseIn,
+            /// <summary>
+            /// A curve that starts a steep and then flattens until the end.
+            /// </summary>
+            EaseOut,
+            /// <summary>
+            /// A combination of the <see cref="CurvePreset.EaseIn"/> and <see cref="CurvePreset.EaseOut"/> preset.
+            /// </summary>
+            Smoothstep
+        }
+
         /// <inheritdoc />
         public override void OnKeyframesDeselect(IKeyframesEditor editor)
         {

Source/Editor/GUI/CurveEditor.cs

@@ -19,6 +19,48 @@ namespace FlaxEditor.GUI
     /// <seealso cref="CurveEditorBase" />
     public abstract partial class CurveEditor<T> : CurveEditorBase where T : new()
     {
+        /// <summary>
+        /// Represents a single point in a <see cref="CurveEditorPreset"/>.
+        /// </summary>
+        protected struct CurvePresetPoint
+        {
+            /// <summary>
+            /// The time.
+            /// </summary>
+            public float Time;
+
+            /// <summary>
+            /// The value.
+            /// </summary>
+            public float Value;
+
+            /// <summary>
+            /// The in tangent. Will be ignored in <see cref="LinearCurveEditor{T}"/>
+            /// </summary>
+            public float TangentIn;
+
+            /// <summary>
+            /// The out tangent. Will be ignored in <see cref="LinearCurveEditor{T}"/>
+            /// </summary>
+            public float TangentOut;
+        }
+
+        /// <summary>
+        /// A curve preset.
+        /// </summary>
+        protected struct CurveEditorPreset()
+        {
+            /// <summary>
+            /// If the tangents will be linear or smooth.
+            /// </summary>
+            public bool LinearTangents;
+
+            /// <summary>
+            /// The points of the preset.
+            /// </summary>
+            public List<CurvePresetPoint> Points;
+        }
+
         private class Popup : ContextMenuBase
         {
             private CustomEditorPresenter _presenter;
@@ -26,11 +68,12 @@ namespace FlaxEditor.GUI
             private List<int> _keyframeIndices;
             private bool _isDirty;
 
-            public Popup(CurveEditor<T> editor, object[] selection, List<int> keyframeIndices = null, float height = 140.0f)
-            : this(editor, height)
+            public Popup(CurveEditor<T> editor, object[] selection, List<int> keyframeIndices = null, float maxHeight = 140.0f)
+            : this(editor, maxHeight)
             {
                 _presenter.Select(selection);
                 _presenter.OpenAllGroups();
+                Size = new Float2(Size.X, Mathf.Min(_presenter.ContainerControl.Size.Y, maxHeight));
                 _keyframeIndices = keyframeIndices;
                 if (keyframeIndices != null && selection.Length != keyframeIndices.Count)
                     throw new Exception();
@@ -169,7 +212,7 @@ namespace FlaxEditor.GUI
                 if (IsSelected)
                     color = Editor.ContainsFocus ? style.SelectionBorder : Color.Lerp(style.ForegroundDisabled, style.SelectionBorder, 0.4f);
                 if (IsMouseOver)
-                    color *= 1.1f;
+                    color *= 1.5f;
                 Render2D.FillRectangle(rect, color);
             }
 
@@ -285,7 +328,7 @@ namespace FlaxEditor.GUI
         /// <summary>
         /// The keyframes size.
         /// </summary>
-        protected static readonly Float2 KeyframesSize = new Float2(7.0f);
+        protected static readonly Float2 KeyframesSize = new Float2(8.0f);
 
         /// <summary>
         /// The colors for the keyframe points.
@@ -326,6 +369,63 @@ namespace FlaxEditor.GUI
         private Color _labelsColor;
         private Font _labelsFont;
 
+        /// <summary>
+        /// Preset values for <see cref="CurvePreset"/> to be applied to a <see cref="CurveEditor{T}"/>.
+        /// </summary>
+        protected Dictionary<CurvePreset, CurveEditorPreset> Presets = new Dictionary<CurvePreset, CurveEditorPreset>
+        {
+            { CurvePreset.Constant, new CurveEditorPreset
+                {
+                    LinearTangents = true,
+                    Points = new List<CurvePresetPoint>
+                    {
+                        new CurvePresetPoint { Time = 0f, Value = 0.5f, TangentIn = 0f, TangentOut = 0f },
+                        new CurvePresetPoint { Time = 1f, Value = 0.5f, TangentIn = 0f, TangentOut = 0f },
+                    }
+                }
+            },
+            { CurvePreset.EaseIn, new CurveEditorPreset
+                {
+                    LinearTangents = false,
+                    Points = new List<CurvePresetPoint>
+                    {
+                        new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 0f },
+                        new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = -1.4f, TangentOut = 0f },
+                    }
+                }
+            },
+            { CurvePreset.EaseOut, new CurveEditorPreset
+                {
+                    LinearTangents = false,
+                    Points = new List<CurvePresetPoint>
+                    {
+                        new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = 0f, TangentOut = 0f },
+                        new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 1.4f },
+                    }
+                }
+            },
+            { CurvePreset.Linear, new CurveEditorPreset
+                {
+                    LinearTangents = true,
+                    Points = new List<CurvePresetPoint>
+                    {
+                        new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 0f },
+                        new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = 0f, TangentOut = 0f },
+                    }
+                }
+            },
+            { CurvePreset.Smoothstep, new CurveEditorPreset
+                {
+                    LinearTangents = false,
+                    Points = new List<CurvePresetPoint>
+                    {
+                        new CurvePresetPoint { Time = 0f, Value = 0f, TangentIn = 0f, TangentOut = 0f },
+                        new CurvePresetPoint { Time = 1f, Value = 1f, TangentIn = 0f, TangentOut = 0f },
+                    }
+                }
+            },
+        };
+
         /// <summary>
         /// The keyframe UI points.
         /// </summary>
@@ -568,6 +668,28 @@ namespace FlaxEditor.GUI
         /// <param name="indicesToRemove">The list of indices of the keyframes to remove.</param>
         protected abstract void RemoveKeyframesInternal(HashSet<int> indicesToRemove);
 
+        /// <summary>
+        /// Tries to convert a float to the type of the type wildcard of the curve editor.
+        /// </summary>
+        /// <param name="value">The float.</param>
+        /// <returns>The converted value.</returns>
+        public static object ConvertCurvePresetValueToCurveEditorType(float value)
+        {
+            if (typeof(T) == typeof(Float2))
+                return new Float2(value);
+            if (typeof(T) == typeof(Float3))
+                return new Float3(value);
+            if (typeof(T) == typeof(Float4))
+                return new Float4(value);
+            if (typeof(T) == typeof(Vector2))
+                return new Vector2(value);
+            if (typeof(T) == typeof(Vector3))
+                return new Vector3(value);
+            if (typeof(T) == typeof(Vector4))
+                return new Vector4(value);
+            return value;
+        }
+
         /// <summary>
         /// Called when showing a context menu. Can be used to add custom buttons with actions.
         /// </summary>
@@ -689,8 +811,8 @@ namespace FlaxEditor.GUI
                 if (selectedOnly && !point.IsSelected)
                     continue;
                 var pos = point.Point;
-                Float2.Min(posMin, pos, out posMin);
-                Float2.Max(posMax, pos, out posMax);
+                Float2.Min(ref posMin, ref pos, out posMin);
+                Float2.Max(ref posMax, ref pos, out posMax);
             }
 
             // Apply margin around the area
@@ -703,16 +825,16 @@ namespace FlaxEditor.GUI
             PointFromKeyframesToContents(ref posMin, ref viewRect);
             PointFromKeyframesToContents(ref posMax, ref viewRect);
             var tmp = posMin;
-            Float2.Min(posMin, posMax, out posMin);
-            Float2.Max(posMax, tmp, out posMax);
+            Float2.Min(ref posMin, ref posMax, out posMin);
+            Float2.Max(ref posMax, ref tmp, out posMax);
             var contentsSize = posMax - posMin;
 
             // Convert from Contents to Main Panel
             posMin = _contents.PointToParent(posMin);
             posMax = _contents.PointToParent(posMax);
             tmp = posMin;
-            Float2.Min(posMin, posMax, out posMin);
-            Float2.Max(posMax, tmp, out posMax);
+            Float2.Min(ref posMin, ref posMax, out posMin);
+            Float2.Max(ref posMax, ref tmp, out posMax);
 
             // Update zoom (leave unchanged when focusing a single point)
             var zoomMask = EnableZoom;
@@ -752,6 +874,17 @@ namespace FlaxEditor.GUI
             ShowCurve(false);
         }
 
+        /// <summary>
+        /// Applies a <see cref="CurvePreset"/> to the curve editor.
+        /// </summary>
+        /// <param name="preset">The preset.</param>
+        public virtual void ApplyPreset(CurvePreset preset)
+        {
+            // Remove existing keyframes
+            SelectAll();
+            RemoveKeyframes();
+        }
+
         /// <inheritdoc />
         public override void Evaluate(out object result, float time, bool loop = false)
         {
@@ -941,7 +1074,7 @@ namespace FlaxEditor.GUI
             {
                 SetupGrid(out var min, out var max, out var pixelRange);
 
-                Render2D.PushClip(viewRect);
+                Render2D.PushClip(ref viewRect);
 
                 if ((ShowAxes & UseMode.Vertical) == UseMode.Vertical)
                     DrawAxis(Float2.UnitX, viewRect, min.X, max.X, pixelRange.X);
@@ -954,7 +1087,7 @@ namespace FlaxEditor.GUI
             // Draw curve
             if (!_showCollapsed)
             {
-                Render2D.PushClip(rect);
+                Render2D.PushClip(ref rect);
                 DrawCurve(ref viewRect);
                 Render2D.PopClip();
             }
@@ -1028,6 +1161,31 @@ namespace FlaxEditor.GUI
                 return true;
             }
 
+            bool left = key == KeyboardKeys.ArrowLeft;
+            bool right = key == KeyboardKeys.ArrowRight;
+            bool up = key == KeyboardKeys.ArrowUp;
+            bool down = key == KeyboardKeys.ArrowDown;
+
+            if (left || right || up || down)
+            {
+                bool shift = Root.GetKey(KeyboardKeys.Shift);
+                bool alt = Root.GetKey(KeyboardKeys.Alt);
+                float deltaValue = 10f;
+                if (shift || alt)
+                    deltaValue = shift ? 2.5f : 5f;
+
+                Float2 moveDelta = Float2.Zero;
+                if (left || right)
+                    moveDelta.X = left ? -deltaValue : deltaValue;
+                if (up || down)
+                    moveDelta.Y = up ? -deltaValue : deltaValue;
+
+                _contents.OnMoveStart(Float2.Zero);
+                _contents.OnMove(moveDelta);
+                _contents.OnMoveEnd(Float2.Zero);
+                return true;
+            }
+
             return false;
         }
 
@@ -1526,6 +1684,22 @@ namespace FlaxEditor.GUI
                 _tangents[i].Visible = false;
         }
 
+        /// <inheritdoc />
+        public override void ApplyPreset(CurvePreset preset)
+        {
+            base.ApplyPreset(preset);
+
+            CurveEditorPreset data = Presets[preset];
+            foreach (var point in data.Points)
+            {
+                float time = point.Time;
+                object value = ConvertCurvePresetValueToCurveEditorType((float)point.Value);
+                AddKeyframe(time, value);
+            }
+
+            ShowWholeCurve();
+        }
+
         /// <inheritdoc />
         protected override void DrawCurve(ref Rectangle viewRect)
         {
@@ -2312,6 +2486,30 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <inheritdoc />
+        public override void ApplyPreset(CurvePreset preset)
+        {
+            base.ApplyPreset(preset);
+
+            CurveEditorPreset data = Presets[preset];
+
+            foreach (var point in data.Points)
+            {
+                float time = point.Time;
+                object value = ConvertCurvePresetValueToCurveEditorType((float)point.Value);
+                object tangentIn = ConvertCurvePresetValueToCurveEditorType((float)point.TangentIn);
+                object tangentOut = ConvertCurvePresetValueToCurveEditorType((float)point.TangentOut);
+
+                AddKeyframe(time, value, tangentIn, tangentOut);
+            }
+
+            SelectAll();
+            if (data.LinearTangents)
+                SetTangentsLinear();
+
+            ShowWholeCurve();
+        }
+
         /// <inheritdoc />
         protected override void SetScaleInternal(ref Float2 scale)
         {

Source/Editor/GUI/Dialogs/ColorPickerDialog.cs

@@ -41,6 +41,7 @@ namespace FlaxEditor.GUI.Dialogs
         private bool _useDynamicEditing;
         private bool _activeEyedropper;
         private bool _canPassLastChangeEvent = true;
+        private bool _linear;
         private ColorValueBox.ColorPickerEvent _onChanged;
         private ColorValueBox.ColorPickerClosedEvent _onClosed;
 
@@ -56,6 +57,7 @@ namespace FlaxEditor.GUI.Dialogs
         private Button _cCancel;
         private Button _cOK;
         private Button _cEyedropper;
+        private Button _cLinearSRGB;
 
         private List<Color> _savedColors = new List<Color>();
         private List<Button> _savedColorButtons = new List<Button>();
@@ -118,6 +120,7 @@ namespace FlaxEditor.GUI.Dialogs
             _value = Color.Transparent;
             _onChanged = colorChanged;
             _onClosed = pickerClosed;
+            _linear = !Graphics.GammaColorSpace;
 
             // Get saved colors if they exist
             if (Editor.Instance.ProjectCache.TryGetCustomData("ColorPickerSavedColors", out string savedColors))
@@ -227,6 +230,25 @@ namespace FlaxEditor.GUI.Dialogs
             _cEyedropper.Width = _cEyedropper.Height;
             _cEyedropper.X -= _cEyedropper.Width;
 
+            // Linear/sRGB toggle button
+            _cLinearSRGB = new Button(_cOK.X - EyedropperMargin, _cHex.Bottom + PickerMargin)
+            {
+                TooltipText = "Toggles between color preview in Linear and sRGB",
+                BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.SplineAligned64),
+                BackgroundColor = _cEyedropper.BackgroundColor,
+                BackgroundColorHighlighted = _cEyedropper.BackgroundColorHighlighted,
+                BorderColor = _linear ? Color.Transparent : style.Foreground,
+                BorderColorHighlighted = _cEyedropper.BorderColorHighlighted,
+                Size = _cEyedropper.Size,
+                Parent = this,
+                Location = _cEyedropper.BottomLeft + new Float2(0, 4),
+            };
+            _cLinearSRGB.Clicked += () =>
+            {
+                _linear = !_linear;
+                _cLinearSRGB.BorderColor = _linear ? Color.Transparent : style.Foreground;
+            };
+
             // Set initial color
             SelectedColor = initialValue;
         }
@@ -281,16 +303,22 @@ namespace FlaxEditor.GUI.Dialogs
             if (_activeEyedropper)
             {
                 _activeEyedropper = false;
-                SelectedColor = colorPicked;
-                ScreenUtilities.PickColorDone -= OnColorPicked;
+                if (colorPicked != Color.Transparent)
+                {
+                    Color color = colorPicked;
+                    if (_linear)
+                        color = color.ToLinear();
+                    SelectedColor = color;
+                }
+                Platform.PickScreenColorDone -= OnColorPicked;
             }
         }
 
         private void OnEyedropStart()
         {
             _activeEyedropper = true;
-            ScreenUtilities.PickColor();
-            ScreenUtilities.PickColorDone += OnColorPicked;
+            Platform.PickScreenColor();
+            Platform.PickScreenColorDone += OnColorPicked;
         }
 
         private void OnRGBAChanged()
@@ -328,9 +356,13 @@ namespace FlaxEditor.GUI.Dialogs
             {
                 // Try reading the color under the cursor in realtime if supported by the platform
                 Float2 mousePosition = Platform.MousePosition;
-                Color color = ScreenUtilities.GetColorAt(mousePosition);
+                Color color = Platform.GetScreenColorAt(mousePosition);
                 if (color != Color.Transparent)
+                {
+                    if (_linear)
+                        color = color.ToLinear();
                     SelectedColor = color;
+                }
             }
         }
 
@@ -391,7 +423,7 @@ namespace FlaxEditor.GUI.Dialogs
                     }
                 }
             }
-            Render2D.FillRectangle(newRect, _value);
+            Render2D.FillRectangle(newRect, _linear ? _value.ToSRgb() : _value);
         }
 
         /// <inheritdoc />
@@ -412,7 +444,7 @@ namespace FlaxEditor.GUI.Dialogs
             {
                 // Cancel eye dropping
                 _activeEyedropper = false;
-                ScreenUtilities.PickColorDone -= OnColorPicked;
+                Platform.PickScreenColorDone -= OnColorPicked;
                 return true;
             }
 

Source/Editor/GUI/Dialogs/ColorSelector.cs

@@ -310,6 +310,26 @@ namespace FlaxEditor.GUI.Dialogs
             Render2D.DrawRectangle(_slider1Rect, _isMouseDownSlider1 ? style.BackgroundSelected : Color.Black);
             Render2D.DrawRectangle(valueR, _isMouseDownSlider1 ? Color.White : Color.Gray);
 
+            // Draw checkerboard pattern to part of the alpha slider background
+            var alphaRect = _slider2Rect;
+            Render2D.FillRectangle(alphaRect, Color.White);
+            var smallRectSize = alphaRect.Width * 0.5f;
+            var numHor = Mathf.CeilToInt(alphaRect.Width / smallRectSize);
+            var numVer = Mathf.CeilToInt(alphaRect.Height / smallRectSize);
+            for (int i = 0; i < numHor; i++)
+            {
+                for (int j = 0; j < numVer; j++)
+                {
+                    if ((i + j) % 2 == 0)
+                    {
+                        var rect = new Rectangle(alphaRect.X + smallRectSize * i, alphaRect.Y + smallRectSize * j, new Float2(smallRectSize));
+                        Render2D.PushClip(alphaRect);
+                        Render2D.FillRectangle(rect, Color.Gray);
+                        Render2D.PopClip();
+                    }
+                }
+            }
+
             // Alpha
             float alphaY = _slider2Rect.Height * (1 - _color.A);
             var alphaR = new Rectangle(_slider2Rect.X - slidersOffset, _slider2Rect.Y + alphaY - slidersThickness / 2, _slider2Rect.Width + slidersOffset * 2, slidersThickness);

Source/Editor/GUI/Docking/DockPanel.cs

@@ -469,7 +469,7 @@ namespace FlaxEditor.GUI.Docking
                     var childPanels = _childPanels.ToArray();
                     if (childPanels.Length != 0)
                     {
-                        // Move tabs from child panels into this one
+                        // Fallback: move tabs from child panels into this one.
                         DockWindow selectedTab = null;
                         foreach (var childPanel in childPanels)
                         {
@@ -490,7 +490,8 @@ namespace FlaxEditor.GUI.Docking
                     {
                         // Unlink splitter
                         var splitterParent = splitter.Parent;
-                        Assert.IsNotNull(splitterParent);
+                        if (splitterParent == null)
+                            return;
                         splitter.Parent = null;
 
                         // Move controls from second split panel to the split panel parent
@@ -507,17 +508,63 @@ namespace FlaxEditor.GUI.Docking
                         splitter.Dispose();
                     }
                 }
+                else if (IsMaster && _childPanels.Count != 0)
+                {
+                    if (TryCollapseSplitter(_tabsProxy?.Parent as Panel))
+                        return;
+                }
                 else if (!IsMaster)
                 {
                     throw new InvalidOperationException();
                 }
             }
+            else if (_childPanels.Count != 0)
+            {
+                if (TryCollapseSplitter(_tabsProxy?.Parent as Panel))
+                    return;
+            }
             else if (!IsMaster)
             {
                 throw new InvalidOperationException();
             }
         }
 
+        internal bool CollapseEmptyTabsProxy()
+        {
+            if (TabsCount == 0 && ChildPanelsCount > 0)
+            {
+                return TryCollapseSplitter(_tabsProxy?.Parent as Panel);
+            }
+            return false;
+        }
+
+        private bool TryCollapseSplitter(Panel removedPanelParent)
+        {
+            if (removedPanelParent == null)
+                return false;
+            if (!(removedPanelParent.Parent is SplitPanel tabsSplitter))
+                return false;
+
+            var splitterParent = tabsSplitter.Parent;
+            if (splitterParent == null)
+                return false;
+            tabsSplitter.Parent = null;
+
+            var scrPanel = removedPanelParent == tabsSplitter.Panel2 ? tabsSplitter.Panel1 : tabsSplitter.Panel2;
+            var srcPanelChildrenCount = scrPanel.ChildrenCount;
+            for (int i = srcPanelChildrenCount - 1; i >= 0 && scrPanel.ChildrenCount > 0; i--)
+            {
+                scrPanel.GetChild(i).Parent = splitterParent;
+            }
+            Assert.IsTrue(scrPanel.ChildrenCount == 0);
+            Assert.IsTrue(splitterParent.ChildrenCount == srcPanelChildrenCount);
+
+            tabsSplitter.Dispose();
+            if (_tabsProxy != null && _tabsProxy.Parent == removedPanelParent)
+                _tabsProxy = null;
+            return true;
+        }
+
         internal virtual void DockWindowInternal(DockState state, DockWindow window, bool autoSelect = true, float? splitterValue = null)
         {
             DockWindow(state, window, autoSelect, splitterValue);

Source/Editor/GUI/Docking/DockPanelProxy.cs

@@ -50,7 +50,7 @@ namespace FlaxEditor.GUI.Docking
         /// The mouse position.
         /// </summary>
         public Float2 MousePosition = Float2.Minimum;
-        
+
         /// <summary>
         /// The mouse position.
         /// </summary>

Source/Editor/GUI/Docking/DockWindow.cs

@@ -193,6 +193,7 @@ namespace FlaxEditor.GUI.Docking
         {
             CreateFloating(Float2.Zero, Float2.Zero);
         }
+
         /// <summary>
         /// Creates the window in a floating state.
         /// </summary>

Source/Editor/GUI/Docking/FloatWindowDockPanel.cs

@@ -14,13 +14,13 @@ namespace FlaxEditor.GUI.Docking
         private class FloatWindowDecorations : WindowDecorations
         {
             private FloatWindowDockPanel _panel;
-            
+
             public FloatWindowDecorations(FloatWindowDockPanel panel)
             : base(panel.RootWindow)
             {
                 _panel = panel;
             }
-            
+
             /// <inheritdoc />
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
@@ -76,19 +76,19 @@ namespace FlaxEditor.GUI.Docking
             Parent = window;
             _window.Window.Closing += OnClosing;
             _window.Window.LeftButtonHit += OnLeftButtonHit;
-            
+
             if (Utilities.Utils.UseCustomWindowDecorations())
             {
                 var decorations = Parent.AddChild(new FloatWindowDecorations(this));
                 decorations.SetAnchorPreset(AnchorPresets.HorizontalStretchTop, false);
             }
         }
-        
+
         /// <inheritdoc />
         protected override void PerformLayoutBeforeChildren()
         {
             base.PerformLayoutBeforeChildren();
-            
+
             var decorations = Parent.GetChild<FloatWindowDecorations>();
             if (decorations != null)
             {
@@ -108,7 +108,11 @@ namespace FlaxEditor.GUI.Docking
                 return;
 
             // Create docking hint window
-            WindowDragHelper.StartDragging(this);
+            Window dragSourceWindow = null;
+#if !PLATFORM_SDL
+            dragSourceWindow = _window?.Window;
+#endif
+            WindowDragHelper.StartDragging(this, dragSourceWindow);
         }
 
         /// <summary>
@@ -127,11 +131,15 @@ namespace FlaxEditor.GUI.Docking
             settings.Title = title;
             settings.Size = size;
             settings.Position = location;
-            settings.MinimumSize = new Float2(200, 150);
+            settings.MinimumSize = new Float2(100, 100);
             settings.MaximumSize = Float2.Zero; // Unlimited size
             settings.Fullscreen = false;
             settings.HasBorder = true;
+#if PLATFORM_SDL
             settings.SupportsTransparency = true;
+#else
+            settings.SupportsTransparency = false;
+#endif
             settings.ActivateWhenFirstShown = true;
             settings.AllowInput = true;
             settings.AllowMinimize = true;
@@ -143,7 +151,7 @@ namespace FlaxEditor.GUI.Docking
             settings.ShowAfterFirstPaint = false;
             settings.ShowInTaskbar = true;
             settings.StartPosition = startPosition;
-            
+
             if (Utilities.Utils.UseCustomWindowDecorations())
             {
                 settings.HasBorder = false;
@@ -213,7 +221,12 @@ namespace FlaxEditor.GUI.Docking
             base.OnSelectedTabChanged();
 
             if (_window != null && SelectedTab != null)
+            {
                 _window.Title = SelectedTab.Title;
+                var decorations = Parent.GetChild<FloatWindowDecorations>();
+                if (decorations != null)
+                    decorations.PerformLayout();
+            }
         }
 
         /// <inheritdoc />

Source/Editor/GUI/Docking/WindowDragHelper.cs

@@ -26,7 +26,7 @@ namespace FlaxEditor.GUI.Docking
         /// <summary>
         /// The hint control size.
         /// </summary>
-        public const float HintControlSize = 32.0f;
+        public const float HintControlSize = 48.0f;
 
         /// <summary>
         /// The opacity of the dragged window when hint controls are shown.
@@ -44,13 +44,33 @@ namespace FlaxEditor.GUI.Docking
             _toMove = toMove;
             _toSet = DockState.Float;
             var window = toMove.Window.Window;
+            var mousePos = Platform.MousePosition;
+
+            // Check if window is maximized and restore window for correct dragging
+            if (window.IsMaximized)
+            {
+                var windowMousePos = mousePos - window.Position;
+                var previousSize = window.Size;
+                window.Restore();
+                window.Position = mousePos - windowMousePos * window.Size / previousSize;
+            }
+
+            // When drag starts from a tabs the window might not be shown yet
+            if (!window.IsVisible)
+            {
+                window.Show();
+                window.Position = mousePos - new Float2(40, 10);
+            }
 
             // Bind events
             FlaxEngine.Scripting.Update += OnUpdate;
             window.MouseUp += OnMouseUp;
-            
+#if !PLATFORM_SDL
+            window.StartTrackingMouse(false);
+#endif
+
             // Update rectangles
-            UpdateRects(Platform.MousePosition);
+            UpdateRects(mousePos);
             
             // Ensure the dragged window stays on top of every other window
             window.IsAlwaysOnTop = true;
@@ -58,13 +78,21 @@ namespace FlaxEditor.GUI.Docking
             _dragSourceWindow = dragSourceWindow;
             if (_dragSourceWindow != null) // Detaching a tab from existing window
             {
+#if PLATFORM_SDL
                 _dragOffset = new Float2(window.Size.X / 2, 10.0f);
-                
-                _dragSourceWindow.MouseUp += OnMouseUp; // The mouse up event is sent to the source window on Windows
+#else
+                _dragOffset = mousePos - window.Position;
+#endif
+
+                // The mouse up event is sent to the source window on Windows
+                _dragSourceWindow.MouseUp += OnMouseUp;
 
                 // TODO: when detaching tab in floating window (not main window), the drag source window is still main window?
                 var dragSourceWindowWayland = toMove.MasterPanel?.RootWindow.Window ?? Editor.Instance.Windows.MainWindow;
                 window.DoDragDrop(window.Title, _dragOffset, dragSourceWindowWayland);
+#if !PLATFORM_SDL
+                _dragSourceWindow.BringToFront();
+#endif
             }
             else
             {
@@ -84,7 +112,12 @@ namespace FlaxEditor.GUI.Docking
             // Unbind events
             FlaxEngine.Scripting.Update -= OnUpdate;
             if (window != null)
+            {
                 window.MouseUp -= OnMouseUp;
+#if !PLATFORM_SDL
+                window.EndTrackingMouse();
+#endif
+            }
             if (_dragSourceWindow != null)
                 _dragSourceWindow.MouseUp -= OnMouseUp;
 
@@ -160,13 +193,14 @@ namespace FlaxEditor.GUI.Docking
         /// Start dragging a floating dock panel.
         /// </summary>
         /// <param name="toMove">Floating dock panel to move.</param>
+        /// <param name="dragSourceWindow">The window where dragging started from.</param>
         /// <returns>The window drag helper object.</returns>
-        public static WindowDragHelper StartDragging(FloatWindowDockPanel toMove)
+        public static WindowDragHelper StartDragging(FloatWindowDockPanel toMove, Window dragSourceWindow = null)
         {
             if (toMove == null)
                 throw new ArgumentNullException();
 
-            return new WindowDragHelper(toMove, null);
+            return new WindowDragHelper(toMove, dragSourceWindow);
         }
 
         /// <summary>
@@ -268,7 +302,8 @@ namespace FlaxEditor.GUI.Docking
                 }
 
                 // Prefer panel in the same window we hit earlier
-                if (dockPanel?.RootWindow != _toDock?.RootWindow)
+                // TODO: this doesn't allow docking window into another floating window over the main window
+                /*if (dockPanel?.RootWindow != _toDock?.RootWindow)
                 {
                     foreach (var hit in hitResults)
                     {
@@ -278,7 +313,7 @@ namespace FlaxEditor.GUI.Docking
                             break;
                         }
                     }
-                }
+                }*/
             }
             
             if (dockPanel != _toDock)
@@ -288,19 +323,29 @@ namespace FlaxEditor.GUI.Docking
                 AddDockHints();
 
                 // Make sure the all the dock hint areas are not under other windows
-                _toDock?.RootWindow.Window.BringToFront();
+                if (_toDock != Editor.Instance.UI.MasterPanel)
+                    _toDock?.RootWindow.Window.BringToFront();
                 //_toDock?.RootWindow.Window.Focus();
 
+#if PLATFORM_SDL
                 // Make the dragged window transparent when dock hints are visible
                 _toMove.Window.Window.Opacity = _toDock == null ? 1.0f : DragWindowOpacity;
+#else
+                // Bring the drop source always to the top
+                if (_dragSourceWindow != null)
+                    _dragSourceWindow.BringToFront();
+#endif
             }
-            
+
             // Check dock state to use
             bool showProxyHints = _toDock != null;
             bool showBorderHints = showProxyHints;
             bool showCenterHint = showProxyHints;
             Control hoveredHintControl = null;
+            Float2 hoveredLocationOffset = Float2.Zero;
             Float2 hoveredSizeOverride = Float2.Zero;
+            DockState prevToSet = _toSet;
+            float hoveredMargin = 1.0f;
             if (showProxyHints)
             {
                 // If moved window has not only tabs but also child panels disable docking as tab
@@ -317,7 +362,7 @@ namespace FlaxEditor.GUI.Docking
                 // Cache dock rectangles
                 var size = _rectDock.Size / Platform.DpiScale;
                 var offset = _toDock.PointFromScreen(_rectDock.Location);
-                var borderMargin = 4.0f;
+                var borderMargin = 10.0f;
                 var hintWindowsSize = HintControlSize;
                 var hintWindowsSize2 = hintWindowsSize * 0.5f;
                 var hintPreviewSize = new Float2(Math.Max(HintControlSize * 2, size.X * 0.5f), Math.Max(HintControlSize * 2, size.Y * 0.5f));
@@ -330,35 +375,40 @@ namespace FlaxEditor.GUI.Docking
                 _rCenter = new Rectangle(centerX - hintWindowsSize2, centerY - hintWindowsSize2, hintWindowsSize, hintWindowsSize) + offset;
 
                 // Hit test, and calculate the approximation for filled area when hovered over the hint
-                DockState toSet = DockState.Float;
+                var toSet = DockState.Float;
+                var hintTestPoint = _toDock.PointFromScreen(_mouse);
                 if (showBorderHints)
                 {
-                    if (_rUpper.Contains(_toDock.PointFromScreen(_mouse)))
+                    if (_rUpper.Contains(ref hintTestPoint))
                     {
                         toSet = DockState.DockTop;
                         hoveredHintControl = _dockHintUp;
-                        hoveredSizeOverride = new Float2(size.X, hintPreviewSize.Y);
+                        hoveredSizeOverride = new Float2(size.X, size.Y * DockPanel.DefaultSplitterValue);
+                        hoveredLocationOffset.Y -= borderMargin - hoveredMargin;
                     }
-                    else if (_rBottom.Contains(_toDock.PointFromScreen(_mouse)))
+                    else if (_rBottom.Contains(ref hintTestPoint))
                     {
                         toSet = DockState.DockBottom;
                         hoveredHintControl = _dockHintDown;
-                        hoveredSizeOverride = new Float2(size.X, hintPreviewSize.Y);
+                        hoveredSizeOverride = new Float2(size.X, size.Y * DockPanel.DefaultSplitterValue);
+                        hoveredLocationOffset.Y += borderMargin - hoveredMargin;
                     }
-                    else if (_rLeft.Contains(_toDock.PointFromScreen(_mouse)))
+                    else if (_rLeft.Contains(ref hintTestPoint))
                     {
                         toSet = DockState.DockLeft;
                         hoveredHintControl = _dockHintLeft;
-                        hoveredSizeOverride = new Float2(hintPreviewSize.X, size.Y);
+                        hoveredSizeOverride = new Float2(size.X * DockPanel.DefaultSplitterValue, size.Y);
+                        hoveredLocationOffset.X -= borderMargin - hoveredMargin;
                     }
-                    else if (_rRight.Contains(_toDock.PointFromScreen(_mouse)))
+                    else if (_rRight.Contains(ref hintTestPoint))
                     {
                         toSet = DockState.DockRight;
                         hoveredHintControl = _dockHintRight;
-                        hoveredSizeOverride = new Float2(hintPreviewSize.X, size.Y);
+                        hoveredSizeOverride = new Float2(size.X * DockPanel.DefaultSplitterValue, size.Y);
+                        hoveredLocationOffset.X += borderMargin - hoveredMargin;
                     }
                 }
-                if (showCenterHint && _rCenter.Contains(_toDock.PointFromScreen(_mouse)))
+                if (showCenterHint && _rCenter.Contains(ref hintTestPoint))
                 {
                     toSet = DockState.DockFill;
                     hoveredHintControl = _dockHintCenter;
@@ -375,38 +425,41 @@ namespace FlaxEditor.GUI.Docking
             // Update sizes and opacity of hint controls
             if (_toDock != null)
             {
+                var mainColor = Style.Current.Selection;
                 if (hoveredHintControl != _dockHintDown)
                 {
                     _dockHintDown.Size = new Float2(HintControlSize);
-                    _dockHintDown.BackgroundColor = Style.Current.Selection.AlphaMultiplied(0.6f);
+                    _dockHintDown.BackgroundColor = mainColor.AlphaMultiplied(0.6f);
                 }
                 if (hoveredHintControl != _dockHintLeft)
                 {
                     _dockHintLeft.Size = new Float2(HintControlSize);
-                    _dockHintLeft.BackgroundColor = Style.Current.Selection.AlphaMultiplied(0.6f);
+                    _dockHintLeft.BackgroundColor = mainColor.AlphaMultiplied(0.6f);
                 }
                 if (hoveredHintControl != _dockHintRight)
                 {
                     _dockHintRight.Size = new Float2(HintControlSize);
-                    _dockHintRight.BackgroundColor = Style.Current.Selection.AlphaMultiplied(0.6f);
+                    _dockHintRight.BackgroundColor = mainColor.AlphaMultiplied(0.6f);
                 }
                 if (hoveredHintControl != _dockHintUp)
                 {
                     _dockHintUp.Size = new Float2(HintControlSize);
-                    _dockHintUp.BackgroundColor = Style.Current.Selection.AlphaMultiplied(0.6f);
+                    _dockHintUp.BackgroundColor = mainColor.AlphaMultiplied(0.6f);
                 }
                 if (hoveredHintControl != _dockHintCenter)
                 {
                     _dockHintCenter.Size = new Float2(HintControlSize);
-                    _dockHintCenter.BackgroundColor = Style.Current.Selection.AlphaMultiplied(0.6f);
+                    _dockHintCenter.BackgroundColor = mainColor.AlphaMultiplied(0.6f);
                 }
 
                 if (_toSet != DockState.Float)
                 {
                     if (hoveredHintControl != null)
                     {
-                        hoveredHintControl.BackgroundColor = Style.Current.Selection.AlphaMultiplied(1.0f);
-                        hoveredHintControl.Size = hoveredSizeOverride;
+                        hoveredHintControl.BackgroundColor = mainColor;
+                        if (_toSet != prevToSet)
+                            hoveredHintControl.Location += hoveredLocationOffset;
+                        hoveredHintControl.Size = hoveredSizeOverride - hoveredMargin;
                     }
                 }
             }
@@ -441,18 +494,21 @@ namespace FlaxEditor.GUI.Docking
 
         private void OnUpdate()
         {
+            // If the engine lost focus during dragging, end the action
+            if (!Engine.HasFocus)
+            {
+                Dispose();
+                return;
+            }
+
             var mousePos = Platform.MousePosition;
-
             if (_mouse != mousePos)
-                OnMouseMove(mousePos);
-        }
-        
-        private void OnMouseMove(Float2 mousePos)
-        {
-            if (_dragSourceWindow != null)
-                _toMove.Window.Window.Position = mousePos - _dragOffset;
+            {
+                if (_dragSourceWindow != null)
+                    _toMove.Window.Window.Position = mousePos - _dragOffset;
 
-            UpdateRects(mousePos);
+                UpdateRects(mousePos);
+            }
         }
     }
 }

Source/Editor/GUI/EnumComboBox.cs

@@ -242,6 +242,15 @@ namespace FlaxEditor.GUI
         {
             FieldInfo[] fields = type.GetFields();
             entries.Capacity = Mathf.Max(fields.Length - 1, entries.Capacity);
+            if (formatMode == EnumDisplayAttribute.FormatMode.Default)
+            {
+                // Override display mode from enum itself
+                var attr = type.GetCustomAttribute<EnumDisplayAttribute>();
+                if (attr != null)
+                {
+                    formatMode = attr.Mode;
+                }
+            }
             for (int i = 0; i < fields.Length; i++)
             {
                 var field = fields[i];

Source/Editor/GUI/Input/ColorValueBox.cs

@@ -15,6 +15,7 @@ namespace FlaxEditor.GUI.Input
     public class ColorValueBox : Control
     {
         private bool _isMouseDown;
+        private bool _linear;
 
         /// <summary>
         /// Delegate function used for the color picker events handling.
@@ -101,6 +102,7 @@ namespace FlaxEditor.GUI.Input
         public ColorValueBox()
         : base(0, 0, 32, 18)
         {
+            _linear = !Graphics.GammaColorSpace;
         }
 
         /// <summary>
@@ -113,6 +115,7 @@ namespace FlaxEditor.GUI.Input
         : base(x, y, 32, 18)
         {
             _value = value;
+            _linear = !Graphics.GammaColorSpace;
         }
 
         /// <summary>
@@ -129,8 +132,10 @@ namespace FlaxEditor.GUI.Input
         {
             base.Draw();
 
-            bool isTransparent = _value.A < 1;
-
+            var value = _value;
+            if (_linear)
+                value = value.ToSRgb();
+            var isTransparent = value.A < 1;
             var style = Style.Current;
             var fullRect = new Rectangle(0, 0, Width, Height);
             var colorRect = new Rectangle(0, 0, isTransparent ? Width * 0.7f : Width, Height);
@@ -157,10 +162,10 @@ namespace FlaxEditor.GUI.Input
                         }
                     }
                 }
-                Render2D.FillRectangle(alphaRect, _value);
+                Render2D.FillRectangle(alphaRect, value);
             }
 
-            Render2D.FillRectangle(colorRect, _value with { A = 1 });
+            Render2D.FillRectangle(colorRect, value with { A = 1 });
             Render2D.DrawRectangle(fullRect, IsMouseOver || IsNavFocused ? style.BackgroundSelected : Color.Black);
         }
 

Source/Editor/GUI/Input/SliderControl.cs

@@ -180,7 +180,7 @@ namespace FlaxEditor.GUI.Input
                     Focus();
                     float mousePosition = location.X;
 
-                    if (_thumbRect.Contains(location))
+                    if (_thumbRect.Contains(ref location))
                     {
                         // Start sliding
                         _isSliding = true;

Source/Editor/GUI/Input/ValueBox.cs

@@ -99,6 +99,11 @@ namespace FlaxEditor.GUI.Input
         /// </summary>
         public event Action SlidingEnd;
 
+        /// <summary>
+        /// If enabled, pressing the arrow up or down key increments/ decrements the value.
+        /// </summary>
+        public bool ArrowKeysIncrement = true;
+
         /// <summary>
         /// Gets or sets the slider speed. Use value 0 to disable and hide slider UI.
         /// </summary>
@@ -239,6 +244,27 @@ namespace FlaxEditor.GUI.Input
             ResetViewOffset();
         }
 
+        /// <inheritdoc />
+        public override bool OnKeyDown(KeyboardKeys key)
+        {
+            if (ArrowKeysIncrement && (key == KeyboardKeys.ArrowUp || key == KeyboardKeys.ArrowDown))
+            {
+                bool altDown = Root.GetKey(KeyboardKeys.Alt);
+                bool shiftDown = Root.GetKey(KeyboardKeys.Shift);
+                bool controlDown = Root.GetKey(KeyboardKeys.Control);
+                float deltaValue = altDown ? 0.1f : (shiftDown ? 10f : (controlDown ? 100f : 1f));
+                float slideDelta = key == KeyboardKeys.ArrowUp ? deltaValue : -deltaValue;
+
+                _startSlideValue = Value;
+                ApplySliding(slideDelta);
+                EndSliding();
+                Focus();
+                return true;
+            }
+
+            return base.OnKeyDown(key);
+        }
+
         /// <inheritdoc />
         public override bool OnMouseDown(Float2 location, MouseButton button)
         {
@@ -296,7 +322,7 @@ namespace FlaxEditor.GUI.Input
 #else
 
         /// <inheritdoc />
-        public override void OnMouseMoveRelative(Float2 mouseMotion)
+        public override void OnMouseMoveRelative(Float2 motion)
         {
             var location = Root.TrackingMouseOffset;
             if (_isSliding)
@@ -318,7 +344,7 @@ namespace FlaxEditor.GUI.Input
                 _cursorChanged = false;
             }
 
-            base.OnMouseMoveRelative(mouseMotion);
+            base.OnMouseMoveRelative(motion);
         }
 
 #endif

Source/Editor/GUI/ItemsListContextMenu.cs

@@ -59,12 +59,12 @@ namespace FlaxEditor.GUI
             /// <summary>
             /// Occurs when items gets clicked by the user.
             /// </summary>
-            public event Action<Item> Clicked;
+            public event Action<Item> ItemClicked;
 
             /// <summary>
             /// Occurs when items gets focused.
             /// </summary>
-            public event Action<Item> Focused;
+            public event Action<Item> ItemFocused;
 
             /// <summary>
             /// The tint color of the text.
@@ -203,7 +203,7 @@ namespace FlaxEditor.GUI
                 if (button == MouseButton.Left && _isMouseDown)
                 {
                     _isMouseDown = false;
-                    Clicked?.Invoke(this);
+                    ItemClicked?.Invoke(this);
                 }
 
                 return base.OnMouseUp(location, button);
@@ -222,7 +222,7 @@ namespace FlaxEditor.GUI
             {
                 base.OnGotFocus();
 
-                Focused?.Invoke(this);
+                ItemFocused?.Invoke(this);
             }
 
             /// <inheritdoc />
@@ -434,7 +434,7 @@ namespace FlaxEditor.GUI
         /// <param name="item">The item.</param>
         public void AddItem(Item item)
         {
-            item.Clicked += OnClickItem;
+            item.ItemClicked += OnClickItem;
             ContainerControl parent = ItemsPanel;
             if (!string.IsNullOrEmpty(item.Category))
             {

Source/Editor/GUI/Timeline/EditCurveTrackGizmo.cs

@@ -144,7 +144,7 @@ namespace FlaxEditor.GUI.Timeline
                 var k = keyframes[i];
 
                 var sphere = new BoundingSphere(k.Value, KeyframeSize);
-                if (sphere.Intersects(selectRay))
+                if (sphere.Intersects(ref selectRay))
                 {
                     SelectKeyframe(_track, i, 0);
                     return;
@@ -154,7 +154,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     var t = k.Value + k.TangentIn;
                     var box = BoundingBox.FromSphere(new BoundingSphere(t, TangentSize));
-                    if (box.Intersects(selectRay))
+                    if (box.Intersects(ref selectRay))
                     {
                         SelectKeyframe(_track, i, 1);
                         return;
@@ -165,7 +165,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     var t = k.Value + k.TangentOut;
                     var box = BoundingBox.FromSphere(new BoundingSphere(t, TangentSize));
-                    if (box.Intersects(selectRay))
+                    if (box.Intersects(ref selectRay))
                     {
                         SelectKeyframe(_track, i, 2);
                         return;

Source/Editor/GUI/Timeline/GUI/GradientEditor.cs

@@ -115,7 +115,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
             /// <inheritdoc />
             public override void OnMouseMove(Float2 location)
             {
-                if (_isMoving && Float2.DistanceSquared(location, _startMovePos) > 25.0f)
+                if (_isMoving && Float2.DistanceSquared(ref location, ref _startMovePos) > 25.0f)
                 {
                     _startMovePos = Float2.Minimum;
                     var x = PointToParent(location).X;
@@ -387,7 +387,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
         {
             // Push clipping mask
             GetDesireClientArea(out var clientArea);
-            Render2D.PushClip(clientArea);
+            Render2D.PushClip(ref clientArea);
 
             var style = Style.Current;
             var bounds = new Rectangle(Float2.Zero, Size);

Source/Editor/GUI/Timeline/GUI/KeyframesEditor.cs

@@ -115,7 +115,7 @@ namespace FlaxEditor.GUI
                 {
                     if (Children[i] is KeyframePoint p)
                     {
-                        p.IsSelected = p.Bounds.Intersects(selectionRect);
+                        p.IsSelected = p.Bounds.Intersects(ref selectionRect);
                     }
                 }
             }
@@ -401,7 +401,7 @@ namespace FlaxEditor.GUI
                     Cursor = CursorType.Default;
 
                     // Check if no move has been made at all
-                    if (Float2.Distance(location, _rightMouseDownPos) < 2.0f)
+                    if (Float2.Distance(ref location, ref _rightMouseDownPos) < 2.0f)
                     {
                         var selectionCount = _editor.SelectionCount;
                         var point = GetChildAt(location) as KeyframePoint;

Source/Editor/GUI/Timeline/GUI/PositionHandle.cs

@@ -50,14 +50,14 @@ namespace FlaxEditor.GUI.Timeline.GUI
             var color = (_timeline.IsMovingPositionHandle ? style.SelectionBorder : style.Foreground).AlphaMultiplied(0.6f);
             Matrix3x3.RotationZ(Mathf.PiOverTwo, out var m1);
             var m2 = Matrix3x3.Translation2D(0, timeAxisHeaderOffset);
-            Matrix3x3.Multiply(m1, m2, out var m3);
-            Render2D.PushTransform(m3);
+            Matrix3x3.Multiply(ref m1, ref m2, out var m3);
+            Render2D.PushTransform(ref m3);
             // TODO: Convert to its own sprite or 9 slice
             Render2D.DrawSprite(icon, new Rectangle(new Float2(10, -icon.Size.X * 0.5f - 1), Size + new Float2(0, 1)), color);
             Render2D.FillRectangle(new Rectangle(new Float2(-6, -icon.Size.Y * 0.5f + 7), new Float2(timeAxisOverlap, 5)), color);
             Render2D.PopTransform();
             var textMatrix = Matrix3x3.Translation2D(12, timeAxisHeaderOffset);
-            Render2D.PushTransform(textMatrix);
+            Render2D.PushTransform(ref textMatrix);
             Render2D.DrawText(style.FontSmall, labelText, style.Foreground, new Float2(2, -6));
             Render2D.PopTransform();
 

Source/Editor/GUI/Timeline/Media.cs

@@ -356,7 +356,7 @@ namespace FlaxEditor.GUI.Timeline
             {
                 Render2D.DrawLine(bounds.UpperLeft, bounds.BottomLeft, moveColor, moveThickness);
             }
-            else if (IsMouseOver && CanResize && MoveLeftEdgeRect.Contains(_mouseLocation))
+            else if (IsMouseOver && CanResize && MoveLeftEdgeRect.Contains(ref _mouseLocation))
             {
                 Render2D.DrawLine(bounds.UpperLeft, bounds.BottomLeft, Color.Yellow);
             }
@@ -364,7 +364,7 @@ namespace FlaxEditor.GUI.Timeline
             {
                 Render2D.DrawLine(bounds.UpperRight, bounds.BottomRight, moveColor, moveThickness);
             }
-            else if (IsMouseOver && CanResize && MoveRightEdgeRect.Contains(_mouseLocation))
+            else if (IsMouseOver && CanResize && MoveRightEdgeRect.Contains(ref _mouseLocation))
             {
                 Render2D.DrawLine(bounds.UpperRight, bounds.BottomRight, Color.Yellow);
             }
@@ -384,8 +384,8 @@ namespace FlaxEditor.GUI.Timeline
                 _startMoveLocation = Root.MousePosition;
                 _startMoveStartFrame = StartFrame;
                 _startMoveDuration = DurationFrames;
-                _startMoveLeftEdge = MoveLeftEdgeRect.Contains(location) && CanResize;
-                _startMoveRightEdge = MoveRightEdgeRect.Contains(location) && CanResize;
+                _startMoveLeftEdge = MoveLeftEdgeRect.Contains(ref location) && CanResize;
+                _startMoveRightEdge = MoveRightEdgeRect.Contains(ref location) && CanResize;
                 StartMouseCapture(true);
                 if (_startMoveLeftEdge || _startMoveRightEdge)
                     return true;