Merge pull request #199 from Krypton-Suite/alpha-fr197

Alpha fr197
Krypton-Suite · Jul 24, 2021 · 25570d1 · 25570d1
2 parents 4c6b6a3 + 6d34219
commit 25570d1
Show file tree

Hide file tree

Showing 57 changed files with 303 additions and 229 deletions.
diff --git a/Krypton.png b/Krypton.png
diff --git a/README.md b/README.md
@@ -53,21 +53,6 @@
 | <img src="https://img.shields.io/badge/Module-Workspace-green.svg?style=flat-square" /> | ![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) |
 | <img src="https://img.shields.io/badge/Module-Workspace Lite-green.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 | 
-|---|---|---|
-| <img src="https://img.shields.io/badge/Module-Toolkit-00ACED.svg?style=flat-square" /> | ![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) |
-| <img src="https://img.shields.io/badge/Module-Toolkit Lite-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Docking-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Docking Lite-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Navigator-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Navigator Lite-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Ribbon-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Ribbon Lite-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Workspace-00ACED.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) |
-| <img src="https://img.shields.io/badge/Module-Workspace Lite-00ACED.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) |
-
 =======
 
 # <img src="https://github.com/Wagnerp/Krypton-Toolkit-Suite-NET-Core/blob/master/Assets/PNG/Help/Help_1_48_x_48.png" /><a href="https://krypton-suite.github.io/Standard-Toolkit-Online-Help/Source/Help/Output/index.html">Online Help</a>
@@ -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
@@ -7,7 +7,7 @@
         <PackageId Condition="'$(TFMs)' == 'lite'">$(PackageId).Canary.Lite</PackageId>
         <Description Condition="'$(TFMs)' == '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.
         </Description>
 		<PackageId Condition="'$(TFMs)' == 'all'">$(PackageId).Canary</PackageId>

diff --git 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,19 +76,23 @@ 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}
 		{F379A7A0-66CC-4295-90E6-2471433D12B8} = {7639F185-EAEE-4483-BE71-7EC62EDDBEA9}
 		{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
@@ -67,12 +67,12 @@ public VisualOrientation Orientation
         /// <summary>
         /// Gets the rounding value to apply on the edges.
         /// </summary>
-        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
@@ -244,7 +244,7 @@ public int GetBorderWidth(PaletteState state)
         /// </summary>
         /// <param name="state">Palette value should be applicable to this state.</param>
         /// <returns>Border rounding.</returns>
-        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
@@ -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()
         /// <summary>Gets or sets the corner rounding radius.</summary>
         /// <value>The corner rounding radius.</value>
         [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(); } }
 
         /// <summary>Gets or sets the active control on the container control.</summary>
         [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
@@ -41,6 +41,8 @@ public class KryptonGroup : VisualControlContainment
         /// </summary>
         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
@@ -49,6 +49,8 @@ public class KryptonGroupBox : VisualControlContainment
         /// </summary>
         public KryptonGroupBox()
         {
+            SetStyle(ControlStyles.SupportsTransparentBackColor | ControlStyles.OptimizedDoubleBuffer, true);
+
             // Set default values
             _captionStyle = LabelStyle.GroupBoxCaption;
             _captionEdge = VisualOrientation.Top;