2304-V100-KryptonForm-border-issues

- PaletteBorder.Rounding adapts return value to the border state.
- CommonHelper.GetWindowBorders reverted to the V85 version.

Author: giduac

Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs

@@ -516,7 +516,7 @@ internal void SendSysCommand(PI.SC_ sysCommand, IntPtr lParam) =>
     [Browsable(false)]
     [EditorBrowsable(EditorBrowsableState.Never)]
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-    public Padding RealWindowBorders => CommonHelper.GetWindowBorders(CreateParams, this as KryptonForm);
+    public Padding RealWindowBorders => CommonHelper.GetWindowBorders(CreateParams);
 
     /// <summary>
     /// Gets a count of the number of paints that have occurred.
@@ -678,8 +678,7 @@ protected Point ScreenToWindow(Point screenPt)
     /// </summary>
     /// <param name="invalidRect">Area to invalidate.</param>
     /// <param name="excludeClientArea">Should client area be excluded.</param>
-    protected void InvalidateNonClient(Rectangle invalidRect,
-        bool excludeClientArea)
+    protected void InvalidateNonClient(Rectangle invalidRect, bool excludeClientArea)
     {
         if (IsDisposed || Disposing || !IsHandleCreated)
         {
@@ -692,7 +691,7 @@ protected void InvalidateNonClient(Rectangle invalidRect,
             {
                 Padding realWindowBorders = RealWindowBorders;
                 Rectangle realWindowRectangle = RealWindowRectangle;
-
+                
                 invalidRect = realWindowRectangle with
                 {
                     X = -realWindowBorders.Left,
@@ -744,7 +743,7 @@ protected Rectangle RealWindowRectangle
             // Create rectangle that encloses the entire window
             return new Rectangle(0, 0,
                 windowRect.right - windowRect.left,
-                windowRect.bottom - windowRect.top);
+               windowRect.bottom - windowRect.top);
         }
     }
     #endregion
@@ -998,7 +997,6 @@ protected virtual void OnNeedPaint(object? sender, [DisallowNull] NeedLayoutEven
         {
             NeedLayout = true;
         }
-
         InvalidateNonClient();
     }
 
@@ -1488,7 +1486,6 @@ protected virtual void OnNonClientPaint(IntPtr hWnd)
     {
         // Create rectangle that encloses the entire window
         Rectangle windowBounds = RealWindowRectangle;
-
         // We can only draw a window that has some size
         if (windowBounds is { Width: > 0, Height: > 0 })
         {

Source/Krypton Components/Krypton.Toolkit/General/CommonHelper.cs

@@ -1226,49 +1226,62 @@ public static void RemoveControlFromParent([DisallowNull] Control? c)
         }
     }
 
+
+    public static Padding GetWindowBorders(CreateParams createParams)
+    {
+        var rect = new PI.RECT
+        {
+            // Start with a zero sized rectangle
+            left = 0,
+            right = 0,
+            top = 0,
+            bottom = 0
+        };
+
+        // Adjust rectangle to add on the borders required
+        PI.AdjustWindowRectEx(ref rect, (uint)createParams.Style, false, createParams.ExStyle);
+
+        // Return the per side border values
+        return new Padding(-rect.left, -rect.top, rect.right, rect.bottom);
+    }
+
     /// <summary>
     /// Gets the size of the borders requested by the real window.
     /// </summary>
-    /// <param name="cp">Window style parameters.</param>
+    /// <param name="createParams">Window style parameters.</param>
     /// <param name="form">Optional VisualForm base to detect usage of Chrome drawing</param>
     /// <returns>Border sizing.</returns>
-    public static Padding GetWindowBorders(CreateParams cp, KryptonForm form)
+    public static Padding GetWindowBorders2(CreateParams createParams, KryptonForm form)
     {
-        int xOffset = 0;
-        int yOffset = 0;
-        uint dwStyle = (uint)cp.Style;
-        bool useAdjust = false;
-        
-        if (form.StateCommon is {Border: PaletteFormBorder formBorder })
+        if (form.StateCommon?.Border is PaletteFormBorder formBorder)
         {
-            useAdjust = true;
+            int xOffset = 0;
+            int yOffset = 0;
+
             var (xOffset1, yOffset1) = formBorder.BorderWidths(form.FormBorderStyle);
 
             xOffset = Math.Max(0, xOffset1);
             yOffset = Math.Max(0, yOffset1);
-        }
 
-        var rect = new PI.RECT
-        {
-            // Start with a zero sized rectangle
-            top = -yOffset,
-            bottom = yOffset
-        };
+            var rect = new PI.RECT
+            {
+                // Start with a zero sized rectangle
+                top = -yOffset,
+                bottom = yOffset
+            };
 
-        if (useAdjust)
-        {
             // Adjust rectangle to add on the borders required
-            PI.AdjustWindowRectEx(ref rect, dwStyle, false, cp.ExStyle);
-            PaletteBase? resolvedPalette = form.GetResolvedPalette();
-            if (resolvedPalette == null)
+            PI.AdjustWindowRectEx(ref rect, (uint)createParams.Style, false, createParams.ExStyle);
+
+            if (form.GetResolvedPalette() is null)
             {
                 // Need to breakout when the form is closing
                 return new Padding(-rect.left, -rect.top, rect.right, rect.bottom);
             }
 
-            if (!CommonHelper.IsFormMaximized(form))
+            if (!CommonHelper.IsFormMaximized(form) && form.StateCommon.Border.Width > 0)
             {
-                switch (form.StateCommon!.Border.GetBorderDrawBorders(PaletteState.Normal))
+                switch (formBorder.GetBorderDrawBorders(PaletteState.Normal))
                 {
                     case PaletteDrawBorders.None:
                         rect.left = 0;
@@ -1316,17 +1329,22 @@ public static Padding GetWindowBorders(CreateParams cp, KryptonForm form)
             else if (form.IsMdiChild)
             {
                 rect.top = 0;
+                rect.left = 0;
+                rect.right = 0;
                 rect.bottom = 0;
             }
             else
             {
                 rect.bottom -= yOffset;
                 rect.top -= rect.bottom;
             }
-        }
 
-        // Return the per side border values
-        return new Padding(-rect.left, -rect.top, rect.right, rect.bottom);
+            return new Padding(-rect.left, -rect.top, rect.right, rect.bottom);
+        }
+        else
+        {
+            throw new NullReferenceException("form.StateCommon cannot be null.");
+        }
     }
 
     /// <summary>

Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs

@@ -594,7 +594,19 @@ public virtual int Width
     /// </summary>
     /// <param name="state">Palette value should be applicable to this state.</param>
     /// <returns>Border width.</returns>
-    public int GetBorderWidth(PaletteState state) => Width != -1 ? Width : _inherit.GetBorderWidth(state);
+    //public int GetBorderWidth(PaletteState state) => Width != -1 ? Width : _inherit.GetBorderWidth(state);
+    public int GetBorderWidth(PaletteState state)
+    {
+        if (Width > 0)
+        {
+            return Width;
+        }
+        else
+        {
+            int width = _inherit.GetBorderWidth(state);
+            return width > 0 ? width : 0;
+        }
+    }
     #endregion
 
     #region Rounding
@@ -608,7 +620,18 @@ public virtual int Width
     [RefreshProperties(RefreshProperties.All)]
     public float Rounding
     {
-        get => _storage?.BorderRounding ?? GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE;
+        get
+        {
+            if (_storage is not null
+                && _storage.BorderRounding > 0
+                && Draw != InheritBool.False 
+                && DrawBorders != PaletteDrawBorders.None)
+            {
+                return _storage.BorderRounding;
+            }
+
+            return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE;
+        }
 
         set
         {