diff --git a/Documents/Changelog/Changelog.md b/Documents/Changelog/Changelog.md index 4931a77fb..12c6f89f0 100644 --- a/Documents/Changelog/Changelog.md +++ b/Documents/Changelog/Changelog.md @@ -3,6 +3,7 @@ ======= ## 2025-11-xx - Build 2511 - November 2025 +* Resolved [#1946](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1946), ButtonSpecs do not scale anymore! * Resolved [#1940](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1940), In V95 KContextMenuItem no longer stores the Text value in the designer !! * Resolved [#1938](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1938), `KryptonTextBox` CueHint Text* Implemented [#1928](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1928), A proper exception dialog - To invoke, use `KryptonExceptionDialog` @@ -36,6 +37,7 @@ ======= ## 2025-02-01 - Build 2502 (Version 95 - Patch 1) - February 2025 +* Resolved [#1946](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1946), ButtonSpecs do not scale anymore! * Resolved [#1940](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1940), In V95 KContextMenuItem no longer stores the Text value in the designer !! * Resolved [#1938](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1938), `KryptonTextBox` CueHint Text * Resolved [#1905](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1905), `Sparkle` Themes have an issue with the Background @@ -218,6 +220,7 @@ ======= # 2025-02-01 - Build 2502 (Patch 5) - February 2025 +* Resolved [#1946](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1946), ButtonSpecs do not scale anymore! * Resolved [#1905](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1905), `Sparkle` Themes have an issue with the Background * Resolved [#980](https://github.com/Krypton-Suite/Standard-Toolkit/issues/980), `KryptonDockableNavigator` with pages without `AllowConfigSave` flag are incorrectly saved * Resolved [#1910](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1910), `Workspace Persistence` -> "Save to array" Causes an exception in `Toolkit.XmlHelper.Image.Save` diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs index ee7103cdd..6a62215e8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs @@ -319,12 +319,12 @@ protected virtual void OnFinishDelegate(object? sender, EventArgs? e) => public Image? GetImage(PaletteState state) { // Get value from button spec passing inheritance redirector - var baseImage = ButtonSpec.GetImage(_redirector, state); + Image? baseImage = ButtonSpec.GetImage(_redirector, state); - // No need to perform scaling as it will be done @ - // $\Standard-Toolkit\Source\Krypton Components\Krypton.Toolkit\Rendering\RenderStandard.cs - // line 5779: memento.Image = CommonHelper.ScaleImageForSizedDisplay(memento.Image, currentWidth, currentHeight); - return baseImage; + return (baseImage != null) + ? CommonHelper.ScaleImageForSizedDisplay(baseImage, baseImage.Width * _controller!.Target.FactorDpiX, + baseImage.Height * _controller!.Target.FactorDpiY) + : null; } /// diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs index 8eace4e25..67541437d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs @@ -24,7 +24,7 @@ namespace Krypton.Toolkit public class KryptonContextMenuHeading : KryptonContextMenuItemBase { #region Instance Fields - private string? _extraText; + private string _extraText; private Image? _image; private Color _imageTransparentColor; private readonly PaletteRedirectTriple _redirectHeading; @@ -165,17 +165,17 @@ public string Text [Description(@"Heading menu item extra text.")] [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))] [Localizable(true)] - [DefaultValue(null)] + [DefaultValue("")] [AllowNull] public string ExtraText { - get => _extraText ?? string.Empty; + get => _extraText; set { if (_extraText != value) { - _extraText = value; + _extraText = value ?? string.Empty; OnPropertyChanged(new PropertyChangedEventArgs(nameof(ExtraText))); } } @@ -224,7 +224,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => (_imageTransparentColor == null) || !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); + private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); /// /// Gets access to the header instance specific appearance values. diff --git a/Source/Krypton Components/TestForm/Bug833Test.Designer.cs b/Source/Krypton Components/TestForm/Bug833Test.Designer.cs index 96c6ebed4..4946018cc 100644 --- a/Source/Krypton Components/TestForm/Bug833Test.Designer.cs +++ b/Source/Krypton Components/TestForm/Bug833Test.Designer.cs @@ -75,21 +75,22 @@ private void InitializeComponent() this.kryptonThemeComboBox1.DefaultPalette = Krypton.Toolkit.PaletteMode.Microsoft365Blue; this.kryptonThemeComboBox1.DropDownWidth = 378; this.kryptonThemeComboBox1.IntegralHeight = false; - this.kryptonThemeComboBox1.Location = new System.Drawing.Point(13, 13); + this.kryptonThemeComboBox1.Location = new System.Drawing.Point(17, 16); + this.kryptonThemeComboBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonThemeComboBox1.Name = "kryptonThemeComboBox1"; - this.kryptonThemeComboBox1.Size = new System.Drawing.Size(378, 22); + this.kryptonThemeComboBox1.Size = new System.Drawing.Size(504, 26); this.kryptonThemeComboBox1.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; this.kryptonThemeComboBox1.TabIndex = 0; // // kryptonGroupBox1 // - this.kryptonGroupBox1.Location = new System.Drawing.Point(13, 42); - this.kryptonGroupBox1.Name = "kryptonGroupBox1"; + this.kryptonGroupBox1.Location = new System.Drawing.Point(17, 52); + this.kryptonGroupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); // // kryptonGroupBox1.Panel // this.kryptonGroupBox1.Panel.Controls.Add(this.kryptonPanel1); - this.kryptonGroupBox1.Size = new System.Drawing.Size(378, 382); + this.kryptonGroupBox1.Size = new System.Drawing.Size(504, 470); this.kryptonGroupBox1.TabIndex = 1; this.kryptonGroupBox1.Values.Heading = "Controls in a Panel"; // @@ -105,89 +106,96 @@ private void InitializeComponent() this.kryptonPanel1.Controls.Add(this.kryptonCheckBox1); this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.kryptonPanel1.Location = new System.Drawing.Point(0, 0); + this.kryptonPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonPanel1.Name = "kryptonPanel1"; - this.kryptonPanel1.Size = new System.Drawing.Size(374, 358); + this.kryptonPanel1.Size = new System.Drawing.Size(500, 442); this.kryptonPanel1.TabIndex = 0; // // kryptonLabel2 // this.kryptonLabel2.Enabled = false; - this.kryptonLabel2.Location = new System.Drawing.Point(111, 99); + this.kryptonLabel2.Location = new System.Drawing.Point(148, 122); + this.kryptonLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel2.Name = "kryptonLabel2"; - this.kryptonLabel2.Size = new System.Drawing.Size(90, 20); + this.kryptonLabel2.Size = new System.Drawing.Size(111, 24); this.kryptonLabel2.TabIndex = 49; this.kryptonLabel2.Values.Text = "Label Disabled"; // // kryptonLabel1 // - this.kryptonLabel1.Location = new System.Drawing.Point(14, 99); + this.kryptonLabel1.Location = new System.Drawing.Point(19, 122); + this.kryptonLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel1.Name = "kryptonLabel1"; - this.kryptonLabel1.Size = new System.Drawing.Size(86, 20); + this.kryptonLabel1.Size = new System.Drawing.Size(106, 24); this.kryptonLabel1.TabIndex = 48; this.kryptonLabel1.Values.Text = "Label Enabled"; // // kryptonLinkLabel2 // this.kryptonLinkLabel2.Enabled = false; - this.kryptonLinkLabel2.Location = new System.Drawing.Point(99, 73); + this.kryptonLinkLabel2.Location = new System.Drawing.Point(132, 90); + this.kryptonLinkLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLinkLabel2.Name = "kryptonLinkLabel2"; - this.kryptonLinkLabel2.Size = new System.Drawing.Size(83, 20); + this.kryptonLinkLabel2.Size = new System.Drawing.Size(102, 24); this.kryptonLinkLabel2.TabIndex = 47; this.kryptonLinkLabel2.Values.Text = "Link Disabled"; // // kryptonLinkLabel1 // - this.kryptonLinkLabel1.Location = new System.Drawing.Point(14, 73); + this.kryptonLinkLabel1.Location = new System.Drawing.Point(19, 90); + this.kryptonLinkLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLinkLabel1.Name = "kryptonLinkLabel1"; - this.kryptonLinkLabel1.Size = new System.Drawing.Size(79, 20); + this.kryptonLinkLabel1.Size = new System.Drawing.Size(98, 24); this.kryptonLinkLabel1.TabIndex = 46; this.kryptonLinkLabel1.Values.Text = "Link Enabled"; // // kryptonRadioButton2 // this.kryptonRadioButton2.Enabled = false; - this.kryptonRadioButton2.Location = new System.Drawing.Point(89, 45); - this.kryptonRadioButton2.Margin = new System.Windows.Forms.Padding(2); + this.kryptonRadioButton2.Location = new System.Drawing.Point(119, 55); + this.kryptonRadioButton2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonRadioButton2.Name = "kryptonRadioButton2"; - this.kryptonRadioButton2.Size = new System.Drawing.Size(70, 20); + this.kryptonRadioButton2.Size = new System.Drawing.Size(82, 24); this.kryptonRadioButton2.TabIndex = 45; this.kryptonRadioButton2.Values.Text = "Disabled"; // // kryptonRadioButton1 // - this.kryptonRadioButton1.Location = new System.Drawing.Point(14, 45); - this.kryptonRadioButton1.Margin = new System.Windows.Forms.Padding(2); + this.kryptonRadioButton1.Location = new System.Drawing.Point(19, 55); + this.kryptonRadioButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonRadioButton1.Name = "kryptonRadioButton1"; - this.kryptonRadioButton1.Size = new System.Drawing.Size(66, 20); + this.kryptonRadioButton1.Size = new System.Drawing.Size(78, 24); this.kryptonRadioButton1.TabIndex = 44; this.kryptonRadioButton1.Values.Text = "Enabled"; // // kryptonCheckBox2 // this.kryptonCheckBox2.Enabled = false; - this.kryptonCheckBox2.Location = new System.Drawing.Point(89, 13); + this.kryptonCheckBox2.Location = new System.Drawing.Point(119, 16); + this.kryptonCheckBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonCheckBox2.Name = "kryptonCheckBox2"; - this.kryptonCheckBox2.Size = new System.Drawing.Size(71, 20); + this.kryptonCheckBox2.Size = new System.Drawing.Size(83, 24); this.kryptonCheckBox2.TabIndex = 43; this.kryptonCheckBox2.Values.Text = "Disabled"; // // kryptonCheckBox1 // - this.kryptonCheckBox1.Location = new System.Drawing.Point(15, 14); + this.kryptonCheckBox1.Location = new System.Drawing.Point(20, 17); + this.kryptonCheckBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonCheckBox1.Name = "kryptonCheckBox1"; - this.kryptonCheckBox1.Size = new System.Drawing.Size(67, 20); + this.kryptonCheckBox1.Size = new System.Drawing.Size(79, 24); this.kryptonCheckBox1.TabIndex = 42; this.kryptonCheckBox1.Values.Text = "Enabled"; // // kryptonGroupBox2 // - this.kryptonGroupBox2.Location = new System.Drawing.Point(395, 42); - this.kryptonGroupBox2.Name = "kryptonGroupBox2"; + this.kryptonGroupBox2.Location = new System.Drawing.Point(527, 52); + this.kryptonGroupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); // // kryptonGroupBox2.Panel // this.kryptonGroupBox2.Panel.Controls.Add(this.kryptonNavigator1); - this.kryptonGroupBox2.Size = new System.Drawing.Size(378, 382); + this.kryptonGroupBox2.Size = new System.Drawing.Size(504, 470); this.kryptonGroupBox2.TabIndex = 2; this.kryptonGroupBox2.Values.Heading = "Controls in a Navigator"; // @@ -207,14 +215,14 @@ private void InitializeComponent() this.kryptonNavigator1.ControlKryptonFormFeatures = false; this.kryptonNavigator1.Dock = System.Windows.Forms.DockStyle.Fill; this.kryptonNavigator1.Location = new System.Drawing.Point(0, 0); - this.kryptonNavigator1.Name = "kryptonNavigator1"; + this.kryptonNavigator1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonNavigator1.NavigatorMode = Krypton.Navigator.NavigatorMode.BarTabGroup; this.kryptonNavigator1.Owner = null; this.kryptonNavigator1.PageBackStyle = Krypton.Toolkit.PaletteBackStyle.PanelClient; this.kryptonNavigator1.Pages.AddRange(new Krypton.Navigator.KryptonPage[] { this.kryptonPage1}); this.kryptonNavigator1.SelectedIndex = 0; - this.kryptonNavigator1.Size = new System.Drawing.Size(374, 358); + this.kryptonNavigator1.Size = new System.Drawing.Size(500, 442); this.kryptonNavigator1.TabIndex = 0; this.kryptonNavigator1.Text = "kryptonNavigator1"; // @@ -231,9 +239,10 @@ private void InitializeComponent() this.kryptonPage1.Controls.Add(this.kryptonCheckBox4); this.kryptonPage1.Flags = 65534; this.kryptonPage1.LastVisibleSet = true; - this.kryptonPage1.MinimumSize = new System.Drawing.Size(150, 50); + this.kryptonPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonPage1.MinimumSize = new System.Drawing.Size(200, 62); this.kryptonPage1.Name = "kryptonPage1"; - this.kryptonPage1.Size = new System.Drawing.Size(372, 331); + this.kryptonPage1.Size = new System.Drawing.Size(498, 411); this.kryptonPage1.Text = "kryptonPage1"; this.kryptonPage1.ToolTipTitle = "Page ToolTip"; this.kryptonPage1.UniqueName = "8f3032b1b7a343c0a10dc553a5bc6aa7"; @@ -241,70 +250,76 @@ private void InitializeComponent() // kryptonLabel3 // this.kryptonLabel3.Enabled = false; - this.kryptonLabel3.Location = new System.Drawing.Point(112, 106); + this.kryptonLabel3.Location = new System.Drawing.Point(149, 130); + this.kryptonLabel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel3.Name = "kryptonLabel3"; - this.kryptonLabel3.Size = new System.Drawing.Size(90, 20); + this.kryptonLabel3.Size = new System.Drawing.Size(111, 24); this.kryptonLabel3.TabIndex = 51; this.kryptonLabel3.Values.Text = "Label Disabled"; // // kryptonLabel4 // - this.kryptonLabel4.Location = new System.Drawing.Point(15, 106); + this.kryptonLabel4.Location = new System.Drawing.Point(20, 130); + this.kryptonLabel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel4.Name = "kryptonLabel4"; - this.kryptonLabel4.Size = new System.Drawing.Size(86, 20); + this.kryptonLabel4.Size = new System.Drawing.Size(106, 24); this.kryptonLabel4.TabIndex = 50; this.kryptonLabel4.Values.Text = "Label Enabled"; // // kryptonLinkLabel3 // this.kryptonLinkLabel3.Enabled = false; - this.kryptonLinkLabel3.Location = new System.Drawing.Point(101, 80); + this.kryptonLinkLabel3.Location = new System.Drawing.Point(135, 98); + this.kryptonLinkLabel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLinkLabel3.Name = "kryptonLinkLabel3"; - this.kryptonLinkLabel3.Size = new System.Drawing.Size(83, 20); + this.kryptonLinkLabel3.Size = new System.Drawing.Size(102, 24); this.kryptonLinkLabel3.TabIndex = 49; this.kryptonLinkLabel3.Values.Text = "Link Disabled"; // // kryptonLinkLabel4 // - this.kryptonLinkLabel4.Location = new System.Drawing.Point(16, 80); + this.kryptonLinkLabel4.Location = new System.Drawing.Point(21, 98); + this.kryptonLinkLabel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLinkLabel4.Name = "kryptonLinkLabel4"; - this.kryptonLinkLabel4.Size = new System.Drawing.Size(79, 20); + this.kryptonLinkLabel4.Size = new System.Drawing.Size(98, 24); this.kryptonLinkLabel4.TabIndex = 48; this.kryptonLinkLabel4.Values.Text = "Link Enabled"; // // kryptonRadioButton3 // this.kryptonRadioButton3.Enabled = false; - this.kryptonRadioButton3.Location = new System.Drawing.Point(90, 50); - this.kryptonRadioButton3.Margin = new System.Windows.Forms.Padding(2); + this.kryptonRadioButton3.Location = new System.Drawing.Point(120, 62); + this.kryptonRadioButton3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonRadioButton3.Name = "kryptonRadioButton3"; - this.kryptonRadioButton3.Size = new System.Drawing.Size(70, 20); + this.kryptonRadioButton3.Size = new System.Drawing.Size(82, 24); this.kryptonRadioButton3.TabIndex = 45; this.kryptonRadioButton3.Values.Text = "Disabled"; // // kryptonRadioButton4 // - this.kryptonRadioButton4.Location = new System.Drawing.Point(15, 50); - this.kryptonRadioButton4.Margin = new System.Windows.Forms.Padding(2); + this.kryptonRadioButton4.Location = new System.Drawing.Point(20, 62); + this.kryptonRadioButton4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonRadioButton4.Name = "kryptonRadioButton4"; - this.kryptonRadioButton4.Size = new System.Drawing.Size(66, 20); + this.kryptonRadioButton4.Size = new System.Drawing.Size(78, 24); this.kryptonRadioButton4.TabIndex = 44; this.kryptonRadioButton4.Values.Text = "Enabled"; // // kryptonCheckBox3 // this.kryptonCheckBox3.Enabled = false; - this.kryptonCheckBox3.Location = new System.Drawing.Point(90, 18); + this.kryptonCheckBox3.Location = new System.Drawing.Point(120, 22); + this.kryptonCheckBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonCheckBox3.Name = "kryptonCheckBox3"; - this.kryptonCheckBox3.Size = new System.Drawing.Size(71, 20); + this.kryptonCheckBox3.Size = new System.Drawing.Size(83, 24); this.kryptonCheckBox3.TabIndex = 43; this.kryptonCheckBox3.Values.Text = "Disabled"; // // kryptonCheckBox4 // - this.kryptonCheckBox4.Location = new System.Drawing.Point(16, 19); + this.kryptonCheckBox4.Location = new System.Drawing.Point(21, 23); + this.kryptonCheckBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonCheckBox4.Name = "kryptonCheckBox4"; - this.kryptonCheckBox4.Size = new System.Drawing.Size(67, 20); + this.kryptonCheckBox4.Size = new System.Drawing.Size(79, 24); this.kryptonCheckBox4.TabIndex = 42; this.kryptonCheckBox4.Values.Text = "Enabled"; // @@ -314,20 +329,24 @@ private void InitializeComponent() this.kryptonPanel2.Controls.Add(this.kryptonGroupBox1); this.kryptonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.kryptonPanel2.Location = new System.Drawing.Point(0, 0); + this.kryptonPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonPanel2.Name = "kryptonPanel2"; - this.kryptonPanel2.Size = new System.Drawing.Size(783, 436); + this.kryptonPanel2.Size = new System.Drawing.Size(1056, 527); this.kryptonPanel2.TabIndex = 3; // // Bug833Test // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(783, 436); + this.ClientSize = new System.Drawing.Size(1056, 527); this.Controls.Add(this.kryptonThemeComboBox1); this.Controls.Add(this.kryptonPanel2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "Bug833Test"; + this.StateCommon.Border.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.StateCommon.Border.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.Text = "Bug833Test"; ((System.ComponentModel.ISupportInitialize)(this.kryptonThemeComboBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.kryptonGroupBox1.Panel)).EndInit(); diff --git a/Source/Krypton Components/TestForm/ButtonsTest.Designer.cs b/Source/Krypton Components/TestForm/ButtonsTest.Designer.cs index 3e33baf27..b2b702640 100644 --- a/Source/Krypton Components/TestForm/ButtonsTest.Designer.cs +++ b/Source/Krypton Components/TestForm/ButtonsTest.Designer.cs @@ -153,6 +153,18 @@ private void InitializeComponent() this.kryptonContextMenuItem2, this.kryptonContextMenuItem3}); // + // kryptonContextMenuItem1 + // + this.kryptonContextMenuItem1.Text = "Choice 1"; + // + // kryptonContextMenuItem2 + // + this.kryptonContextMenuItem2.Text = "Choice 2"; + // + // kryptonContextMenuItem3 + // + this.kryptonContextMenuItem3.Text = "Choice 3"; + // // kryptonButton6 // this.kryptonButton6.Enabled = false; diff --git a/Source/Krypton Components/TestForm/StartScreen.Designer.cs b/Source/Krypton Components/TestForm/StartScreen.Designer.cs index be95cc7c3..640a04877 100644 --- a/Source/Krypton Components/TestForm/StartScreen.Designer.cs +++ b/Source/Krypton Components/TestForm/StartScreen.Designer.cs @@ -116,6 +116,7 @@ private void InitializeComponent() this.kryptonPanel1.Controls.Add(this.kbtnBreadCrumb); this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.kryptonPanel1.Location = new System.Drawing.Point(0, 0); + this.kryptonPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonPanel1.Name = "kryptonPanel1"; this.kryptonPanel1.Size = new System.Drawing.Size(440, 550); this.kryptonPanel1.TabIndex = 0; @@ -144,7 +145,7 @@ private void InitializeComponent() // this.kbtnRibbonNavigatorWorkspace.Location = new System.Drawing.Point(13, 350); this.kbtnRibbonNavigatorWorkspace.Name = "kbtnRibbonNavigatorWorkspace"; - this.kbtnRibbonNavigatorWorkspace.Size = new System.Drawing.Size(204, 25); + this.kbtnRibbonNavigatorWorkspace.Size = new System.Drawing.Size(272, 31); this.kbtnRibbonNavigatorWorkspace.TabIndex = 27; this.kbtnRibbonNavigatorWorkspace.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnRibbonNavigatorWorkspace.Values.Text = "Ribbon/Navigator/Workspace"; @@ -153,9 +154,10 @@ private void InitializeComponent() // kbtnAbout // this.kbtnAbout.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.kbtnAbout.Location = new System.Drawing.Point(12, 40); + this.kbtnAbout.Location = new System.Drawing.Point(16, 49); + this.kbtnAbout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnAbout.Name = "kbtnAbout"; - this.kbtnAbout.Size = new System.Drawing.Size(204, 25); + this.kbtnAbout.Size = new System.Drawing.Size(272, 31); this.kbtnAbout.TabIndex = 26; this.kbtnAbout.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnAbout.Values.Text = "About Box"; @@ -165,7 +167,7 @@ private void InitializeComponent() // this.kbtnInputBox.Location = new System.Drawing.Point(223, 226); this.kbtnInputBox.Name = "kbtnInputBox"; - this.kbtnInputBox.Size = new System.Drawing.Size(204, 25); + this.kbtnInputBox.Size = new System.Drawing.Size(272, 31); this.kbtnInputBox.TabIndex = 25; this.kbtnInputBox.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnInputBox.Values.Text = "Input Box"; @@ -175,7 +177,7 @@ private void InitializeComponent() // this.kbtnHeaderExamples.Location = new System.Drawing.Point(13, 226); this.kbtnHeaderExamples.Name = "kbtnHeaderExamples"; - this.kbtnHeaderExamples.Size = new System.Drawing.Size(204, 25); + this.kbtnHeaderExamples.Size = new System.Drawing.Size(272, 31); this.kbtnHeaderExamples.TabIndex = 24; this.kbtnHeaderExamples.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnHeaderExamples.Values.Text = "Header Examples"; @@ -185,7 +187,7 @@ private void InitializeComponent() // this.kbtnDataGrid.Location = new System.Drawing.Point(223, 133); this.kbtnDataGrid.Name = "kbtnDataGrid"; - this.kbtnDataGrid.Size = new System.Drawing.Size(204, 25); + this.kbtnDataGrid.Size = new System.Drawing.Size(272, 31); this.kbtnDataGrid.TabIndex = 23; this.kbtnDataGrid.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnDataGrid.Values.Text = "DataGrid"; @@ -193,9 +195,10 @@ private void InitializeComponent() // // kbtnControlsTest // - this.kbtnControlsTest.Location = new System.Drawing.Point(223, 102); + this.kbtnControlsTest.Location = new System.Drawing.Point(297, 126); + this.kbtnControlsTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnControlsTest.Name = "kbtnControlsTest"; - this.kbtnControlsTest.Size = new System.Drawing.Size(204, 25); + this.kbtnControlsTest.Size = new System.Drawing.Size(272, 31); this.kbtnControlsTest.TabIndex = 22; this.kbtnControlsTest.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnControlsTest.Values.Text = "Controls Test"; @@ -205,7 +208,7 @@ private void InitializeComponent() // this.kbtnThemeControls.Location = new System.Drawing.Point(13, 412); this.kbtnThemeControls.Name = "kbtnThemeControls"; - this.kbtnThemeControls.Size = new System.Drawing.Size(204, 25); + this.kbtnThemeControls.Size = new System.Drawing.Size(272, 31); this.kbtnThemeControls.TabIndex = 21; this.kbtnThemeControls.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnThemeControls.Values.Text = "Theme Controls"; @@ -215,7 +218,7 @@ private void InitializeComponent() // this.kbtnWorkspace.Location = new System.Drawing.Point(13, 474); this.kbtnWorkspace.Name = "kbtnWorkspace"; - this.kbtnWorkspace.Size = new System.Drawing.Size(204, 25); + this.kbtnWorkspace.Size = new System.Drawing.Size(272, 31); this.kbtnWorkspace.TabIndex = 20; this.kbtnWorkspace.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnWorkspace.Values.Text = "Workspace"; @@ -224,9 +227,10 @@ private void InitializeComponent() // kbtnCalendar // this.kbtnCalendar.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.kbtnCalendar.Location = new System.Drawing.Point(223, 71); + this.kbtnCalendar.Location = new System.Drawing.Point(297, 87); + this.kbtnCalendar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnCalendar.Name = "kbtnCalendar"; - this.kbtnCalendar.Size = new System.Drawing.Size(204, 25); + this.kbtnCalendar.Size = new System.Drawing.Size(272, 31); this.kbtnCalendar.TabIndex = 19; this.kbtnCalendar.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnCalendar.Values.Text = "Calendar"; @@ -237,9 +241,10 @@ private void InitializeComponent() this.kryptonThemeComboBox1.DefaultPalette = Krypton.Toolkit.PaletteMode.Microsoft365Blue; this.kryptonThemeComboBox1.DropDownWidth = 417; this.kryptonThemeComboBox1.IntegralHeight = false; - this.kryptonThemeComboBox1.Location = new System.Drawing.Point(10, 11); + this.kryptonThemeComboBox1.Location = new System.Drawing.Point(13, 14); + this.kryptonThemeComboBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonThemeComboBox1.Name = "kryptonThemeComboBox1"; - this.kryptonThemeComboBox1.Size = new System.Drawing.Size(417, 22); + this.kryptonThemeComboBox1.Size = new System.Drawing.Size(556, 26); this.kryptonThemeComboBox1.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; this.kryptonThemeComboBox1.TabIndex = 18; // @@ -247,7 +252,7 @@ private void InitializeComponent() // this.kbtnOutlookGrid.Location = new System.Drawing.Point(13, 288); this.kbtnOutlookGrid.Name = "kbtnOutlookGrid"; - this.kbtnOutlookGrid.Size = new System.Drawing.Size(204, 25); + this.kbtnOutlookGrid.Size = new System.Drawing.Size(272, 31); this.kbtnOutlookGrid.TabIndex = 17; this.kbtnOutlookGrid.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnOutlookGrid.Values.Text = "Outlook Grid"; @@ -257,7 +262,7 @@ private void InitializeComponent() // this.btnColourTestimonials.Location = new System.Drawing.Point(223, 474); this.btnColourTestimonials.Name = "btnColourTestimonials"; - this.btnColourTestimonials.Size = new System.Drawing.Size(204, 25); + this.btnColourTestimonials.Size = new System.Drawing.Size(272, 31); this.btnColourTestimonials.TabIndex = 16; this.btnColourTestimonials.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.btnColourTestimonials.Values.Text = "Colour Testimonials"; @@ -267,7 +272,7 @@ private void InitializeComponent() // this.kbtnTreeView.Location = new System.Drawing.Point(223, 443); this.kbtnTreeView.Name = "kbtnTreeView"; - this.kbtnTreeView.Size = new System.Drawing.Size(204, 25); + this.kbtnTreeView.Size = new System.Drawing.Size(272, 31); this.kbtnTreeView.TabIndex = 16; this.kbtnTreeView.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnTreeView.Values.Text = "TreeView"; @@ -278,7 +283,7 @@ private void InitializeComponent() this.kbtnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.kbtnExit.Location = new System.Drawing.Point(13, 505); this.kbtnExit.Name = "kbtnExit"; - this.kbtnExit.Size = new System.Drawing.Size(204, 25); + this.kbtnExit.Size = new System.Drawing.Size(272, 31); this.kbtnExit.TabIndex = 15; this.kbtnExit.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnExit.Values.Text = "Exit"; @@ -288,7 +293,7 @@ private void InitializeComponent() // this.kbtnFormBorder.Location = new System.Drawing.Point(13, 195); this.kbtnFormBorder.Name = "kbtnFormBorder"; - this.kbtnFormBorder.Size = new System.Drawing.Size(204, 25); + this.kbtnFormBorder.Size = new System.Drawing.Size(272, 31); this.kbtnFormBorder.TabIndex = 14; this.kbtnFormBorder.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnFormBorder.Values.Text = "Form Border"; @@ -298,7 +303,7 @@ private void InitializeComponent() // this.kbtnToast.Location = new System.Drawing.Point(13, 443); this.kbtnToast.Name = "kbtnToast"; - this.kbtnToast.Size = new System.Drawing.Size(204, 25); + this.kbtnToast.Size = new System.Drawing.Size(272, 31); this.kbtnToast.TabIndex = 13; this.kbtnToast.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnToast.Values.Text = "Toast"; @@ -308,7 +313,7 @@ private void InitializeComponent() // this.kbtnTheme.Location = new System.Drawing.Point(223, 412); this.kbtnTheme.Name = "kbtnTheme"; - this.kbtnTheme.Size = new System.Drawing.Size(204, 25); + this.kbtnTheme.Size = new System.Drawing.Size(272, 31); this.kbtnTheme.TabIndex = 12; this.kbtnTheme.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnTheme.Values.Text = "Theme"; @@ -318,7 +323,7 @@ private void InitializeComponent() // this.kbtnTextBox.Location = new System.Drawing.Point(223, 381); this.kbtnTextBox.Name = "kbtnTextBox"; - this.kbtnTextBox.Size = new System.Drawing.Size(204, 25); + this.kbtnTextBox.Size = new System.Drawing.Size(272, 31); this.kbtnTextBox.TabIndex = 11; this.kbtnTextBox.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnTextBox.Values.Text = "TextBox"; @@ -328,7 +333,7 @@ private void InitializeComponent() // this.kbtnRibbon.Location = new System.Drawing.Point(223, 350); this.kbtnRibbon.Name = "kbtnRibbon"; - this.kbtnRibbon.Size = new System.Drawing.Size(204, 25); + this.kbtnRibbon.Size = new System.Drawing.Size(272, 31); this.kbtnRibbon.TabIndex = 10; this.kbtnRibbon.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnRibbon.Values.Text = "Ribbon"; @@ -338,7 +343,7 @@ private void InitializeComponent() // this.kbtnProgressBar.Location = new System.Drawing.Point(13, 319); this.kbtnProgressBar.Name = "kbtnProgressBar"; - this.kbtnProgressBar.Size = new System.Drawing.Size(204, 25); + this.kbtnProgressBar.Size = new System.Drawing.Size(272, 31); this.kbtnProgressBar.TabIndex = 9; this.kbtnProgressBar.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnProgressBar.Values.Text = "ProgressBar"; @@ -346,9 +351,10 @@ private void InitializeComponent() // // kbtnButtons // - this.kbtnButtons.Location = new System.Drawing.Point(13, 71); + this.kbtnButtons.Location = new System.Drawing.Point(17, 87); + this.kbtnButtons.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnButtons.Name = "kbtnButtons"; - this.kbtnButtons.Size = new System.Drawing.Size(204, 25); + this.kbtnButtons.Size = new System.Drawing.Size(272, 31); this.kbtnButtons.TabIndex = 8; this.kbtnButtons.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnButtons.Values.Text = "Buttons"; @@ -358,7 +364,7 @@ private void InitializeComponent() // this.kbtnAboutBox.Location = new System.Drawing.Point(223, 288); this.kbtnAboutBox.Name = "kbtnAboutBox"; - this.kbtnAboutBox.Size = new System.Drawing.Size(204, 25); + this.kbtnAboutBox.Size = new System.Drawing.Size(272, 31); this.kbtnAboutBox.TabIndex = 7; this.kbtnAboutBox.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnAboutBox.Values.Text = "Old Style Main: \"Fullscreen\""; @@ -368,7 +374,7 @@ private void InitializeComponent() // this.kbtnMessageBox.Location = new System.Drawing.Point(223, 257); this.kbtnMessageBox.Name = "kbtnMessageBox"; - this.kbtnMessageBox.Size = new System.Drawing.Size(204, 25); + this.kbtnMessageBox.Size = new System.Drawing.Size(272, 31); this.kbtnMessageBox.TabIndex = 6; this.kbtnMessageBox.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnMessageBox.Values.Text = "MessageBox"; @@ -378,7 +384,7 @@ private void InitializeComponent() // this.kbtnMenuToolStatusStrips.Location = new System.Drawing.Point(13, 257); this.kbtnMenuToolStatusStrips.Name = "kbtnMenuToolStatusStrips"; - this.kbtnMenuToolStatusStrips.Size = new System.Drawing.Size(204, 25); + this.kbtnMenuToolStatusStrips.Size = new System.Drawing.Size(272, 31); this.kbtnMenuToolStatusStrips.TabIndex = 5; this.kbtnMenuToolStatusStrips.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnMenuToolStatusStrips.Values.Text = "Menu/Tool/Status Strips"; @@ -388,7 +394,7 @@ private void InitializeComponent() // this.kbtnGroupBox.Location = new System.Drawing.Point(223, 195); this.kbtnGroupBox.Name = "kbtnGroupBox"; - this.kbtnGroupBox.Size = new System.Drawing.Size(204, 25); + this.kbtnGroupBox.Size = new System.Drawing.Size(272, 31); this.kbtnGroupBox.TabIndex = 4; this.kbtnGroupBox.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnGroupBox.Values.Text = "GroupBox"; @@ -398,7 +404,7 @@ private void InitializeComponent() // this.kbtnFadeForm.Location = new System.Drawing.Point(223, 164); this.kbtnFadeForm.Name = "kbtnFadeForm"; - this.kbtnFadeForm.Size = new System.Drawing.Size(204, 25); + this.kbtnFadeForm.Size = new System.Drawing.Size(272, 31); this.kbtnFadeForm.TabIndex = 3; this.kbtnFadeForm.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnFadeForm.Values.Text = "Fade Form"; @@ -406,9 +412,10 @@ private void InitializeComponent() // // kbtnCommandLinkButtons // - this.kbtnCommandLinkButtons.Location = new System.Drawing.Point(13, 102); + this.kbtnCommandLinkButtons.Location = new System.Drawing.Point(17, 126); + this.kbtnCommandLinkButtons.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnCommandLinkButtons.Name = "kbtnCommandLinkButtons"; - this.kbtnCommandLinkButtons.Size = new System.Drawing.Size(204, 25); + this.kbtnCommandLinkButtons.Size = new System.Drawing.Size(272, 31); this.kbtnCommandLinkButtons.TabIndex = 2; this.kbtnCommandLinkButtons.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnCommandLinkButtons.Values.Text = "CommandLink Buttons"; @@ -416,9 +423,10 @@ private void InitializeComponent() // // kbtnBreadCrumb // - this.kbtnBreadCrumb.Location = new System.Drawing.Point(223, 40); + this.kbtnBreadCrumb.Location = new System.Drawing.Point(297, 49); + this.kbtnBreadCrumb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnBreadCrumb.Name = "kbtnBreadCrumb"; - this.kbtnBreadCrumb.Size = new System.Drawing.Size(204, 25); + this.kbtnBreadCrumb.Size = new System.Drawing.Size(272, 31); this.kbtnBreadCrumb.TabIndex = 1; this.kbtnBreadCrumb.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kbtnBreadCrumb.Values.Text = "BreadCrumb"; @@ -450,16 +458,22 @@ private void InitializeComponent() // // StartScreen // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.CancelButton = this.kbtnExit; this.ClientSize = new System.Drawing.Size(440, 550); this.Controls.Add(this.kryptonPanel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "StartScreen"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.StateCommon.Border.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.StateCommon.Border.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.StateCommon.Border.ColorStyle = Krypton.Toolkit.PaletteColorStyle.Rounding2; + this.StateCommon.Border.Draw = Krypton.Toolkit.InheritBool.True; + this.StateCommon.Border.Width = 10; this.Text = "Welcome"; this.Load += new System.EventHandler(this.StartScreen_Load); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit();