Skip to content

Commit 45712af

Browse files
authored
Merge branch 'alpha' into 2503-feature-request-add-the-ability-to-create-zip-files-for-binaries
2 parents 8700dcc + e835c0d commit 45712af

File tree

65 files changed

+2826
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2826
-211
lines changed

Documents/Changelog/Changelog.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
## 2025-11-xx - Build 2511 (V10 - alpha) - November 2025
66
* Implemented [#2503](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2503), Add the ability to create zip files for binaries
7+
* Implemented [#892](https://github.com/Krypton-Suite/Standard-Toolkit/issues/892), `KryptonButton` UAC Shield icons need to match the OS style
8+
* Resolved [#2514](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2514), `KryptonPanel.OnPaint` does not call base.
9+
* Resolved [#2508](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2508), Add internal `InDesignMode()` extension methods to both `Control` and `Component` classes.
710
* Resolved [#2492](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2492), `KryptonForm` does not display '(Administrator)' when elevated
811
* Resolved [#2502](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2502), **[Breaking Change]** `KryptonCommandLinkButton` updates several properties and their behaviour. See issue for full details.
912
* Resolved [#2495](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2495), `KryptonProgressBar` private field `_mementoContent` can be null.
@@ -19,7 +22,7 @@
1922
* Resolved [#2439](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2439), Fix `KDGVDateTimePickerCell` auto-sizing and dropdown glyphs.
2023
* Resolved [#2448](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2448), `KryptonForm` does not display components without designer source.
2124
* Implemented [#2444](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2444), Add `AGENTS.md` file.
22-
* Fix [#1199](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1199), Fix exception in `KryptonDropButton` due to wrong DialogResult.
25+
* Resolved [#1199](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1199), Fix exception in `KryptonDropButton` due to wrong DialogResult.
2326
* Implemented [#2442](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2442), `KryptonColorButton` and related components with `PaletteColors` mode.
2427
* Implemented [#2396](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2396), Added ModernBuild terminal.gui app to solution.
2528
* Implemented [#984](https://github.com/Krypton-Suite/Standard-Toolkit/issues/984), `KryptonForm` using `SizeGripStyle` for grippie.
@@ -865,7 +868,7 @@ Cannot add items to KryptonGroupBox in WinForms Designer
865868
=======
866869

867870
## 2021-06-04 - Build 2106.1 - June 2021 (Update 1)
868-
* Fix NuGet package descriptions
871+
* Fixed NuGet package descriptions
869872
* Disabled `KryptonListView`, `KryptonToolStrip` and `KryptonStatusStrip` - to return in a future update
870873

871874
=======

Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualMessageBoxRtlAwareForm.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,10 @@ private void UpdateIcon()
178178
SystemSounds.Exclamation.Play();
179179
break;
180180
case KryptonMessageBoxIcon.Shield:
181-
_messageIcon.Image = UACShieldIconResources.UAC_Shield_Windows_11;
181+
{
182+
var shieldIcon = GraphicsExtensions.ExtractIconFromImageres((int)ImageresIconID.Shield);
183+
_messageIcon.Image = shieldIcon?.ToBitmap();
184+
}
182185
break;
183186
case KryptonMessageBoxIcon.WindowsLogo:
184187
// Because Windows 11 displays a generic application icon,
@@ -258,9 +261,10 @@ private void UpdateIcon()
258261
SystemSounds.Exclamation.Play();
259262
break;
260263
case KryptonMessageBoxIcon.Shield:
261-
_messageIcon.Image = OSUtilities.IsWindowsTen
262-
? UACShieldIconResources.UAC_Shield_Windows_10
263-
: UACShieldIconResources.UAC_Shield_Windows_7;
264+
{
265+
var shieldIcon = GraphicsExtensions.ExtractIconFromImageres((int)ImageresIconID.Shield);
266+
_messageIcon.Image = shieldIcon?.ToBitmap();
267+
}
264268
break;
265269
case KryptonMessageBoxIcon.WindowsLogo:
266270
_messageIcon.Image = OSUtilities.IsWindowsTen

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,10 @@ private void UpdateIcon()
187187
SystemSounds.Exclamation.Play();
188188
break;
189189
case KryptonMessageBoxIcon.Shield:
190-
_messageIcon.Image = UACShieldIconResources.UAC_Shield_Windows_11;
190+
{
191+
var shieldIcon = GraphicsExtensions.ExtractIconFromImageres((int)ImageresIconID.Shield);
192+
_messageIcon.Image = shieldIcon?.ToBitmap();
193+
}
191194
break;
192195
case KryptonMessageBoxIcon.WindowsLogo:
193196
// Because Windows 11 displays a generic application icon,
@@ -267,9 +270,10 @@ private void UpdateIcon()
267270
SystemSounds.Exclamation.Play();
268271
break;
269272
case KryptonMessageBoxIcon.Shield:
270-
_messageIcon.Image = OSUtilities.IsWindowsTen
271-
? UACShieldIconResources.UAC_Shield_Windows_10
272-
: UACShieldIconResources.UAC_Shield_Windows_7;
273+
{
274+
var shieldIcon = GraphicsExtensions.ExtractIconFromImageres((int)ImageresIconID.Shield);
275+
_messageIcon.Image = shieldIcon?.ToBitmap();
276+
}
273277
break;
274278
case KryptonMessageBoxIcon.WindowsLogo:
275279
_messageIcon.Image = OSUtilities.IsWindowsTen

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,11 +869,14 @@ protected override void OnLayout(LayoutEventArgs levent)
869869
/// Raises the Paint event.
870870
/// </summary>
871871
/// <param name="e">A PaintEventArgs that contains the event data.</param>
872-
protected override void OnPaint(PaintEventArgs? e)
872+
protected override void OnPaint(PaintEventArgs e)
873873
{
874874
// Cannot process a message for a disposed control
875875
if (!IsDisposed)
876876
{
877+
// Call base first
878+
base.OnPaint(e);
879+
877880
// Do we have a manager to use for painting?
878881
if (ViewManager is not null)
879882
{

0 commit comments

Comments
 (0)