Krypton-Suite
diff --git a/‎Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTaskDialog/Elements/KryptonTaskDialogElementBase.cs‎
Lines changed: 8 additions & 106 deletions b/‎Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTaskDialog/Elements/KryptonTaskDialogElementBase.cs‎
Lines changed: 8 additions & 106 deletions
diff --git a/‎Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTaskDialog/Elements/KryptonTaskDialogElementComboBox.cs‎
Lines changed: 11 additions & 1 deletion b/‎Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTaskDialog/Elements/KryptonTaskDialogElementComboBox.cs‎
Lines changed: 11 additions & 1 deletion
@@ -14,7 +14,7 @@ namespace Krypton.Toolkit;
 /// Derived elements can be extended through the use of IKryptonTaskDialogElement interfaces to 
 /// guarantee correct and consistent definitions and naming of properties and methods.
 /// 
-/// The IDisposable pattern has been implemented by default so derived classes can override and implement if required
+/// The IDisposable pattern has been implemented by default so derived classes can override and implement if required.
 /// </summary>
 public abstract class KryptonTaskDialogElementBase : 
     IKryptonTaskDialogElementBase,
@@ -23,11 +23,9 @@ public abstract class KryptonTaskDialogElementBase :
 {
     #region Fields
     private bool _disposed;
-    private KryptonPanel _panel;
+    private KryptonTaskDialogKryptonPanel _panel;
     private bool _panelVisible;
     private KryptonTaskDialogDefaults _taskDialogDefaults;
-    private Bitmap _separator;
-    private (int FontMinValue, int FontMaxValue, int Adjust75, int Adjust50, int Adjust25) _separatorValues;
     #endregion
 
     #region Events
@@ -52,31 +50,21 @@ public KryptonTaskDialogElementBase(KryptonTaskDialogDefaults taskDialogDefaults
         _taskDialogDefaults = taskDialogDefaults;
         _disposed = false;
 
-        _separatorValues.FontMinValue = 50;
-        _separatorValues.FontMaxValue = 255 - 50;
-        _separatorValues.Adjust75 = 75;
-        _separatorValues.Adjust50 = 50;
-        _separatorValues.Adjust25 = 25;
-
         // Although OnGlobalPaletteChanged synchronizes palette changes with the elements,
-        // The initialisation is done here.
+        // The initialisation is done here
         Palette = KryptonManager.CurrentGlobalPalette;
         // From there the event handler will take over.
         KryptonManager.GlobalPaletteChanged += OnGlobalPaletteChanged;
 
-        _panel = new()
+        _panel = new(_taskDialogDefaults)
         {
             Margin = _taskDialogDefaults.NullPadding,
             Padding = _taskDialogDefaults.NullMargin,
             Visible = false
-
         };
 
         _panelVisible =  false;
-        _separator    =  CreateSeparator();
-        _panel.Paint += OnPanelPaint;
         Palette.PalettePaint += OnPalettePaint;
-
         LayoutDirty = false;
     }
     #endregion
@@ -122,7 +110,6 @@ protected virtual void OnGlobalPaletteChanged(object? sender, EventArgs e)
         if (Palette is not null)
         {
             Palette.PalettePaint += OnPalettePaint;
-            _separator = CreateSeparator();
         }
     }
     #endregion
@@ -203,16 +190,8 @@ public sealed override string ToString()
     /// </summary>
     public bool ShowSeparator
     {
-        get => field;
-
-        set
-        {
-            if (field != value)
-            {
-                field = value;
-                _panel.Invalidate();
-            }
-        }
+        get => _panel.ShowSeparator;
+        set => _panel.ShowSeparator = value;
     }
 
     /// <summary>
@@ -221,7 +200,7 @@ public bool ShowSeparator
     internal bool LayoutDirty { get; set; }
 
     /// <summary>
-    /// Return the height of the element when visible.<br/>
+    /// Returns the height of the element when visible.<br/>
     /// When not visible Height returns zero.
     /// </summary>
     public int Height => _panelVisible ? Panel.Height : 0;
@@ -231,11 +210,6 @@ public bool ShowSeparator
     #endregion
 
     #region Private
-    private void OnPanelPaint(object? sender, PaintEventArgs e)
-    {
-        PaintSeparator();
-    }
-
     private void OnBackColorsChanged()
     {
         if (BackColor1 != Color.Empty && BackColor2 != Color.Empty)
@@ -258,86 +232,13 @@ protected virtual void OnVisibleChanged()
     }
     #endregion
 
