Merge branch 'alpha' into 2446-V100-build-workflow

Author: tobitege

Documents/Changelog/Changelog.md

@@ -4,6 +4,8 @@
 
 ## 2025-11-xx - Build 2511 (V10 - alpha) - November 2025
 * Implemented [#2446](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2446), Add `build.yml` to `.github/workflows`.
+* Implemented [#648](https://github.com/Krypton-Suite/Standard-Toolkit/issues/648), SystemMenu to be theme related
+* Resolved [#2128](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2128), (feat) Add `ButtonSpecs` to `KDataGridView` cells when editing.
 * Resolved [#2463](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2463), `KryptonForm` has incorrect title-bar button behaviour.
 * Resolved [#2452](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2452), Fix: prevent resizing on fixed borders; gate Material hit-band by FormBorderStyle.
 * Resolved [#2436](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2436), Guard GetResolvedPalette nulls; use CurrentGlobalPalette fallback.
@@ -16,7 +18,7 @@
 * Implemented [#984](https://github.com/Krypton-Suite/Standard-Toolkit/issues/984), `KryptonForm` using `SizeGripStyle` for grippie.
 	- **Note:** This has a breaking change for custom themes as a new abstract method is introduced in the `PaletteBase` class for sizegrip images!
 * Implemented [#2396](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2396), Added ModernBuild terminal.gui app to solution
-* Resolved [#1022](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1022), `Material - Dark` fixes for KDGV painting.
+* Resolved [#1022](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1022), `Material - Dark` fixes for KDGV painting
 * Resolved [#413](https://github.com/Krypton-Suite/Standard-Toolkit/issues/413), `KryptonRibbon` controls do not react to MouseWheel scolling.
 * Resolved [#2424](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2424), Fix `NoClipping` in `AccurateText`; `Ellipsis` conditional.
 * Resolved [#2406](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2406), Enhance `KryptonProgressBar` options and painting.

Scripts/ModernBuild/classes/BuildLogic.cs

@@ -784,7 +784,11 @@ private static void StartNuGetPush(AppState state)
             var files = new List<string>();
             foreach (string f in GetCandidatePackageFolders(state))
             {
-                if (!Directory.Exists(f)) continue;
+                if (!Directory.Exists(f))
+                {
+                    continue;
+                }
+
                 files.AddRange(Directory.GetFiles(f, "*.nupkg", SearchOption.TopDirectoryOnly));
                 if (state.NuGetIncludeSymbols)
                 {
@@ -1002,11 +1006,17 @@ private static void RunNextNuGetPush(AppState state)
         };
         state.Process.OutputDataReceived += (_, e) =>
         {
-            if (!string.IsNullOrEmpty(e.Data)) state.OnOutput?.Invoke(e.Data);
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                state.OnOutput?.Invoke(e.Data);
+            }
         };
         state.Process.ErrorDataReceived += (_, e) =>
         {
-            if (!string.IsNullOrEmpty(e.Data)) state.OnOutput?.Invoke(e.Data);
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                state.OnOutput?.Invoke(e.Data);
+            }
         };
         state.Process.Exited += (_, __) =>
         {
@@ -1040,7 +1050,11 @@ internal static void PreviewNuGetCommands(AppState state)
             var files = new List<string>();
             foreach (string f in GetCandidatePackageFolders(state))
             {
-                if (!Directory.Exists(f)) continue;
+                if (!Directory.Exists(f))
+                {
+                    continue;
+                }
+
                 files.AddRange(Directory.GetFiles(f, "*.nupkg", SearchOption.TopDirectoryOnly));
                 if (state.NuGetIncludeSymbols)
                 {
@@ -1062,7 +1076,11 @@ internal static void PreviewNuGetCommands(AppState state)
             foreach (string pkg in files)
             {
                 var cmd = new StringBuilder().Append("nuget.exe push \"").Append(pkg).Append("\" ");
-                if (state.NuGetSkipDuplicate) cmd.Append("-SkipDuplicate ");
+                if (state.NuGetSkipDuplicate)
+                {
+                    cmd.Append("-SkipDuplicate ");
+                }
+
                 cmd.Append("-NonInteractive ");
                 if (!string.IsNullOrWhiteSpace(resolvedSource))
                 {

Scripts/ModernBuild/classes/BuildUI.cs

@@ -774,13 +774,25 @@ string FormatAction(BuildAction a)
             {
                 ui.Tx4.Text = "Page      Ops (F4 to switch)";
             }
-            if (ui.Tx6 != null) ui.Tx6.Text = $"Tail      {state.TailLines}";
+            if (ui.Tx6 != null)
+            {
+                ui.Tx6.Text = $"Tail      {state.TailLines}";
+            }
+
             if (ui.Tx5 != null)
             {
                 ui.Tx5.Text = $"Run/Stop  {(state.IsRunning ? "Stop" : "Run")}";
             }
-            if (ui.Tx7 != null) ui.Tx7.Text = "Clean     Delete Bin/obj/Logs";
-            if (ui.Tx8 != null) ui.Tx8.Text = "Clear     Clear live output";
+            if (ui.Tx7 != null)
+            {
+                ui.Tx7.Text = "Clean     Delete Bin/obj/Logs";
+            }
+
+            if (ui.Tx8 != null)
+            {
+                ui.Tx8.Text = "Clear     Clear live output";
+            }
+
             if (ui.TxEsc != null)
             {
                 ui.TxEsc.Text = "Exit      Exit application";
@@ -803,7 +815,11 @@ string FormatAction(BuildAction a)
             {
                 if (ui.Tx9 != null) { ui.Tx9.Text = "PackMode  (Stable only)"; }
             }
-            if (ui.TestBtn != null) ui.TestBtn.Visible = false;
+            if (ui.TestBtn != null)
+            {
+                ui.TestBtn.Visible = false;
+            }
+
             if (ui.TxTest != null) { ui.TxTest.Visible = false; ui.TxTest.Text = string.Empty; }
             if (ui.Hint != null)
             {
@@ -843,8 +859,16 @@ string FormatAction(BuildAction a)
             {
                 ui.Tx5.Text = $"Run/Stop  {(state.IsRunning ? "Stop" : "Run")}";
             }
-            if (ui.Tx6 != null) ui.Tx6.Text = $"Symbols   {(state.NuGetIncludeSymbols ? "Yes" : "No")}";
-            if (ui.Tx7 != null) ui.Tx7.Text = $"SkipDup   {(state.NuGetSkipDuplicate ? "Yes" : "No")}";
+            if (ui.Tx6 != null)
+            {
+                ui.Tx6.Text = $"Symbols   {(state.NuGetIncludeSymbols ? "Yes" : "No")}";
+            }
+
+            if (ui.Tx7 != null)
+            {
+                ui.Tx7.Text = $"SkipDup   {(state.NuGetSkipDuplicate ? "Yes" : "No")}";
+            }
+
             if (ui.Tx8 != null)
             {
                 string src = FormatNuGetSource(state.NuGetSource, state.NuGetCustomSource);
@@ -855,7 +879,11 @@ string FormatAction(BuildAction a)
                 bool showZip = state.NuGetAction == NuGetAction.RebuildPack || state.NuGetAction == NuGetAction.PackPush || state.NuGetAction == NuGetAction.BuildPackPush;
                 ui.CreateZip.Visible = showZip;
             }
-            if (ui.TestBtn != null) ui.TestBtn.Visible = true;
+            if (ui.TestBtn != null)
+            {
+                ui.TestBtn.Visible = true;
+            }
+
             if (ui.TxTest != null) { ui.TxTest.Visible = true; ui.TxTest.Text = "Test      Preview commands"; }
             if (ui.Tx9 != null) { ui.Tx9.Text = "PackMode  (Stable only)"; }
             if (ui.TxEsc != null)

Source/Krypton Components/Krypton Toolkit Suite 2022 - VS2022.slnx

@@ -66,6 +66,7 @@
     <File Path="../../Documents/Development/Development-Workflow.md" />
     <File Path="../../Documents/Development/How to Manage Using Statements.md" />
     <File Path="../../Documents/Development/How-to-Build.md" />
+    <File Path="Themed-System-Menu.md" />
   </Folder>
   <Folder Name="/Solution Items/Documentation/GitHub/" />
   <Folder Name="/Solution Items/Documentation/GitHub/Issue Templates/">

Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs

@@ -1,12 +1,12 @@
 #region BSD License
 /*
- * 
+ *
  * Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE)
  *  © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
- * 
+ *
  *  New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
- *  Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2025. All rights reserved.
- *  
+ *  Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac, Ahmed Abdelhameed, tobitege et al. 2017 - 2025. All rights reserved.
+ *
  */
 #endregion
 
@@ -321,11 +321,30 @@ protected virtual void OnFinishDelegate(object? sender, EventArgs? e) =>
         // Get value from button spec passing inheritance redirector
         Image? baseImage = ButtonSpec.GetImage(_redirector, state);
 
+        if (baseImage == null)
+        {
+            return null;
+        }
+
+        // Default behavior: DPI scale other ButtonSpec styles
         float dpiFactor = _controller?.Target.FactorDpiX ?? 1f;
-        return (baseImage != null)
-            ? CommonHelper.ScaleImageForSizedDisplay(baseImage, baseImage.Width * dpiFactor,
-                baseImage.Height * dpiFactor, true)
-            : null;
+
+        // For InputControl buttons (editing controls), enforce a consistent 16px logical size (DPI-aware)
+        // to avoid dependency on layout timing where client rectangles can be 0 during early passes.
+        if (ButtonSpec.GetStyle(_redirector) == ButtonStyle.InputControl)
+        {
+            float target = 16f * dpiFactor;
+
+            // Preserve aspect ratio
+            float scale = Math.Min(target / baseImage.Width, target / baseImage.Height);
+            float targetW = Math.Max(1f, baseImage.Width * scale);
+            float targetH = Math.Max(1f, baseImage.Height * scale);
+
+            return CommonHelper.ScaleImageForSizedDisplay(baseImage, targetW, targetH, true);
+        }
+
+        return CommonHelper.ScaleImageForSizedDisplay(baseImage, baseImage.Width * dpiFactor,
+            baseImage.Height * dpiFactor, true);
     }
 
     /// <summary>

Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCheckedListBox.cs

@@ -1974,7 +1974,10 @@ public List<object> CheckedItemList
                     {
                         var val = prop.GetValue(item);
                         if (val != null)
+                        {
                             results.Add(val);
+                        }
+
                         continue;
                     }
                 }

Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridView.cs

@@ -156,6 +156,13 @@ private class ToolTipContent : IContentValues
     [Category(@"Property Changed")]
     [Description(@"Occurs when the value of the Palette property is changed.")]
     public event EventHandler? PaletteChanged;
+
+    /// <summary>
+    /// Occurs when a ButtonSpec inside a cell's editing control is clicked.
+    /// </summary>
+    [Category(@"Action")]
+    [Description(@"Occurs when a button specification is clicked in a cell's editing control.")]
+    public event EventHandler<DataGridViewButtonSpecClickEventArgs>? EditingControlButtonSpecClick;
     #endregion
 
     #region Identity
@@ -2905,6 +2912,11 @@ private void OnSyncBackPropertyChanged(object? sender, PropertyChangedEventArgs
     #endregion
 
     #region Menus
+    /// <summary>
+    /// Handles the opening of the assigned <see cref="ContextMenuStrip"/> to ensure the correct renderer is applied.
+    /// </summary>
+    /// <param name="sender">The source of the event.</param>
+    /// <param name="e">A <see cref="CancelEventArgs"/> that contains the event data.</param>
     private void OnContextMenuStripOpening(object? sender, CancelEventArgs e)
     {
         // Get the actual strip instance
@@ -2988,4 +3000,50 @@ protected override void WndProc(ref Message m)
         base.WndProc(ref m);
     }
     #endregion menus
+
+    #region Column ButtonSpec wiring
+    /// <summary>
+    /// Wire column-specific ButtonSpec click events when a column is added.
+    /// </summary>
+    /// <param name="e">Column event args.</param>
+    protected override void OnColumnAdded(DataGridViewColumnEventArgs e)
+    {
+        base.OnColumnAdded(e);
+
+        if (e.Column is KryptonDataGridViewIconColumn iconCol)
+        {
+            iconCol.ButtonSpecClick += OnColumnButtonSpecClick;
+        }
+    }
+
+    /// <summary>
+    /// Unwire column-specific ButtonSpec click events when a column is removed.
+    /// </summary>
+    /// <param name="e">Column event args.</param>
+    protected override void OnColumnRemoved(DataGridViewColumnEventArgs e)
+    {
+        if (e.Column is KryptonDataGridViewIconColumn iconCol)
+        {
+            iconCol.ButtonSpecClick -= OnColumnButtonSpecClick;
+        }
+
+        base.OnColumnRemoved(e);
+    }
+
+    /// <summary>
+    /// Forwards column-level ButtonSpec click notifications to the grid-level
+    /// <see cref="EditingControlButtonSpecClick"/> event while guarding disposal.
+    /// </summary>
+    /// <param name="sender">The source column raising the event.</param>
+    /// <param name="e">Event arguments containing column, cell and ButtonSpec.</param>
+    private void OnColumnButtonSpecClick(object? sender, DataGridViewButtonSpecClickEventArgs e)
+    {
+        if (IsDisposed || Disposing)
+        {
+            return;
+        }
+
+        EditingControlButtonSpecClick?.Invoke(this, e);
+    }
+    #endregion
 }

Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxCell.cs

@@ -355,6 +355,18 @@ public override void InitializeEditingControl(int rowIndex,
             }
 
             _selectedItemText = comboBox.Text;
+
+            if (KryptonOwningColumn is KryptonDataGridViewComboBoxColumn comboColumn)
+            {
+                KryptonDataGridViewUtilities.SyncEditorButtonSpecs(DataGridView as KryptonDataGridView, comboColumn, comboBox.ButtonSpecs);
+                foreach (var spec in comboBox.ButtonSpecs.Enumerate().OfType<ButtonSpecAny>())
+                {
+                    spec.Click += (s, e) =>
+                        comboColumn.RaiseButtonSpecClick(new DataGridViewButtonSpecClickEventArgs(comboColumn, this, spec));
+                }
+                comboBox.PerformLayout();
+                comboBox.Invalidate();
+            }
         }
     }
 
@@ -381,11 +393,9 @@ public override void PositionEditingControl(bool setLocation,
 
         if (DataGridView?.EditingControl is not null)
         {
-            bool rtl = DataGridView.RightToLeft == RightToLeft.Yes;
-            int locX = rtl ? editingControlBounds.X : editingControlBounds.X + IndicatorGap;
-            int width = editingControlBounds.Width - IndicatorGap;
-            DataGridView.EditingControl.Location = new Point(locX, editingControlBounds.Y);
-            DataGridView.EditingControl.Size = new Size(width, IndicatorSize - 2);
+            // Use full bounds during edit so the editor can layout its own adornments (drop button, ButtonSpecs)
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
         }
     }
 

Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs

@@ -18,6 +18,7 @@ namespace Krypton.Toolkit;
 /// Hosts a collection of KryptonDataGridViewComboBoxCell cells.
 /// </summary>
 [ToolboxBitmap(typeof(KryptonDataGridViewComboBoxColumn), "ToolboxBitmaps.KryptonComboBox.bmp")]
+[Designer(typeof(KryptonComboBoxColumnDesigner))]
 public partial class KryptonDataGridViewComboBoxColumn : KryptonDataGridViewIconColumn
 {
     #region Identity
@@ -74,6 +75,8 @@ public override object Clone()
 
         cloned.AutoCompleteCustomSource.AddRange(strings);
 
+        cloned.SyncEditorOnButtonSpecClick = SyncEditorOnButtonSpecClick;
+
         return cloned;
     }
     #endregion
@@ -100,6 +103,41 @@ public override DataGridViewCell? CellTemplate {
         }
     }
 
+    /// <summary>
+    /// If true, synchronizes the editing control text from the cell Value after ButtonSpecClick handlers run.
+    /// </summary>
+    [Category(@"Behavior")]
+    [DefaultValue(true)]
+    [Description(@"If enabled, assigns the current cell Value to the active editor after ButtonSpec clicks.")]
+    public bool SyncEditorOnButtonSpecClick { get; set; } = true;
+
+    /// <inheritdoc/>
+    protected override void OnButtonSpecClickCore(DataGridViewButtonSpecClickEventArgs e)
+    {
+        base.OnButtonSpecClickCore(e);
+
+        if (!SyncEditorOnButtonSpecClick)
+        {
+            return;
+        }
+
+        var grid = e.Column.DataGridView;
+        if (grid is { IsDisposed: true } || grid?.Disposing == true)
+        {
+            return;
+        }
+        if (grid?.IsCurrentCellInEditMode == true
+            && ReferenceEquals(grid.CurrentCell, e.Cell)
+            && grid.EditingControl is Control editor)
+        {
+            var newText = Convert.ToString(e.Cell.FormattedValue, CultureInfo.CurrentCulture) ?? string.Empty;
+            if (!string.Equals(editor.Text, newText, StringComparison.Ordinal))
+            {
+                editor.Text = newText;
+            }
+        }
+    }
+
     /// <summary>
     /// Gets the collection of allowable items of the domain up down.
     /// </summary>