From 56a8bb777b105a219f4c4656a2d72031849f0e54 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 16 Mar 2025 11:38:17 +0100
Subject: [PATCH] Fix rubber band drawing to respect DPI scale (eg. on macOS)

---
 .../Gizmo/ViewportRubberBandSelector.cs       | 27 +++++--------------
 .../Viewport/MainEditorGizmoViewport.cs       | 14 +++++++---
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/Source/Editor/Gizmo/ViewportRubberBandSelector.cs b/Source/Editor/Gizmo/ViewportRubberBandSelector.cs
index 0381c6535..735ae03a3 100644
--- a/Source/Editor/Gizmo/ViewportRubberBandSelector.cs
+++ b/Source/Editor/Gizmo/ViewportRubberBandSelector.cs
@@ -11,7 +11,7 @@ namespace FlaxEngine.Gizmo;
 /// <summary>
 /// Class for adding viewport rubber band selection.
 /// </summary>
-public class ViewportRubberBandSelector
+public sealed class ViewportRubberBandSelector
 {
     private bool _isMosueCaptured;
     private bool _isRubberBandSpanning;
@@ -232,30 +232,15 @@ public class ViewportRubberBandSelector
     }
 
     /// <summary>
-    /// Used to draw the rubber band. Begins render 2D.
+    /// Draws the ruber band during owner viewport UI drawing.
     /// </summary>
-    /// <param name="context">The GPU Context.</param>
-    /// <param name="target">The GPU texture target.</param>
-    /// <param name="targetDepth">The GPU texture target depth.</param>
-    public void Draw(GPUContext context, GPUTexture target, GPUTexture targetDepth)
-    {
-        // Draw RubberBand for rect selection
-        if (!_isRubberBandSpanning)
-            return;
-        Render2D.Begin(context, target, targetDepth);
-        Draw2D();
-        Render2D.End();
-    }
-
-    /// <summary>
-    /// Used to draw the rubber band. Use if already rendering 2D context.
-    /// </summary>
-    public void Draw2D()
+    public void Draw()
     {
         if (!_isRubberBandSpanning)
             return;
-        Render2D.FillRectangle(_rubberBandRect, Style.Current.Selection);
-        Render2D.DrawRectangle(_rubberBandRect, Style.Current.SelectionBorder);
+        var style = Style.Current;
+        Render2D.FillRectangle(_rubberBandRect, style.Selection);
+        Render2D.DrawRectangle(_rubberBandRect, style.SelectionBorder);
     }
 
     /// <summary>
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 943bb6e3c..ddf058e58 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -375,10 +375,7 @@ namespace FlaxEditor.Viewport
             {
                 Gizmos[i].Draw(ref renderContext);
             }
-            
-            // Draw RubberBand for rect selection
-            _rubberBandSelector.Draw(context, target, targetDepth);
-            
+
             // Draw selected objects debug shapes and visuals
             if (DrawDebugDraw && (renderContext.View.Flags & ViewFlags.DebugDraw) == ViewFlags.DebugDraw)
             {
@@ -594,6 +591,15 @@ namespace FlaxEditor.Viewport
             }
         }
 
+        /// <inheritdoc />
+        public override void Draw()
+        {
+            base.Draw();
+
+            // Draw rubber band for rectangle selection
+            _rubberBandSelector.Draw();
+        }
+
         /// <inheritdoc />
         protected override void OrientViewport(ref Quaternion orientation)
         {