-    #region Private Separator
-    private Bitmap CreateSeparator()
-    {
-        (Color color1, Color color2) colors = GetSeparatorColors();
-
-        int width = Defaults.ClientWidth - Defaults.PanelLeft - Defaults.PanelRight;
-        Rectangle rectangle = new Rectangle(0, 0, width, 2);
-        Rectangle rectangleTop = new Rectangle(0, 0, width, 1);
-        Rectangle rectangleBottom = new Rectangle(0, 1, width, 1);
-
-        using Bitmap bitmap = new Bitmap(rectangle.Width, rectangle.Height);
-        using Brush brush1 = new SolidBrush(colors.color1);
-        using Brush brush2 = new SolidBrush(colors.color2);
-        using Graphics graphics = Graphics.FromImage(bitmap);
-
-        graphics.FillRectangle(brush1, rectangleTop);
-        graphics.FillRectangle(brush2, rectangleBottom);
-
-        return bitmap.Clone(rectangle, bitmap.PixelFormat);
-    }
-
-    private void PaintSeparator()
-    {
-        if (ShowSeparator)
-        {
-            using Graphics graphics = Panel.CreateGraphics();
-            graphics.DrawImage(_separator, Defaults.PanelLeft, 0);
-        }
-    }
-
-    private (Color, Color) GetSeparatorColors()
-    {
-        Color color1;
-        Color color2;
-
-        // If BackColor1 has been set use this for the separator, otherwise fall back to theme colours.
-        Color tmp = this.BackColor1 != Color.Empty
-            ? this.BackColor1
-            : Panel.GetResolvedPalette().GetBackColor1(PaletteBackStyle.PanelClient, PaletteState.Normal);
-
-        if (tmp.R > _separatorValues.FontMaxValue && tmp.G > _separatorValues.FontMaxValue && tmp.B > _separatorValues.FontMaxValue)
-        {
-            // If the colour reaches an upper bound it can't be made lighter.
-            color1 = Color.FromArgb(tmp.R - _separatorValues.Adjust75, tmp.G - _separatorValues.Adjust75, tmp.B - _separatorValues.Adjust75);
-            color2 = Color.White;
-        }
-        else if (tmp.R < _separatorValues.FontMinValue && tmp.G < _separatorValues.FontMinValue && tmp.B < _separatorValues.FontMinValue)
-        {
-            // If the colour reaches a lower bound, it can't be made darker.
-            color2 = ControlPaint.Light(tmp);
-            color1 = ControlPaint.Light(Color.LightSlateGray);
-        }
-        else if (tmp.R > 150 && tmp.G > 150 && tmp.B > 150)
-        {
-            // Colours that are somewhere in the middle need different handling
-            int r = Math.Min(tmp.R - _separatorValues.Adjust50, 255);
-            int g = Math.Min(tmp.G - _separatorValues.Adjust50, 255);
-            int b = Math.Min(tmp.B - _separatorValues.Adjust50, 255);
-
-            color1 = Color.FromArgb(r, g, b);
-            color2 = Color.LightGray;
-        }
-        else
-        {
-            color1 = ControlPaint.Dark(tmp);
-            color2 = ControlPaint.Light(tmp);
-        }
-
-        return (color1, color2);
-    }
-    #endregion
-
     #region IDispose
     /// <inheritdoc/>
     protected virtual void Dispose(bool disposing)
     {
         if (!_disposed && disposing)
         {
             KryptonManager.GlobalPaletteChanged -= OnGlobalPaletteChanged;
-            _panel.Paint -= OnPanelPaint;
 
             if (Palette is not null)
             {
@@ -358,3 +259,4 @@ public void Dispose()
     }
     #endregion
 }
+
@@ -10,7 +10,8 @@
 namespace Krypton.Toolkit;
 
 public class KryptonTaskDialogElementComboBox : KryptonTaskDialogElementSingleLineControlBase,
-    IKryptonTaskDialogElementDescription
+    IKryptonTaskDialogElementDescription,
+    IKryptonTaskDialogElementRoundedCorners
 {
     #region Enum
     // Used internally only
@@ -57,6 +58,15 @@ public KryptonTaskDialogElementComboBox(KryptonTaskDialogDefaults taskDialogDefa
     }
     #endregion
 
+    public bool RoundedCorners
+    {
+        get => field;
+        set
+        {
+            field = value;
+            _comboBox.StateCommon.ComboBox.Border.Rounding = Defaults.GetCornerRouding(value);
+        }
+    }
     #region Override
     /// <inheritdoc/>
     protected override void OnSizeChanged(bool performLayout = false)