Fix merge issue in ToolStripRenderer (Sizing Grip).

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/StatusStrip.cs

@@ -21,6 +21,8 @@ public partial class StatusStrip : ToolStrip
     private static readonly int s_stateCalledSpringTableLayout = BitVector32.CreateMask(s_stateSizingGrip);
 
     private const int GripWidth = 12;
+    private const int GripHeight = 22;
+
     private RightToLeftLayoutGrip? _rtlLayoutGrip;
     private Orientation _lastOrientation = Orientation.Horizontal;
 
@@ -70,14 +72,7 @@ protected override Padding DefaultPadding
         {
             if (Orientation == Orientation.Horizontal)
             {
-                if (RightToLeft == RightToLeft.No)
-                {
-                    return new Padding(1, 0, 14, 0);
-                }
-                else
-                {
-                    return new Padding(14, 0, 1, 0);
-                }
+                return RightToLeft == RightToLeft.No ? new Padding(1, 0, 14, 0) : new Padding(14, 0, 1, 0);
             }
             else
             {
@@ -201,24 +196,30 @@ public Rectangle SizeGripBounds
     {
         get
         {
-            if (SizingGrip)
+            if (!SizingGrip)
             {
-                Size statusStripSize = Size;
-                // we can't necessarily make this the height of the status strip, as
-                // the orientation could change.
-                int gripHeight = Math.Min(DefaultSize.Height, statusStripSize.Height);
-
-                if (RightToLeft == RightToLeft.Yes)
-                {
-                    return new Rectangle(0, statusStripSize.Height - gripHeight, GripWidth, gripHeight);
-                }
-                else
-                {
-                    return new Rectangle(statusStripSize.Width - GripWidth, statusStripSize.Height - gripHeight, GripWidth, gripHeight);
-                }
+                return Rectangle.Empty;
             }
 
-            return Rectangle.Empty;
+            Size statusStripSize = Size;
+            Rectangle clientRect = ClientRectangle;
+
+            int scaledGripHeight = ScaleHelper.ScaleToDpi(GripHeight, DeviceDpi);
+            int scaleGripWidth = ScaleHelper.ScaleToDpi(GripWidth, DeviceDpi);
+
+            scaledGripHeight = Math.Min(scaledGripHeight, clientRect.Height);
+
+            return RightToLeft == RightToLeft.Yes
+                ? new Rectangle(
+                    x: 0,
+                    y: statusStripSize.Height - scaledGripHeight,
+                    width: scaleGripWidth,
+                    height: scaledGripHeight)
+                : new Rectangle(
+                    x: statusStripSize.Width - scaleGripWidth,
+                    y: statusStripSize.Height - scaledGripHeight,
+                    width: scaleGripWidth,
+                    height: scaledGripHeight);
         }
     }
 
@@ -303,14 +304,9 @@ internal override Size GetPreferredSizeCore(Size proposedSize)
                 proposedSize.Height = int.MaxValue;
             }
 
-            if (Orientation == Orientation.Horizontal)
-            {
-                return GetPreferredSizeHorizontal(this, proposedSize) + Padding.Size;
-            }
-            else
-            {
-                return GetPreferredSizeVertical(this) + Padding.Size;
-            }
+            return Orientation == Orientation.Horizontal
+                ? GetPreferredSizeHorizontal(this, proposedSize) + Padding.Size
+                : GetPreferredSizeVertical(this) + Padding.Size;
         }
 
         return base.GetPreferredSizeCore(proposedSize);
@@ -584,15 +580,9 @@ protected override void WndProc(ref Message m)
                     PInvokeCore.GetClientRect(rootHwnd, out RECT rootHwndClientArea);
 
                     // map the size grip FROM statusStrip coords TO the toplevel window coords.
-                    Point gripLocation;
-                    if (RightToLeft == RightToLeft.Yes)
-                    {
-                        gripLocation = new Point(SizeGripBounds.Left, SizeGripBounds.Bottom);
-                    }
-                    else
-                    {
-                        gripLocation = new Point(SizeGripBounds.Right, SizeGripBounds.Bottom);
-                    }
+                    Point gripLocation = RightToLeft == RightToLeft.Yes
+                        ? new Point(SizeGripBounds.Left, SizeGripBounds.Bottom)
+                        : new Point(SizeGripBounds.Right, SizeGripBounds.Bottom);
 
                     PInvokeCore.MapWindowPoints(this, rootHwnd, ref gripLocation);
 

src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripRenderer.cs

@@ -1056,11 +1056,11 @@ private protected static void OnRenderStatusStripSizingGrip(
         ReadOnlySpan<Rectangle> baseRectangles = s_baseSizeGripRectangles;
 
         // Reference height for sizing grips at 96 DPI (standard sizing)
-        const int DefaultGripAreaHeight = 20;
+        int scaledDefaultGripAreaHeight = ScaleHelper.ScaleToDpi(20, e.ToolStrip.DeviceDpi);
 
         // Calculate scaling based on the almost half of the current height
         // of the status strip's sizing grip area
-        float heightScale = 0.6f * ((float)sizeGripBounds.Height / DefaultGripAreaHeight);
+        float heightScale = ((float)sizeGripBounds.Height / scaledDefaultGripAreaHeight);
 
         // Save the current graphics state before transformations
         GraphicsState originalState = g.Save();
@@ -1078,11 +1078,15 @@ private protected static void OnRenderStatusStripSizingGrip(
             // Set up the transform to scale from the bottom corner
             if (isRtl)
             {
-                g.TranslateTransform(sizeGripBounds.Left + cornerOffset, sizeGripBounds.Bottom - cornerOffset);
+                g.TranslateTransform(
+                    sizeGripBounds.Left + cornerOffset,
+                    sizeGripBounds.Bottom - cornerOffset);
             }
             else
             {
-                g.TranslateTransform(sizeGripBounds.Right - cornerOffset, sizeGripBounds.Bottom - cornerOffset);
+                g.TranslateTransform(
+                    sizeGripBounds.Right - cornerOffset,
+                    sizeGripBounds.Bottom - cornerOffset);
             }
 
             // Apply scaling