diff --git a/Krypton.png b/Krypton.png index d2aef9fd7..153a67cf5 100644 Binary files a/Krypton.png and b/Krypton.png differ diff --git a/README.md b/README.md index 3d1ecb319..fa5973499 100644 --- a/README.md +++ b/README.md @@ -53,21 +53,6 @@ | | ![Nuget](https://img.shields.io/nuget/v/Krypton.Workspace.Signed?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | | | ![Nuget](https://img.shields.io/nuget/v/Krypton.Workspace.Lite.Signed?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -## Long Term Support - -| Module Name | Current Version | Github License | -|---|---|---| -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Toolkit.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Toolkit.Lite.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Docking.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Docking.Lite.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Navigator.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Navigator.Lite.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Ribbon.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Ribbon.Lite.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Workspace.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | -| | ![Nuget](https://img.shields.io/nuget/v/Krypton.Workspace.Lite.LTS?label=Version&logo=nuget&style=flat-square) | ![GitHub](https://img.shields.io/github/license/Krypton-Suite/Standard-Toolkit.svg?style=flat-square) | - ======= # Online Help @@ -97,7 +82,7 @@ Follow the links to see the different objects and layouts that this framework al Only use these packages if you require to target a specific framework version between .NET 3.5 and .NET 6. Please note that these packages are larger than the lite packages. ## Lite -These packages only support .NET Framework >= 4.5, .NET Core 3.1 and .NET 6. +These packages only support .NET Framework >= 4.8, .NET Core 3.1 and .NET 6. ======= @@ -106,13 +91,15 @@ These packages only support .NET Framework >= 4.5, .NET Core 3.1 and .NET 6. ======= ## 2021-08-01 Build 2108 - August 2021 (Canary) -* Remove the internal class Called `KryptonDataGridViewIconColumn` from design use #27 +* Fixed [#202](https://github.com/Krypton-Suite/Standard-Toolkit/issues/202), `KryptonGroup` transparency +* Remove the internal class Called `KryptonDataGridViewIconColumn` from design use [#27](https://github.com/Krypton-Suite/Standard-Toolkit/issues/27) - Put back the removed `CLSCompliant` and `ComVisible` assembly flags for backwards compatibility - Update the projects to comply/use the latest analysers * _Something to do with TreeGridViews_ * _Scollbars_ * RichTextBox now allows CueHint Text * ComboBox now allows CueHint Text +* Implement [#197](https://github.com/Krypton-Suite/Standard-Toolkit/issues/197), Rounding should use `float` or `double` instead of `int`. Rounding now accepts `float` values * New logo for both canary and stable builds * Fixed [#138](https://github.com/Krypton-Suite/Standard-Toolkit/issues/138), `KryptonListView` throws a `System.Resources.MissingManifestResourceException` - If you want a standard List then use ListBox or CheckedListBox @@ -144,7 +131,7 @@ These packages only support .NET Framework >= 4.5, .NET Core 3.1 and .NET 6. * Implemented [#79](https://github.com/Krypton-Suite/Standard-Toolkit/issues/79), Customise 'Hint' Font * Fixed [#77](https://github.com/Krypton-Suite/Standard-Toolkit/issues/77), When using KryptonInputBox focus is not on the edit box when it is shown * Fixed [#71](https://github.com/Krypton-Suite/Standard-Toolkit/issues/71), No design support while using Krypton.Ribbon in .NET 5/6 -* Fixed [#54](https://github.com/Krypton-Suite/Standard-Toolkit/issues/54), .Net5 Winform Project - Dropping a KLabel onto a KGroup or KGroupBox causes an Exception in Designer +* Fixed [#54](https://github.com/Krypton-Suite/Standard-Toolkit/issues/54), .Net5 WinForm Project - Dropping a KLabel onto a KGroup or KGroupBox causes an Exception in Designer ======= diff --git a/Source/Krypton Components/Directory.Build.targets b/Source/Krypton Components/Directory.Build.targets index 040581bb1..bd96d8f6b 100644 --- a/Source/Krypton Components/Directory.Build.targets +++ b/Source/Krypton Components/Directory.Build.targets @@ -7,7 +7,7 @@ $(PackageId).Canary.Lite $(Description) - This package supports only .NET Framework >= 4.5, .NET Core 3.1 and .NET 5/6. + This package supports only .NET Framework >= 4.8, .NET Core 3.1 and .NET 5/6. If you require .NET 4.0 support or want to use library fully build against your specific framework version use non-lite package. $(PackageId).Canary diff --git a/Source/Krypton Components/Krypton Toolkit Suite 2019.sln b/Source/Krypton Components/Krypton Toolkit Suite 2019.sln index 9d1513c41..e2c17178b 100644 --- a/Source/Krypton Components/Krypton Toolkit Suite 2019.sln +++ b/Source/Krypton Components/Krypton Toolkit Suite 2019.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.31410.223 +VisualStudioVersion = 16.0.31507.150 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{942DAEF7-509F-4BB7-B1DD-CBC28949CCF6}" ProjectSection(SolutionItems) = preProject @@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{7639F185-EAEE-4483-BE71-7EC62EDDBEA9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Krypton.Docking 2019", "Krypton.Docking\Krypton.Docking 2019.csproj", "{AEEC4AA6-23F5-4B53-B3CB-305DDC4085A4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Krypton.Navigator 2019", "Krypton.Navigator\Krypton.Navigator 2019.csproj", "{0D932DC6-53EA-4DE7-903C-C2E404505CAC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Krypton.Ribbon 2019", "Krypton.Ribbon\Krypton.Ribbon 2019.csproj", "{28E83440-1BEC-4D48-B4EA-D85E30638BDD}" @@ -54,16 +52,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2022", "2022", "{B0DAF0D5-5 ..\..\Documents\Build System\2022\run.cmd = ..\..\Documents\Build System\2022\run.cmd EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Krypton.Docking 2019", "Krypton.Docking\Krypton.Docking 2019.csproj", "{408B2F95-0322-4EEF-9A1B-889B7759976B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AEEC4AA6-23F5-4B53-B3CB-305DDC4085A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEEC4AA6-23F5-4B53-B3CB-305DDC4085A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEEC4AA6-23F5-4B53-B3CB-305DDC4085A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEEC4AA6-23F5-4B53-B3CB-305DDC4085A4}.Release|Any CPU.Build.0 = Release|Any CPU {0D932DC6-53EA-4DE7-903C-C2E404505CAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0D932DC6-53EA-4DE7-903C-C2E404505CAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D932DC6-53EA-4DE7-903C-C2E404505CAC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -80,12 +76,15 @@ Global {F379A7A0-66CC-4295-90E6-2471433D12B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {F379A7A0-66CC-4295-90E6-2471433D12B8}.Release|Any CPU.ActiveCfg = Release|Any CPU {F379A7A0-66CC-4295-90E6-2471433D12B8}.Release|Any CPU.Build.0 = Release|Any CPU + {408B2F95-0322-4EEF-9A1B-889B7759976B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {408B2F95-0322-4EEF-9A1B-889B7759976B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {408B2F95-0322-4EEF-9A1B-889B7759976B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {408B2F95-0322-4EEF-9A1B-889B7759976B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {AEEC4AA6-23F5-4B53-B3CB-305DDC4085A4} = {7639F185-EAEE-4483-BE71-7EC62EDDBEA9} {0D932DC6-53EA-4DE7-903C-C2E404505CAC} = {7639F185-EAEE-4483-BE71-7EC62EDDBEA9} {28E83440-1BEC-4D48-B4EA-D85E30638BDD} = {7639F185-EAEE-4483-BE71-7EC62EDDBEA9} {43C7CFAF-03AB-47BD-A60D-1F3C5A3B68D5} = {7639F185-EAEE-4483-BE71-7EC62EDDBEA9} @@ -93,6 +92,7 @@ Global {8EC65998-9433-4A2D-8376-FB35DAC73B16} = {942DAEF7-509F-4BB7-B1DD-CBC28949CCF6} {5DDF2C46-7125-4AFE-A1A8-AB97E12BCE39} = {942DAEF7-509F-4BB7-B1DD-CBC28949CCF6} {B0DAF0D5-5C54-4551-A0EE-BC3CF3F98F68} = {5DDF2C46-7125-4AFE-A1A8-AB97E12BCE39} + {408B2F95-0322-4EEF-9A1B-889B7759976B} = {7639F185-EAEE-4483-BE71-7EC62EDDBEA9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution BuildVersion_StartDate = 2000/1/1 diff --git a/Source/Krypton Components/Krypton.Navigator/View Layout/ViewLayoutInsetOverlap.cs b/Source/Krypton Components/Krypton.Navigator/View Layout/ViewLayoutInsetOverlap.cs index 8d3f9d339..09f14a98c 100644 --- a/Source/Krypton Components/Krypton.Navigator/View Layout/ViewLayoutInsetOverlap.cs +++ b/Source/Krypton Components/Krypton.Navigator/View Layout/ViewLayoutInsetOverlap.cs @@ -67,12 +67,12 @@ public VisualOrientation Orientation /// /// Gets the rounding value to apply on the edges. /// - public int Rounding + public float Rounding { get { // Get the rounding and width values for the border - int rounding = _drawCanvas.PaletteBorder.GetBorderRounding(_drawCanvas.State); + float rounding = _drawCanvas.PaletteBorder.GetBorderRounding(_drawCanvas.State); int width = _drawCanvas.PaletteBorder.GetBorderWidth(_drawCanvas.State); // We have to add half the width as that increases the rounding effect @@ -99,17 +99,17 @@ public override Size GetPreferredSize(ViewLayoutContext context) Debug.Assert(context != null); // Get the preferred size requested by the children - Size size = base.GetPreferredSize(context); + Size size = base.GetPreferredSize(context); // Apply the rounding in the appropriate orientation if ((Orientation == VisualOrientation.Top) || (Orientation == VisualOrientation.Bottom)) { - size.Width += Rounding * 2; + size.Width += Convert.ToInt32(Rounding) * 2; size.Height += BorderWidth; } else { - size.Height += Rounding * 2; + size.Height += Convert.ToInt32(Rounding) * 2; size.Width += BorderWidth; } @@ -128,32 +128,40 @@ public override void Layout(ViewLayoutContext context) ClientRectangle = context.DisplayRectangle; // Find the rectangle available to each child by removing the rounding - Rectangle childRect = ClientRectangle; + RectangleF childRectF = ClientRectangle; // Find the amount of rounding to apply - int rounding = Rounding; + float rounding = Rounding; // Apply the rounding in the appropriate orientation if ((Orientation == VisualOrientation.Top) || (Orientation == VisualOrientation.Bottom)) { - childRect.Width -= rounding * 2; - childRect.X += rounding; + childRectF.Width -= rounding * 2; + childRectF.X += rounding; } else { - childRect.Height -= rounding * 2; - childRect.Y += rounding; + childRectF.Height -= rounding * 2; + childRectF.Y += rounding; } + // Convert childRectF to a 'int' Rectangle + Rectangle childRect = new Rectangle((int)childRectF.X, (int)childRectF.Y, (int)childRectF.Width, (int)childRectF.Height); + // Inform each child to layout inside the reduced rectangle foreach (ViewBase child in this) { context.DisplayRectangle = childRect; + + context.DisplayRectangleF = childRectF; + child.Layout(context); } // Remember the set context to the size we were given context.DisplayRectangle = ClientRectangle; + + context.DisplayRectangleF = ClientRectangleF; } #endregion } diff --git a/Source/Krypton Components/Krypton.Ribbon/Palette/PaletteGalleryBackBorder.cs b/Source/Krypton Components/Krypton.Ribbon/Palette/PaletteGalleryBackBorder.cs index 4ebcfa7c1..ffb9b6b5e 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Palette/PaletteGalleryBackBorder.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Palette/PaletteGalleryBackBorder.cs @@ -244,7 +244,7 @@ public int GetBorderWidth(PaletteState state) /// /// Palette value should be applicable to this state. /// Border rounding. - public int GetBorderRounding(PaletteState state) + public float GetBorderRounding(PaletteState state) { return 0; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs index 05189634b..9ee26fc25 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs @@ -97,7 +97,7 @@ public FormFixedButtonSpecCollection(KryptonForm owner) private StatusStrip _statusStrip; private Bitmap _cacheBitmap; private Icon _cacheIcon; - private int _cornerRoundingRadius; + private float _cornerRoundingRadius; private Control _activeControl; private KryptonManager _internalKryptonManager; private KryptonPalette _internalKryptonPalette; @@ -609,7 +609,7 @@ public FormWindowState GetWindowState() /// Gets or sets the corner rounding radius. /// The corner rounding radius. [DefaultValue(-1), Description("Defines the corner roundness on the current window (-1 is the default look).")] - public int CornerRoundingRadius { get => _cornerRoundingRadius; set { _cornerRoundingRadius = value; Invalidate(); } } + public float CornerRoundingRadius { get => _cornerRoundingRadius; set { _cornerRoundingRadius = value; Invalidate(); } } /// Gets or sets the active control on the container control. [DefaultValue(null), Description("Defines an active control for this window.")] diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroup.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroup.cs index 3c4f1117f..8f0d39405 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroup.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroup.cs @@ -41,6 +41,8 @@ public class KryptonGroup : VisualControlContainment /// public KryptonGroup() { + SetStyle(ControlStyles.SupportsTransparentBackColor | ControlStyles.OptimizedDoubleBuffer, true); + // Create the palette storage StateCommon = new PaletteDoubleRedirect(Redirector, PaletteBackStyle.ControlClient, PaletteBorderStyle.ControlClient, NeedPaintDelegate); StateDisabled = new PaletteDouble(StateCommon, NeedPaintDelegate); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroupBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroupBox.cs index 8f33062bf..bfb1c22f9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroupBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonGroupBox.cs @@ -49,6 +49,8 @@ public class KryptonGroupBox : VisualControlContainment /// public KryptonGroupBox() { + SetStyle(ControlStyles.SupportsTransparentBackColor | ControlStyles.OptimizedDoubleBuffer, true); + // Set default values _captionStyle = LabelStyle.GroupBoxCaption; _captionEdge = VisualOrientation.Top; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs index 43a735b23..853d5e590 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs @@ -184,7 +184,7 @@ protected override void WndProc(ref Message m) private readonly HelpInfo _helpInfo; // If help information provided or we are not a service/default desktop application then grab an owner for showing the message box private readonly IWin32Window _showOwner; - private readonly int _cornerRadius; + private readonly float _cornerRadius; private readonly int _blurRadius; private readonly bool _useBlur; private readonly KryptonForm _parentWindow; @@ -199,7 +199,7 @@ static KryptonMessageBox() private KryptonMessageBox(IWin32Window showOwner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, - HelpInfo helpInfo, bool? showCtrlCopy, int? cornerRadius, bool? useBlur, + HelpInfo helpInfo, bool? showCtrlCopy, float? cornerRadius, bool? useBlur, int? blurRadius, KryptonForm parentWindow = null) { // Store incoming values @@ -261,7 +261,7 @@ private KryptonMessageBox(IWin32Window showOwner, string text, string caption, private KryptonMessageBox(IWin32Window showOwner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, - HelpInfo helpInfo, bool? showCtrlCopy, int? cornerRadius, bool? useBlur, + HelpInfo helpInfo, bool? showCtrlCopy, float? cornerRadius, bool? useBlur, int? blurRadius, KryptonForm parentWindow = null) { // Store incoming values @@ -346,7 +346,7 @@ protected override void Dispose(bool disposing) /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, string.Empty, MessageBoxButtons.OK, KryptonMessageBoxIcon.NONE, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -360,7 +360,7 @@ public static DialogResult Show(string text, bool? showCtrlCopy = null, int? cor /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, string.Empty, MessageBoxButtons.OK, KryptonMessageBoxIcon.NONE, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -374,7 +374,7 @@ public static DialogResult Show(IWin32Window owner, string text, bool? showCtrlC /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, MessageBoxButtons.OK, KryptonMessageBoxIcon.NONE, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -389,7 +389,7 @@ public static DialogResult Show(string text, string caption, bool? showCtrlCopy /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, MessageBoxButtons.OK, KryptonMessageBoxIcon.NONE, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -404,7 +404,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, KryptonMessageBoxIcon.NONE, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -420,7 +420,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, KryptonMessageBoxIcon.NONE, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -436,7 +436,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -453,7 +453,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -470,7 +470,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -488,7 +488,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -506,7 +506,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -526,7 +526,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, displayHelpButton ? new HelpInfo() : null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -545,7 +545,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, displayHelpButton ? new HelpInfo() : null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -564,7 +564,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -584,7 +584,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -604,7 +604,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -624,7 +624,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, keyword), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -645,7 +645,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -666,7 +666,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, keyword), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -687,7 +687,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator, param), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -709,7 +709,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, KryptonMessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator, param), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); #region WinForms Compatible @@ -726,7 +726,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -743,7 +743,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -760,7 +760,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -778,7 +778,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, 0, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -796,7 +796,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -816,7 +816,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, displayHelpButton ? new HelpInfo() : null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -835,7 +835,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, bool displayHelpButton, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, displayHelpButton ? new HelpInfo() : null, showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -854,7 +854,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -874,7 +874,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -894,7 +894,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -914,7 +914,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, keyword), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -935,7 +935,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -956,7 +956,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, string keyword, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, keyword), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -977,7 +977,7 @@ public static DialogResult Show(IWin32Window owner, string text, string caption, /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(null, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator, param), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); /// @@ -999,7 +999,7 @@ public static DialogResult Show(string text, string caption, MessageBoxButtons b /// The radius of the blur effect on the 'parentWindow' if it is enabled. By default, it is set to '0'. /// The window to utilise the blurring effect on. If not set as the default value (null), it'll override the 'owner' value. /// One of the System.Windows.Forms.DialogResult values. - public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, int? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, + public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, string helpFilePath, HelpNavigator navigator, object param, bool? showCtrlCopy = null, float? cornerRadius = GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE, bool? useBlur = false, int? blurRadius = 0, KryptonForm parentWindow = null) => InternalShow(owner, text, caption, buttons, icon, defaultButton, options, new HelpInfo(helpFilePath, navigator, param), showCtrlCopy, cornerRadius, useBlur, blurRadius, parentWindow); #endregion #endregion @@ -1029,7 +1029,7 @@ private static DialogResult InternalShow(IWin32Window owner, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, HelpInfo helpInfo, bool? showCtrlCopy, - int? cornerRadius, bool? useBlur, + float? cornerRadius, bool? useBlur, int? blurRadius, KryptonForm parentWindow = null) { // Check if trying to show a message box from a non-interactive process, this is not possible @@ -1091,7 +1091,7 @@ private static DialogResult InternalShow(IWin32Window owner, MessageBoxDefaultButton defaultButton, MessageBoxOptions options, HelpInfo helpInfo, bool? showCtrlCopy, - int? cornerRadius, bool? useBlur, + float? cornerRadius, bool? useBlur, int? blurRadius, KryptonForm parentWindow = null) { // Check if trying to show a message box from a non-interactive process, this is not possible diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBoxManager.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBoxManager.cs index 8e8a1d664..ce1cc2343 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBoxManager.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBoxManager.cs @@ -36,7 +36,9 @@ public class KryptonMessageBoxManager : Component private object _param; - private int _blurRadius, _cornerRadius; + private int _blurRadius; + + private float _cornerRadius; private IWin32Window _owner; @@ -107,7 +109,7 @@ public class KryptonMessageBoxManager : Component /// Gets or sets the corner radius of the KryptonMessageBox. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE), Description("Defines the corner radius of the KryptonMessageBox.")] - public int CornerRadius { get => _cornerRadius; set => _cornerRadius = value; } + public float CornerRadius { get => _cornerRadius; set => _cornerRadius = value; } /// Gets or sets the owner. /// The owner. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPalette.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPalette.cs index e7f962169..2e4b837c9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPalette.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPalette.cs @@ -875,8 +875,8 @@ public int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // Find the correct destination in the palette and pass on request return GetPaletteBorder(style, state).GetBorderRounding(state); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPanel.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPanel.cs index b3ee444a1..c08045779 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPanel.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonPanel.cs @@ -41,6 +41,8 @@ public class KryptonPanel : VisualPanel /// public KryptonPanel() { + SetStyle(ControlStyles.SupportsTransparentBackColor | ControlStyles.OptimizedDoubleBuffer, true); + // Create the palette storage _stateCommon = new PaletteDoubleRedirect(Redirector, PaletteBackStyle.PanelClient, PaletteBorderStyle.ControlClient, NeedPaintDelegate); _stateDisabled = new PaletteDouble(_stateCommon, NeedPaintDelegate); @@ -59,6 +61,8 @@ public KryptonPanel(PaletteDoubleRedirect stateCommon, PaletteDouble stateDisabled, PaletteDouble stateNormal) { + SetStyle(ControlStyles.SupportsTransparentBackColor | ControlStyles.OptimizedDoubleBuffer, true); + Debug.Assert(stateCommon != null); Debug.Assert(stateDisabled != null); Debug.Assert(stateNormal != null); diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs index 0d0c5ff2f..6cdfd798c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs @@ -195,7 +195,7 @@ public Font LongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _button.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs index b3a8a3320..26e2cd48f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs @@ -210,7 +210,7 @@ public Font LongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _checkedListBox.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonColorButtonActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonColorButtonActionList.cs index d886e5f06..c55da33d8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonColorButtonActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonColorButtonActionList.cs @@ -246,7 +246,7 @@ public Font LongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _colorButton.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs index 51e039962..74d773ba1 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs @@ -110,7 +110,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _comboBox.StateCommon.ComboBox.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDateTimePickerActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDateTimePickerActionList.cs index ce35fa3bc..25fa9fbb7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDateTimePickerActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDateTimePickerActionList.cs @@ -159,7 +159,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _dateTimePicker.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDomainUpDownActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDomainUpDownActionList.cs index c64ef5219..341345c6a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDomainUpDownActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDomainUpDownActionList.cs @@ -108,7 +108,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _domainUpDown.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDropButtonActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDropButtonActionList.cs index a15956bab..dc8c3a574 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDropButtonActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDropButtonActionList.cs @@ -246,7 +246,7 @@ public Font LongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _dropButton.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonListBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonListBoxActionList.cs index fd2c298cf..c16cafcf6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonListBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonListBoxActionList.cs @@ -195,7 +195,7 @@ public Font LongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _listBox.StateCommon.Border.Rounding; @@ -213,7 +213,7 @@ public int CornerRadius /// Gets or sets the item corner radius. /// The item corner radius. [DefaultValue(GlobalStaticValues.SECONDARY_CORNER_ROUNDING_VALUE)] - public int ItemCornerRounding + public float ItemCornerRounding { get => _listBox.StateCommon.Item.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMaskedTextBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMaskedTextBoxActionList.cs index 1b82ad03c..496369ff0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMaskedTextBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMaskedTextBoxActionList.cs @@ -127,7 +127,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _maskedTextBox.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMonthCalendarActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMonthCalendarActionList.cs index aa39848c7..7febbe98e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMonthCalendarActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonMonthCalendarActionList.cs @@ -178,7 +178,7 @@ public Font DayLongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _monthCalendar.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonNumericUpDownActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonNumericUpDownActionList.cs index 735613773..c24fef797 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonNumericUpDownActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonNumericUpDownActionList.cs @@ -161,7 +161,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _numericUpDown.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonRichTextBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonRichTextBoxActionList.cs index 4f7a4caa3..ba5a7156e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonRichTextBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonRichTextBoxActionList.cs @@ -144,7 +144,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _richTextBox.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTextBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTextBoxActionList.cs index adb4f1b2f..569483373 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTextBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTextBoxActionList.cs @@ -179,7 +179,7 @@ public Font Font /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _textBox.StateCommon.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTreeViewActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTreeViewActionList.cs index f6b479b7b..92e456a6a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTreeViewActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonTreeViewActionList.cs @@ -178,7 +178,7 @@ public Font LongTextFont /// Gets or sets the corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] - public int CornerRadius + public float CornerRadius { get => _treeView.StateCommon.Border.Rounding; @@ -196,7 +196,7 @@ public int CornerRadius /// Gets or sets the node corner radius. /// The corner radius. [DefaultValue(GlobalStaticValues.SECONDARY_CORNER_ROUNDING_VALUE)] - public int NodeCornerRadius + public float NodeCornerRadius { get => _treeView.StateCommon.Node.Border.Rounding; diff --git a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs index 3ecefbee9..4433447da 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs @@ -16,12 +16,15 @@ namespace Krypton.Toolkit public class GlobalStaticValues { // Used for 'Material' themes - public const int MATERIAL_THEME_CORNER_ROUNDING_VALUE = -1; + public const float MATERIAL_THEME_CORNER_ROUNDING_VALUE = -1; // Used for the default control corners - public const int PRIMARY_CORNER_ROUNDING_VALUE = -1; + public const float PRIMARY_CORNER_ROUNDING_VALUE = -1; + + // Used for text controls + public const float PRIMARY_CORNER_TEXT_CONTROLS_ROUNDING_VALUE = -1; // Used for nodes etc - public const int SECONDARY_CORNER_ROUNDING_VALUE = -1; + public const float SECONDARY_CORNER_ROUNDING_VALUE = -1; } } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs index d94bb26e7..cf0cba2f2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs @@ -33,7 +33,7 @@ private class InternalStorage public PaletteRectangleAlign BorderColorAlign; public float BorderColorAngle; public int BorderWidth; - public int BorderRounding; + public float BorderRounding; public Image BorderImage; public PaletteImageStyle BorderImageStyle; public PaletteRectangleAlign BorderImageAlign; @@ -614,7 +614,7 @@ public int Width [Description("How much to round the border corners.")] [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)] [RefreshProperties(RefreshProperties.All)] - public int Rounding + public float Rounding { get { @@ -659,7 +659,7 @@ public int Rounding /// /// Palette value should be applicable to this state. /// Border rounding. - public int GetBorderRounding(PaletteState state) => Rounding != -1 ? Rounding : _inherit.GetBorderRounding(state); + public float GetBorderRounding(PaletteState state) => Rounding != -1 ? Rounding : _inherit.GetBorderRounding(state); #endregion #region Image diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInherit.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInherit.cs index 8b95b175b..4a028d068 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInherit.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInherit.cs @@ -90,7 +90,7 @@ public abstract class PaletteBorderInherit : GlobalId, /// /// Palette value should be applicable to this state. /// Border rounding. - public abstract int GetBorderRounding(PaletteState state); + public abstract float GetBorderRounding(PaletteState state); /// /// Gets a border image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs index 2651d2262..b1e51fd80 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs @@ -51,7 +51,7 @@ public PaletteBorderInheritForced(IPaletteBorder inherit) public void SetInherit(IPaletteBorder paletteBorder) { Debug.Assert(paletteBorder != null); - _inherit = paletteBorder; + _inherit = paletteBorder; } #endregion @@ -186,7 +186,7 @@ public override PaletteGraphicsHint GetBorderGraphicsHint(PaletteState state) => /// /// Palette value should be applicable to this state. /// Border rounding. - public override int GetBorderRounding(PaletteState state) => _inherit.GetBorderRounding(state); + public override float GetBorderRounding(PaletteState state) => _inherit.GetBorderRounding(state); /// /// Gets a border image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs index b843b8ac1..9e18db379 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs @@ -63,7 +63,7 @@ public void SetPalettes(IPaletteBorder primary, _backup = backup; } #endregion - + #region Apply /// /// Gets and sets a value indicating if override should be applied. @@ -79,7 +79,7 @@ public void SetPalettes(IPaletteBorder primary, public bool Override { get; set; } #endregion - + #region OverrideState /// /// Gets and sets the override palette state to use. @@ -310,11 +310,11 @@ public override int GetBorderWidth(PaletteState state) /// /// Palette value should be applicable to this state. /// Border rounding. - public override int GetBorderRounding(PaletteState state) + public override float GetBorderRounding(PaletteState state) { if (Apply) { - int ret = _primary.GetBorderRounding(Override ? OverrideState : state); + float ret = _primary.GetBorderRounding(Override ? OverrideState : state); if (ret == -1) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs index 4055abb69..b8d030424 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs @@ -156,7 +156,7 @@ public override InheritBool GetBorderDraw(PaletteState state) => /// /// Palette value should be applicable to this state. /// Border rounding. - public override int GetBorderRounding(PaletteState state) => _redirect.GetBorderRounding(Style, state); + public override float GetBorderRounding(PaletteState state) => _redirect.GetBorderRounding(Style, state); /// /// Gets a border image from the redirector. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderToPalette.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderToPalette.cs index 420f8ef53..c4075cd73 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderToPalette.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderToPalette.cs @@ -162,10 +162,7 @@ public int GetBorderWidth(PaletteState state) /// /// Palette value should be applicable to this state. /// Border rounding. - public int GetBorderRounding(PaletteState state) - { - return _palette.GetBorderRounding(BorderStyle, state); - } + public float GetBorderRounding(PaletteState state) => _palette.GetBorderRounding(BorderStyle, state); #endregion #region Image diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs index 7b1d8da5e..35b0a5cae 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs @@ -227,8 +227,8 @@ public interface IPalette /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - int GetBorderRounding(PaletteBorderStyle style, PaletteState state); + /// Float rounding. + float GetBorderRounding(PaletteBorderStyle style, PaletteState state); /// /// Gets a border image. @@ -1222,7 +1222,7 @@ public interface IPaletteBorder /// /// Palette value should be applicable to this state. /// Integer rounding. - int GetBorderRounding(PaletteState state); + float GetBorderRounding(PaletteState state); /// /// Gets a border image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs index b5d27cfc8..3c30a007f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs @@ -60,7 +60,7 @@ public PaletteRedirect() : this(null) { } - + /// /// Initialize a new instance of the PaletteRedirect class. /// @@ -322,8 +322,8 @@ public virtual int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public virtual int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public virtual float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { return _target.GetBorderRounding(style, state); } @@ -483,7 +483,7 @@ public virtual PaletteTextHotkeyPrefix GetContentShortTextPrefix(PaletteContentS { return _target.GetContentShortTextPrefix(style, state); } - + /// /// Gets the flag indicating if multiline text is allowed for short text. /// @@ -692,7 +692,7 @@ public virtual PaletteTextHotkeyPrefix GetContentLongTextPrefix(PaletteContentSt { return _target.GetContentLongTextPrefix(style, state); } - + /// /// Gets the horizontal relative alignment of the long text. /// @@ -848,7 +848,7 @@ public virtual int GetMetricInt(PaletteState state, PaletteMetricInt metric) { return _target.GetMetricInt(state, metric); } - + /// /// Gets a boolean metric value. /// @@ -1210,7 +1210,7 @@ public virtual Color GetRibbonMinimizeBarLight(PaletteState state) { return _target.GetRibbonMinimizeBarLight(state); } - + /// /// Gets the color for the tab separator. /// @@ -1271,7 +1271,7 @@ public virtual Color GetRibbonQATButtonLight(PaletteState state) return _target.GetRibbonQATButtonLight(state); } #endregion - + #region RibbonBack /// /// Gets the method used to draw the background of a ribbon item. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorder.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorder.cs index 488126860..142fbd737 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorder.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorder.cs @@ -265,8 +265,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { IPaletteBorder inherit = GetInherit(state); @@ -310,7 +310,7 @@ public override PaletteRectangleAlign GetBorderImageAlign(PaletteBorderStyle sty IPaletteBorder inherit = GetInherit(state); return inherit?.GetBorderImageAlign(state) ?? Target.GetBorderImageAlign(style, state); - } + } #endregion #region Implementation diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs index 163ba9248..29efc4d2d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs @@ -198,8 +198,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { return Target.GetBorderRounding(style, state); } @@ -241,7 +241,7 @@ public override PaletteRectangleAlign GetBorderImageAlign(PaletteBorderStyle sty PaletteBorderEdge inherit = GetInherit(state); return inherit?.GetBackImageAlign(state) ?? Target.GetBorderImageAlign(style, state); - } + } #endregion #region Implementation diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectDouble.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectDouble.cs index 53b96c06a..13ba51381 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectDouble.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectDouble.cs @@ -558,8 +558,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { IPaletteDouble inherit = GetInherit(state); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectGrids.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectGrids.cs index 2dffc65ff..468cc54fb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectGrids.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectGrids.cs @@ -293,8 +293,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { IPaletteBorder inherit = GetInheritBorder(style, state); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectTriple.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectTriple.cs index 7c1eba3dd..356138501 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectTriple.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectTriple.cs @@ -591,8 +591,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { IPaletteTriple inherit = GetInherit(state); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs index 147997aa7..7864b3a0d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs @@ -71,7 +71,7 @@ public PaletteTabBorder(IPaletteBorder inherit, /// [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] - public new int Rounding + public new float Rounding { get => base.Rounding; set => base.Rounding = value; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteBase.cs index 8f72608e1..704e3f8f8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteBase.cs @@ -84,7 +84,7 @@ public PaletteBase() /// Renderer to use for drawing palette settings. public abstract IRenderer GetRenderer(); #endregion - + #region Back /// /// Gets a value indicating if background should be drawn. @@ -141,7 +141,7 @@ public PaletteBase() /// Palette value should be applicable to this state. /// Angle used for color drawing. public abstract float GetBackColorAngle(PaletteBackStyle style, PaletteState state); - + /// /// Gets a background image. /// @@ -245,8 +245,8 @@ public PaletteBase() /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public abstract int GetBorderRounding(PaletteBorderStyle style, PaletteState state); + /// Float rounding. + public abstract float GetBorderRounding(PaletteBorderStyle style, PaletteState state); /// /// Gets a border image. @@ -505,7 +505,7 @@ public PaletteBase() /// Palette value should be applicable to this state. /// PaletteTextPrefix value. public abstract PaletteTextHotkeyPrefix GetContentLongTextPrefix(PaletteContentStyle style, PaletteState state); - + /// /// Gets the flag indicating if multiline text is allowed for long text. /// @@ -636,7 +636,7 @@ public PaletteBase() /// Integer value. public abstract int GetMetricInt(PaletteState state, PaletteMetricInt metric); - /// + /// /// Gets a boolean metric value. /// /// Palette value should be applicable to this state. @@ -660,7 +660,7 @@ public PaletteBase() /// Is the node expanded /// Appropriate image for drawing; otherwise null. public abstract Image GetTreeViewImage(bool expanded); - + /// /// Gets a check box image appropriate for the provided state. /// @@ -1253,7 +1253,7 @@ public static Color MergeColors(Color color1, float percent1, Color color2, float percent2, Color color3, float percent3) { - return CommonHelper.MergeColors(color1, percent1, + return CommonHelper.MergeColors(color1, percent1, color2, percent2, color3, percent3); } @@ -1342,7 +1342,7 @@ internal void UserPreferenceChanged() { OnUserPreferenceChanged(this, new UserPreferenceChangedEventArgs(UserPreferenceCategory.General)); } - + /// /// Handle a change in the user preferences. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2007Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2007Base.cs index 5a3787012..5171faf0f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2007Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2007Base.cs @@ -3720,8 +3720,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// Border style. /// Palette value should be applicable to this state. /// - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // We do not provide override values if (CommonHelper.IsOverrideState(state)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2010Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2010Base.cs index 03ef9e37e..c97ff70e6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2010Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2010Base.cs @@ -3687,8 +3687,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // We do not provide override values if (CommonHelper.IsOverrideState(state)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2013Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2013Base.cs index 9a2d697e1..8331b8749 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2013Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice2013Base.cs @@ -3696,8 +3696,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // We do not provide override values if (CommonHelper.IsOverrideState(state)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice365Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice365Base.cs index f1a66e426..765da1f9c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice365Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteOffice365Base.cs @@ -3697,8 +3697,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // We do not provide override values if (CommonHelper.IsOverrideState(state)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteProfessionalSystem.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteProfessionalSystem.cs index 46c0c251d..ae034e598 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteProfessionalSystem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteProfessionalSystem.cs @@ -3162,8 +3162,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // We do not provide override values if (CommonHelper.IsOverrideState(state)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteSparkleBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteSparkleBase.cs index ee9e29fac..c2248b428 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteSparkleBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/PaletteSparkleBase.cs @@ -3440,8 +3440,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { // We do not provide override values if (CommonHelper.IsOverrideState(state)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBorderEdgeRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBorderEdgeRedirect.cs index 7ace93993..3c415bde5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBorderEdgeRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBorderEdgeRedirect.cs @@ -322,7 +322,7 @@ public int GetBorderWidth(PaletteState state) /// /// Palette value should be applicable to this state. /// Border rounding. - public int GetBorderRounding(PaletteState state) + public float GetBorderRounding(PaletteState state) { return _inherit.GetBorderRounding(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectCommon.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectCommon.cs index c2bb92b56..2cdf48966 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectCommon.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectCommon.cs @@ -415,8 +415,8 @@ public override int GetBorderWidth(PaletteBorderStyle style, PaletteState state) /// /// Border style. /// Palette value should be applicable to this state. - /// Integer rounding. - public override int GetBorderRounding(PaletteBorderStyle style, PaletteState state) + /// Float rounding. + public override float GetBorderRounding(PaletteBorderStyle style, PaletteState state) { IPaletteTriple inherit = GetInherit(state); if (inherit != null) diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs index 69229ee66..cc57d4409 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs @@ -3366,7 +3366,7 @@ public override bool EvalTransparentPaint(IPaletteBack paletteBack, IPaletteBorder paletteBorder, PaletteState state) { - int rounding = paletteBorder.GetBorderRounding(state); + float rounding = paletteBorder.GetBorderRounding(state); // If the border takes up some visual space if (paletteBorder.GetBorderWidth(state) > 0) @@ -3844,7 +3844,7 @@ private static GraphicsPath CreateBorderBackPath(bool forBorder, Rectangle rect, PaletteDrawBorders borders, int borderWidth, - int borderRounding, + float borderRounding, bool smoothing, int variant) { @@ -3854,7 +3854,7 @@ private static GraphicsPath CreateBorderBackPath(bool forBorder, if ((rect.Width > 0) && (rect.Height > 0)) { // Only use a rounding that will fit inside the rect - int rounding = Math.Min(borderRounding, Math.Min(rect.Width / 2, rect.Height / 2) - borderWidth); + float rounding = Math.Min(borderRounding, Math.Min(rect.Width / 2, rect.Height / 2) - borderWidth); // Shrink the rect by half the width of the pen, because the pen will // draw half the distance overlapping each side of the centre anyway. @@ -3885,8 +3885,8 @@ private static GraphicsPath CreateBorderBackPath(bool forBorder, } // Find the width/height of the arc box - int arcLength = rounding * 2; - int arcLength1 = arcLength + 1; + float arcLength = rounding * 2; + float arcLength1 = arcLength + 1; // If drawing all the four borders use a single routine if (CommonHelper.HasAllBorders(borders)) @@ -3953,10 +3953,10 @@ private static void CreateAllBorderBackPath(bool middle, GraphicsPath borderPath, Rectangle rect, int width, - int rounding, + float rounding, bool forBorder, - int arcLength, - int arcLength1) + float arcLength, + float arcLength1) { // If there is no room for any rounding effect... if (rounding <= 0) @@ -4088,7 +4088,7 @@ private static void CreateBorderBackPathOnly(bool middle, PaletteDrawBorders borders, GraphicsPath borderPath, Rectangle rect, - int arcLength, + float arcLength, int variant) { // Reduce the width and height by 1 pixel for drawing into rectangle @@ -4198,7 +4198,7 @@ private static void CreateBorderBackPathOnlyClosed(bool middle, PaletteDrawBorders borders, GraphicsPath borderPath, Rectangle rect, - int arcLength, + float arcLength, int variant) { // Reduce the width and height by 1 pixel for drawing into rectangle @@ -4289,7 +4289,7 @@ private static void CreateBorderBackPathComplete(bool middle, PaletteDrawBorders borders, GraphicsPath borderPath, Rectangle rect, - int arcLength) + float arcLength) { // We create the path using a floating point rectangle RectangleF rectF = new(rect.X, rect.Y, rect.Width, rect.Height); diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/RoundedRectangleF.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/RoundedRectangleF.cs new file mode 100644 index 000000000..11e30669d --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/RoundedRectangleF.cs @@ -0,0 +1,67 @@ +#region BSD License +/* + * + * Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE) + * © Component Factory Pty Ltd, 2006 - 2016, 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), et al. 2017 - 2021. All rights reserved. + * + */ +#endregion + +namespace Krypton.Toolkit +{ + /// + /// Code from: https://github.com/aalitor/AltoControls/blob/on-development/AltoControls/Helpers/RoundedRectangleF.cs + /// + public class RoundedRectangleF + { + #region Variables + private float _x, _y, _width, _height, _radius; + + private GraphicsPath _graphicsPath; + + private Point _location; + #endregion + + #region Properties + public GraphicsPath Path => _graphicsPath; + + public RectangleF Rect => new RectangleF(_x, _y, _width, _height); + + public float Radius { get => _radius; set => _radius = value; } + #endregion + + #region Constructors + public RoundedRectangleF(float width, float height, float radius, float x = 0, float y = 0) + { + + _location = new Point(0, 0); + + _radius = radius; + _x = x; + _y = y; + _width = width; + _height = height; + _graphicsPath = new GraphicsPath(); + if (radius <= 0) + { + _graphicsPath.AddRectangle(new RectangleF(x, y, width, height)); + return; + } + RectangleF upperLeftRect = new RectangleF(x, y, 2 * radius, 2 * radius); + RectangleF upperRightRect = new RectangleF(width - 2 * radius - 1, x, 2 * radius, 2 * radius); + RectangleF lowerLeftRect = new RectangleF(x, height - 2 * radius - 1, 2 * radius, 2 * radius); + RectangleF lowerRightRect = new RectangleF(width - 2 * radius - 1, height - 2 * radius - 1, 2 * radius, 2 * radius); + + _graphicsPath.AddArc(upperLeftRect, 180, 90); + _graphicsPath.AddArc(upperRightRect, 270, 90); + _graphicsPath.AddArc(lowerRightRect, 0, 90); + _graphicsPath.AddArc(lowerLeftRect, 90, 90); + _graphicsPath.CloseAllFigures(); + + } + #endregion + } +} \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/View Base/ViewBase.cs b/Source/Krypton Components/Krypton.Toolkit/View Base/ViewBase.cs index aafeb765d..150228b4b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Base/ViewBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Base/ViewBase.cs @@ -32,6 +32,7 @@ public abstract class ViewBase : GlobalId, private bool _fixed; private ViewBase _enableDependantView; private Rectangle _clientRect; + private RectangleF _clientRectF; private PaletteState _fixedState; private PaletteState _elementState; @@ -170,6 +171,13 @@ public virtual Rectangle ClientRectangle set => _clientRect = value; } + public virtual RectangleF ClientRectangleF + { + [DebuggerStepThrough] + get => _clientRectF; + set => _clientRectF = value; + } + /// /// Gets and sets the location of the view inside the parent view. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutContext.cs b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutContext.cs index 1f493fb71..3982a74cd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutContext.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutContext.cs @@ -35,7 +35,7 @@ public ViewLayoutContext(Control control, : this(null, control, control, null, renderer, control.Size) { } - + /// /// Initialize a new instance of the ViewContext class. /// @@ -44,7 +44,7 @@ public ViewLayoutContext(Control control, /// Control used for aligning elements. /// Rendering provider. public ViewLayoutContext(ViewManager manager, - Control control, + Control control, Control alignControl, IRenderer renderer) : this(manager, control, alignControl, null, renderer, control.Size) @@ -113,6 +113,8 @@ public ViewLayoutContext(ViewManager manager, /// public Rectangle DisplayRectangle { get; set; } + public RectangleF DisplayRectangleF { get; set; } + #endregion } } diff --git a/build-2022.cmd b/build-2022.cmd new file mode 100644 index 000000000..618cb6146 --- /dev/null +++ b/build-2022.cmd @@ -0,0 +1,40 @@ +@echo off + +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build + +echo "Unable to detect suitable environment. Check if VS 2022 is installed." + +pause + +:vs17prev +set msbuildpath=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin +goto build + +:vs17ent +set msbuildpath=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin +goto build + +:vs17pro +set msbuildpath=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin +goto build + +:vs17com +set msbuildpath=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin +goto build + +:vs17build +set msbuildpath=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin +goto build + +:build +set targets=Build +if not "%~1" == "" set targets=%~1 +"%msbuildpath%\msbuild.exe" /t:%targets% build.proj /fl /flp:logfile=build.log + +echo Plese alter file '{Path}\Directory.Build.props' before executing 'publish.cmd' script! + +pause \ No newline at end of file diff --git a/debug.proj b/debug.proj index 9a842e707..3a5dfd8d8 100644 --- a/debug.proj +++ b/debug.proj @@ -26,52 +26,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file