From ce309618b5647b82f2e3a85db5e9f4d5c764e0e8 Mon Sep 17 00:00:00 2001 From: Smurf-IV Date: Wed, 4 Dec 2024 10:37:11 +0000 Subject: [PATCH] - Create Scaled Drop Glyph and use for colour button and comboDrops - Remove the `PaletteRedirectDropDownButton` - Remove `KryptonPaletteImagesDropDownButton` - Remove `DropDownButtonImages` from designers - Correct usage spelling to drop-down #1212 --- Documents/Changelog/Changelog.md | 30 ++- README.md | 16 +- .../KryptonAutoHiddenSlidePanel.cs | 2 +- .../KryptonDockableNavigator.cs | 4 +- .../KryptonDockableWorkspace.cs | 2 +- .../Control Docking/KryptonSpace.cs | 14 +- .../Palette/DockingManagerStrings.cs | 4 +- .../Controls Navigator/KryptonNavigator.cs | 2 +- .../Krypton.Navigator/General/Definitions.cs | 4 +- .../Palette/NavigatorOutlook.cs | 4 +- .../View Builder/ViewBuilderOutlookBase.cs | 8 +- .../ViewBuilderOutlookBase.cs.rej | 14 ++ .../Controller/GalleryController.cs | 2 +- .../Controller/GroupButtonController.cs | 2 +- .../Controls Ribbon/KryptonGallery.cs | 18 +- .../EventArgs/GalleryDropMenuEventArgs.cs | 2 +- .../Krypton.Ribbon/General/Definitions.cs | 4 +- .../KryptonRibbonGroupButton.cs | 4 +- .../KryptonRibbonGroupClusterButton.cs | 4 +- .../KryptonRibbonGroupClusterColorButton.cs | 4 +- .../KryptonRibbonGroupColorButton.cs | 4 +- .../KryptonRibbonGroupComboBox.cs | 8 +- .../KryptonRibbonGroupDateTimePicker.cs | 12 +- .../KryptonRibbonGroupGallery.cs | 16 +- .../KryptonRibbonGroupGallery.cs.rej | 14 ++ .../View Draw/ViewDrawRibbonGroupButton.cs | 4 +- .../ViewDrawRibbonGroupButton.cs.rej | 19 ++ .../ViewDrawRibbonGroupButtonBackBorder.cs | 2 +- .../View Draw/ViewDrawRibbonGroupCheckBox.cs | 2 +- .../ViewDrawRibbonGroupClusterButton.cs | 2 +- .../ViewDrawRibbonGroupClusterButton.cs.rej | 10 + .../ViewDrawRibbonGroupClusterColorButton.cs | 4 +- ...ewDrawRibbonGroupClusterColorButton.cs.rej | 19 ++ .../ViewDrawRibbonGroupColorButton.cs | 6 +- .../ViewDrawRibbonGroupColorButton.cs.rej | 23 ++ .../View Draw/ViewDrawRibbonGroupLabel.cs | 2 +- .../View Draw/ViewDrawRibbonGroupLabel.cs.rej | 10 + .../ViewDrawRibbonGroupRadioButton.cs | 2 +- .../ButtonSpec/ButtonSpecAny.cs | 2 +- .../ButtonSpec/ButtonSpecView.cs | 6 - .../KryptonContextMenuMonthCalendar.cs | 4 +- .../Controls Toolkit/KryptonBreadCrumb.cs | 12 +- .../Controls Toolkit/KryptonButton.cs.rej | 10 + .../Controls Toolkit/KryptonColorButton.cs | 30 +-- .../Controls Toolkit/KryptonComboBox.cs | 28 +-- .../Controls Toolkit/KryptonComboBox.cs.rej | 10 + .../KryptonCustomPaletteBase.cs | 23 -- .../KryptonCustomPaletteBase.cs.rej | 31 +++ .../KryptonDataGridViewComboBoxColumn.cs | 8 +- ...KryptonDataGridViewDateTimePickerColumn.cs | 4 +- .../Controls Toolkit/KryptonDateTimePicker.cs | 22 +- .../Controls Toolkit/KryptonDropButton.cs | 34 +-- .../Controls Toolkit/KryptonDropButton.cs.rej | 10 + .../Controls Visuals/VisualContextMenuDTP.cs | 6 +- .../Controls Visuals/VisualPopup.cs | 2 +- .../KryptonColorButtonActionList.cs | 6 +- .../Action Lists/KryptonComboBoxActionList.cs | 2 +- .../KryptonComboBoxActionList.cs.rej | 21 ++ .../KryptonDropButtonActionList.cs | 6 +- .../KryptonDropButtonDesigner.cs.rej | 10 + .../Editors/PaletteDrawBordersEditor.cs | 6 +- .../Editors/PaletteDrawBordersEditor.cs.rej | 10 + .../OverrideComboBoxStyleDropDownStyle.cs | 2 +- .../EventArgs/DateTimePickerDropArgs.cs | 2 +- .../General/DesignTimeUtilities.cs | 2 +- .../Krypton.Toolkit/General/PlatformInvoke.cs | 2 +- .../Palette Base/PaletteDefinitions.cs | 4 +- .../PaletteRedirect/PaletteRedirect.cs | 6 - .../PaletteRedirect/PaletteRedirect.cs.rej | 14 ++ .../Palette Builtin/Base/PaletteBase.cs | 6 - .../Bases/PaletteMicrosoft365Base.cs | 6 - .../PaletteMicrosoft365BlackDarkMode.cs | 14 +- ...letteMicrosoft365BlackDarkModeAlternate.cs | 15 +- .../PaletteMicrosoft365BlueDarkMode.cs | 15 +- .../PaletteMicrosoft365BlueLightMode.cs | 15 +- .../PaletteMicrosoft365SilverDarkMode.cs | 15 +- .../PaletteMicrosoft365SilverLightMode.cs | 15 +- .../PaletteMicrosoft365Blue.cs | 7 - .../PaletteMicrosoft365Black.cs | 7 - .../PaletteMicrosoft365DarkGray.cs | 6 - .../PaletteMicrosoft365Silver.cs | 7 - .../PaletteMicrosoft365White.cs | 6 - .../Bases/PaletteOffice2007Base.cs | 6 - .../PaletteOffice2007BlackDarkMode.cs | 14 +- .../PaletteOffice2007BlueDarkMode.cs | 14 +- .../PaletteOffice2007BlueLightMode.cs | 14 +- .../PaletteOffice2007SilverDarkMode.cs | 14 +- .../PaletteOffice2007SilverLightMode.cs | 14 +- .../PaletteOffice2007DarkGray.cs | 6 - .../PaletteOffice2007White.cs | 6 - .../Official Themes/PaletteOffice2007Black.cs | 6 - .../Official Themes/PaletteOffice2007Blue.cs | 6 - .../PaletteOffice2007Silver.cs | 6 - .../Bases/PaletteOffice2010Base.cs | 6 - .../PaletteOffice2010BlackDarkMode.cs | 14 +- .../PaletteOffice2010BlueDarkMode.cs | 14 +- .../PaletteOffice2010BlueLightMode.cs | 14 +- .../PaletteOffice2010SilverDarkMode.cs | 14 +- .../PaletteOffice2010SilverLightMode.cs | 14 +- .../PaletteOffice2010DarkGray.cs | 6 - .../PaletteOffice2010White.cs | 6 - .../Official Themes/PaletteOffice2010Black.cs | 12 - .../Official Themes/PaletteOffice2010Blue.cs | 6 - .../PaletteOffice2010Silver.cs | 6 - .../Bases/PaletteOffice2013Base.cs | 6 - .../PaletteOffice2013DarkGray.cs | 6 - .../PaletteOffice2013LightGray.cs | 6 - .../Official Themes/PaletteOffice2013White.cs | 12 - .../PaletteProfessionalOffice2003.cs | 18 -- .../Professional/PaletteProfessionalSystem.cs | 20 -- .../Sparkle/Base/PaletteSparkleBase.cs | 6 - .../PaletteSparkleBlueDarkMode.cs | 6 - .../Base/PaletteVisualStudioBase.cs | 6 - .../PaletteVisualStudio2010With2007Base.cs | 6 - .../PaletteVisualStudio2010With2010Base.cs | 6 - .../PaletteVisualStudio2010With2013Base.cs | 6 - .../365/PaletteVisualStudio2010With365Base.cs | 6 - ...etteVisualStudio2010Office2007Variation.cs | 6 - ...etteVisualStudio2010Office2010Variation.cs | 6 - ...etteVisualStudio2010Office2013Variation.cs | 6 - ...teVisualStudio2010Microsoft365Variation.cs | 6 - .../KryptonPaletteButtonSpecs.cs | 4 +- .../Palette Component/KryptonPaletteImages.cs | 17 -- .../KryptonPaletteImagesDropDownButton.cs | 235 ------------------ .../KryptonPaletteImagesGalleryButtons.cs | 4 +- .../Palette Controls/KryptonColorTable2007.cs | 2 +- .../Palette Controls/KryptonColorTable2010.cs | 2 +- .../Palette Controls/KryptonColorTable2013.cs | 2 +- .../Palette Controls/KryptonColorTable365.cs | 2 +- .../KryptonColorTableMicrosoft365.cs | 2 +- .../KryptonColorTableSparkle.cs | 2 +- .../KryptonColorTableVisualStudio.cs | 2 +- ...yptonVisualStudio2010With2007ColorTable.cs | 2 +- ...yptonVisualStudio2010With2010ColorTable.cs | 2 +- ...yptonVisualStudio2010With2013ColorTable.cs | 2 +- ...ualStudio2010WithMicrosoft365ColorTable.cs | 2 +- .../PaletteRedirectDropDownButton.cs | 91 ------- .../Rendering/KryptonMicrosoft365Renderer.cs | 2 +- .../Rendering/KryptonOffice2007Renderer.cs | 2 +- .../Rendering/KryptonOffice2010Renderer.cs | 2 +- .../Rendering/KryptonOffice2013Renderer.cs | 2 +- .../Rendering/KryptonSparkleRenderer.cs | 2 +- ...KryptonVisualStudio2010With2007Renderer.cs | 2 +- ...KryptonVisualStudio2010With2010Renderer.cs | 2 +- ...KryptonVisualStudio2010With2013Renderer.cs | 2 +- ...isualStudio2010WithMicrosoft365Renderer.cs | 2 +- .../Rendering/KryptonVisualStudioRender.cs | 2 +- .../Krypton.Toolkit/Rendering/RenderBase.cs | 19 +- .../Rendering/RenderDefinitions.cs | 22 +- .../Rendering/RenderSparkle.cs | 39 --- .../Rendering/RenderStandard.cs | 151 +++++++---- .../ShellDialogs/ShellBrowserDialogTFM.cs | 2 +- .../ShellDialogs/ShellBrowserDialogTFM.cs.rej | 10 + .../ShellDialogs/ShellDialogWrapper.cs | 2 +- .../ShellDialogs/ShellDialogWrapper.cs.rej | 10 + .../PaletteButtonSpecStyleStrings.cs | 6 +- .../Utilities/PaletteImageScaler.cs | 6 - .../Krypton.Toolkit/Values/ButtonValues.cs | 6 +- .../Values/DropDownButtonImages.cs | 214 ---------------- .../Krypton.Toolkit/Values/GalleryImages.cs | 4 +- .../View Draw/ViewDrawButton.cs | 25 +- .../View Draw/ViewDrawCommandLinkButton.cs | 2 +- .../View Draw/ViewDrawDateTimeButton.cs | 6 +- .../View Draw/ViewDrawDropDownButton.cs | 14 +- .../View Draw/ViewDrawMonthUpDown.cs | 4 +- .../View Layout/ViewLayoutCrumbs.cs | 12 +- .../View Layout/ViewLayoutCrumbs.cs.rej | 22 ++ 167 files changed, 665 insertions(+), 1428 deletions(-) create mode 100644 Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs.rej create mode 100644 Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs.rej create mode 100644 Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs.rej create mode 100644 Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs.rej create mode 100644 Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs.rej create mode 100644 Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs.rej create mode 100644 Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonDropButtonDesigner.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs.rej delete mode 100644 Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesDropDownButton.cs delete mode 100644 Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectDropDownButton.cs create mode 100644 Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs.rej create mode 100644 Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs.rej delete mode 100644 Source/Krypton Components/Krypton.Toolkit/Values/DropDownButtonImages.cs create mode 100644 Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs.rej diff --git a/Documents/Changelog/Changelog.md b/Documents/Changelog/Changelog.md index 7ff2de848..8635fe3a8 100644 --- a/Documents/Changelog/Changelog.md +++ b/Documents/Changelog/Changelog.md @@ -2,7 +2,12 @@ ======= -## 2025-02-01 - Build 2502 (Version 90 - Patch 1) - February 2025 +## 2025-02-01 - Build 2502 (Version 95 - Patch 1) - February 2025 +* Resolved [#1212](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1842), **[Breaking Change]** `KColorButton` 'drop-down' arrow should be drawn + - Create Scaled Drop Glyph and use for colour button and comboDrops + - Remove the `PaletteRedirectDropDownButton` + - Remove `KryptonPaletteImagesDropDownButton` + - **Breaking Change**: Remove `DropDownButtonImages` from designers * Resolved [#1887](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1887), If `KryptonPropertyGrid` has focus on groupName and loses mouse over, then it is all filled in black * Resolved [#1878](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1878), `KryptonListView` is missing key events * Resolved [#1843](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1843), `ButtonSpec` position is off due to an incorrect padding when style is set to "List Item". @@ -174,7 +179,26 @@ ======= +# 2025-02-01 - Build 2502 (Patch 5) - February 2025 +* Resolved [#1212](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1842), **[Breaking Change]** `KColorButton` 'drop-down' arrow should be drawn + - Create Scaled Drop Glyph and use for colour button and comboDrops + - Remove the `PaletteRedirectDropDownButton` + - Remove `KryptonPaletteImagesDropDownButton` + - **Breaking Change**: Remove `DropDownButtonImages` from designers +* Resolved [#1842](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1842), `KryptonTextBox` height collapses when MultiLine is enabled. +* Resolved [#1399](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1399), Hard coded colour setting removed from the `KryptonRibbonTab`. + +======= + +# 2024-11-14 - Build 2411 (Patch 4) - November 2024 +* Resolved [#1837](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1837), `KryptonMessageBoxDefaultButton.Button2` doesn't work +* Resolved [#1820](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1820), When KryptonDataGridView.AutoGenerate is set WinForms columns are used. See the issue for full text. + +======= + # 2024-10-14 - Build 2410 (Patch 3) - October 2024 +* Implemented [#1813](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1813), LTS Configuration +* Resolved [#1800](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1800) `KryptonDataGridViewComboBoxEditingControl.EditingControlFormattedValue` property is differently implemented. * Implemented [#1792](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1792), Enable 'SourceLink' for NuGet packages * Resolved [#66](https://github.com/Krypton-Suite/Standard-Toolkit/issues/66), Cannot Add Ribbon-Buttons-Container (KryptonRibbonGroupTripple) when using .netcore onwards [Returns error due to abstract class] * Resolved [#297](https://github.com/Krypton-Suite/Standard-Toolkit/issues/297), Office 2k7 colour usages are wrong @@ -183,7 +207,7 @@ ======= ## 2024-08-26 - Build 2408 (Patch 2) - August 2024 -* Resolved [#1697](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1697), `KryptonComboBox` change in DropDownStyle cripples the control while the control is disabled en reenabled again. +* Resolved [#1697](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1697), `KryptonComboBox` change in DropDownStyle cripples the control while the control is disabled when reenabled again. * Resolved [#1755](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1755), Ribbon `GalleryButtonController` timer component causes an exception on mouse movements. * Resolved [#1548](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1548), KComboBox DropDown arrow is illegible in certain themes * Resolved [#1659](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1659), Solves `KryptonMessageBox` selected text issue, usage of diverse line breaks and sizing issues. @@ -211,7 +235,7 @@ * Resolved [#1455](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1455), **[Regression]** KryptonComboBox text is clipped; as height is incorrect. * Resolved [#1381](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1502), Docking Persistence broken since build `##.23.10.303` * Resolved [#1508](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1508), **[Breaking Change]** ButtonSpec does not open assigned context menu when clicked. - - Added property `ShowDrop`, which displays a drop down arrow on the button. + - Added property `ShowDrop`, which displays a drop-down arrow on the button. - When a `KryptonContextMenu` is connected the menu is shown when the button is clicked. - When a WinForms `ContextMenuStrip` is connected the menu is shown when the button is clicked. - When both type of the above ContextMenus are connected the `KryptonContextMenu` takes precedence. diff --git a/README.md b/README.md index e62168007..7982859bb 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,13 @@ Follow the links to see the different objects and layouts that this framework al # Breaking Changes +## V95.00 (2025-02-01 - Build 2502 - February 2025) +* Resolved [#1212](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1842), **[Breaking Change]** `KColorButton` 'drop-down' arrow should be drawn + - Create Scaled Drop Glyph and use for colour button and comboDrops + - Remove the `PaletteRedirectDropDownButton` + - Remove `KryptonPaletteImagesDropDownButton` + - **Breaking Change**: Remove `DropDownButtonImages` from designers + ## V90.00 (2024-11-12 - Build 2411 - November 2024) There are list of changes that have occurred during the development of the V90.00 version - [#632](https://github.com/Krypton-Suite/Standard-Toolkit/issues/632), **[Breaking Change]** `KryptonPropertyGrid` should have a customisable back colour. @@ -228,13 +235,20 @@ The `KryptonInputBox` now uses the new `KryptonInputBoxData` API, to handle data ### Building the Toolkit As of V90.00 support for longer path names **will** need to be enabled if you want to build the toolkit yourself. For more details on how to do this, please follow the instructions [here](https://krypton-suite.github.io/Standard-Toolkit-Online-Help/Source/Help/Output/articles/Contributing/Allowing-for-Longer-Path-and-File-Names.html). +## V85.00 (2025-02-01 - Build 2502 (Patch 5) - February 2025) +* Resolved [#1212](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1842), **[Breaking Change]** `KColorButton` 'drop-down' arrow should be drawn + - Create Scaled Drop Glyph and use for colour button and comboDrops + - Remove the `PaletteRedirectDropDownButton` + - Remove `KryptonPaletteImagesDropDownButton` + - **Breaking Change**: Remove `DropDownButtonImages` from designers + ## V85.00 (2024-06-24 - Build 2406 - June 2024) There are a list of changes that have occurred during the development of the V85.00 version * [#1302](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1302), **[Breaking Change]** Font being used by "Professional" theme is pants ! - The Option to use `SystemDefault` no longer exists a font rendering hint * [#1508](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1508), **[Breaking Change]** ButtonSpec does not open assigned context menu when clicked. - - Added property `ShowDrop`, which displays a drop down arrow on the button. + - Added property `ShowDrop`, which displays a drop-down arrow on the button. - When a `KryptonContextMenu` is connected the menu is shown when the button is clicked. - When a WinForms `ContextMenuStrip` is connected the menu is shown when the button is clicked. - When both type of the above ContextMenus are connected the `KryptonContextMenu` takes precedence. diff --git a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonAutoHiddenSlidePanel.cs b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonAutoHiddenSlidePanel.cs index a36ed0002..7a88fc997 100644 --- a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonAutoHiddenSlidePanel.cs +++ b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonAutoHiddenSlidePanel.cs @@ -95,7 +95,7 @@ public class KryptonAutoHiddenSlidePanel : KryptonPanel, /// Occurs when a page requests that a drop-down menu be shown. /// [Category("Behavior")] - [Description("Occurs when the user clicks the drop down button for a page.")] + [Description("Occurs when the user clicks the drop-down button for a page.")] public event EventHandler? PageDropDownClicked; /// diff --git a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableNavigator.cs b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableNavigator.cs index cbe15eafa..6560364d8 100644 --- a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableNavigator.cs +++ b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableNavigator.cs @@ -27,10 +27,10 @@ public class KryptonDockableNavigator : KryptonNavigator public event EventHandler? CellPageInserting; /// - /// Occurs when a page requests that a drop down menu be shown. + /// Occurs when a page requests that a drop-down menu be shown. /// [Category("DockableNavigator")] - [Description("Occurs when a page requests that a drop down menu be shown.")] + [Description("Occurs when a page requests that a drop-down menu be shown.")] public event EventHandler? PageDropDownClicked; #endregion diff --git a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableWorkspace.cs b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableWorkspace.cs index 6de38fe8e..0db2a9362 100644 --- a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableWorkspace.cs +++ b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonDockableWorkspace.cs @@ -52,7 +52,7 @@ public KryptonDockableWorkspace() protected override bool ApplyDockingPinAction => false; /// - /// Gets a value indicating if docking specific drop down actions should be applied. + /// Gets a value indicating if docking specific drop-down actions should be applied. /// protected override bool ApplyDockingDropDownAction => false; diff --git a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonSpace.cs b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonSpace.cs index b92a268d1..60ac02992 100644 --- a/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonSpace.cs +++ b/Source/Krypton Components/Krypton.Docking/Control Docking/KryptonSpace.cs @@ -54,7 +54,7 @@ protected class CachedCellState public ButtonSpecNavigator? PinButtonSpec { get; set; } /// - /// Gets and sets the button spec used to represent a drop down button. + /// Gets and sets the button spec used to represent a drop-down button. /// public ButtonSpecNavigator? DropDownButtonSpec { get; set; } } @@ -110,10 +110,10 @@ protected class CachedCellState public event EventHandler? PageAutoHiddenClicked; /// - /// Occurs when a page requests that a drop down menu be shown. + /// Occurs when a page requests that a drop-down menu be shown. /// [Category("DockableWorkspace")] - [Description("Occurs when a page drop down menu is requested from a header button.")] + [Description("Occurs when a page drop-down menu is requested from a header button.")] public event EventHandler? PageDropDownClicked; /// @@ -204,10 +204,10 @@ public string PinTooltip } /// - /// Gets and sets the tooltips used for the drop down button. + /// Gets and sets the tooltips used for the drop-down button. /// [Category("Dockable")] - [Description("Tooltip for the drop down button.")] + [Description("Tooltip for the drop-down button.")] [DefaultValue("Window Position")] public string DropDownTooltip { @@ -343,7 +343,7 @@ public override void WritePageElement(XmlWriter xmlWriter, KryptonPage page) protected virtual bool ApplyDockingPinAction => true; /// - /// Gets a value indicating if docking specific drop down actions should be applied. + /// Gets a value indicating if docking specific drop-down actions should be applied. /// protected virtual bool ApplyDockingDropDownAction => true; @@ -736,7 +736,7 @@ private void OnCellPrimaryHeaderRightClicked(object? sender, EventArgs e) // Set the focus into the active page cell.SelectedPage.SelectNextControl(cell.SelectedPage, true, true, true, false); - // Create and populate a context menu with the drop down set of options + // Create and populate a context menu with the drop-down set of options var kcm = new KryptonContextMenu(); var args = new CancelDropDownEventArgs(kcm, cell.SelectedPage); OnPageDropDownClicked(args); diff --git a/Source/Krypton Components/Krypton.Docking/Palette/DockingManagerStrings.cs b/Source/Krypton Components/Krypton.Docking/Palette/DockingManagerStrings.cs index 78f22a9cc..4a9b9440c 100644 --- a/Source/Krypton Components/Krypton.Docking/Palette/DockingManagerStrings.cs +++ b/Source/Krypton Components/Krypton.Docking/Palette/DockingManagerStrings.cs @@ -290,10 +290,10 @@ public string TextTabbedDocument #region TextWindowLocation /// - /// Gets and sets the text to use for the drop down button tooltip. + /// Gets and sets the text to use for the drop-down button tooltip. /// [Category("Visuals")] - [Description("Text to use for the drop down button tooltip.")] + [Description("Text to use for the drop-down button tooltip.")] [RefreshProperties(RefreshProperties.All)] [DefaultValue("Window Position")] [Localizable(true)] diff --git a/Source/Krypton Components/Krypton.Navigator/Controls Navigator/KryptonNavigator.cs b/Source/Krypton Components/Krypton.Navigator/Controls Navigator/KryptonNavigator.cs index 95afdaaeb..afb27f5dd 100644 --- a/Source/Krypton Components/Krypton.Navigator/Controls Navigator/KryptonNavigator.cs +++ b/Source/Krypton Components/Krypton.Navigator/Controls Navigator/KryptonNavigator.cs @@ -128,7 +128,7 @@ public class KryptonNavigator : VisualSimple, /// Occurs when the context action occurs. /// [Category(@"Navigator")] - [Description(@"Occurs when the drop down button is clicked in Outlook mode.")] + [Description(@"Occurs when the drop-down button is clicked in Outlook mode.")] public event EventHandler? OutlookDropDown; /// diff --git a/Source/Krypton Components/Krypton.Navigator/General/Definitions.cs b/Source/Krypton Components/Krypton.Navigator/General/Definitions.cs index b607e0fc8..a2d3e1083 100644 --- a/Source/Krypton Components/Krypton.Navigator/General/Definitions.cs +++ b/Source/Krypton Components/Krypton.Navigator/General/Definitions.cs @@ -87,7 +87,7 @@ public enum KryptonPageFlags /// Specifies that the user is allowed to close a docking page. DockingAllowClose = 0x0004, - /// Specifies that the user is allowed to select from a drop down button. + /// Specifies that the user is allowed to select from a drop-down button. DockingAllowDropDown = 0x008, /// Specifies that the user is allowed to make a page auto hidden. @@ -501,7 +501,7 @@ public enum PaletteNavButtonSpecStyle ArrowDown, /// - /// Specifies a drop down button specification. + /// Specifies a drop-down button specification. /// DropDown, diff --git a/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorOutlook.cs b/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorOutlook.cs index d92b73068..1945a3345 100644 --- a/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorOutlook.cs +++ b/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorOutlook.cs @@ -322,10 +322,10 @@ public InheritBool HeaderSecondaryVisible #region ShowDropDownButton /// - /// Gets and sets the visibility of the drop down button on the Outlook overflow bar. + /// Gets and sets the visibility of the drop-down button on the Outlook overflow bar. /// [Category(@"Visuals")] - [Description(@"Visibility of the drop down button on the Outlook overflow bar.")] + [Description(@"Visibility of the drop-down button on the Outlook overflow bar.")] [RefreshProperties(RefreshProperties.All)] [DefaultValue(true)] public bool ShowDropDownButton diff --git a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs index 825d38c7f..35572dc24 100644 --- a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs +++ b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs @@ -1737,7 +1737,7 @@ private void CreateButtonManager() // Create a collection to hold button spec we want to display _buttons = new OutlookButtonSpecCollection(Navigator); - // Create out drop down button specification + // Create out drop-down button specification _specDropDown = new ButtonSpecAny { Type = PaletteButtonSpecStyle.DropDown, @@ -1998,7 +1998,7 @@ private void ReorderCheckButtons() Orientation buttonEdgeOrient = (stackOrient == Orientation.Vertical ? Orientation.Horizontal : Orientation.Vertical); ViewDockStyle dockFar = (stackOrient == Orientation.Vertical ? ViewDockStyle.Bottom : ViewDockStyle.Right); - // Update the separator/drop down buttons with latest values + // Update the separator/drop-down buttons with latest values _viewSeparatorEdge.Orientation = buttonEdgeOrient; _viewSeparator.Orientation = buttonEdgeOrient; @@ -2155,10 +2155,10 @@ private void OnDropDownClick(object? sender, EventArgs e) addRemoveButtonItems.Items.Add(pageMenuItem); } - // Only enable the 'Add/Remove' if it has at least one drop down item + // Only enable the 'Add/Remove' if it has at least one drop-down item addRemoveButtons.Enabled = (visibleAddRemove > 0); - // Get the display rectangle of the drop down button + // Get the display rectangle of the drop-down button Rectangle rect = _buttonManager!.GetButtonRectangle(_specDropDown); // Convert to screen coordinates diff --git a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs.rej b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs.rej new file mode 100644 index 000000000..aa26c1691 --- /dev/null +++ b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs.rej @@ -0,0 +1,14 @@ +diff a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs (rejected hunks) +@@ -2138,10 +2138,10 @@ namespace Krypton.Navigator + addRemoveButtonItems.Items.Add(pageMenuItem); + } + +- // Only enable the 'Add/Remove' if it has at least one drop-down item ++ // Only enable the 'Add/Remove' if it has at least one drop-down item + addRemoveButtons.Enabled = (visibleAddRemove > 0); + +- // Get the display rectangle of the drop-down button ++ // Get the display rectangle of the drop-down button + Rectangle rect = _buttonManager.GetButtonRectangle(_specDropDown); + + // Convert to screen coordinates diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs index 97ce572aa..13b15aebd 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs @@ -127,7 +127,7 @@ public void KeyTipSelect(KryptonRibbon ribbon) // as this causes the tracking windows to be killed and we want them kept ribbon.LostFocusLosesKeyboard = false; - // Get the target to show the drop down menu for the gallery + // Get the target to show the drop-down menu for the gallery _target.KeyTipSelect(); // Exit the use of keyboard mode diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs index 14fb9b293..26acd95f5 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs @@ -47,7 +47,7 @@ internal class GroupButtonController : GlobalId, public event MouseEventHandler? ContextClick; /// - /// Occurs when a drop down portion is clicked. + /// Occurs when a drop-down portion is clicked. /// public event EventHandler? DropDown; #endregion diff --git a/Source/Krypton Components/Krypton.Ribbon/Controls Ribbon/KryptonGallery.cs b/Source/Krypton Components/Krypton.Ribbon/Controls Ribbon/KryptonGallery.cs index 6828daa86..d072773d8 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controls Ribbon/KryptonGallery.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controls Ribbon/KryptonGallery.cs @@ -72,10 +72,10 @@ public class KryptonGallery : VisualSimpleBase public event EventHandler? TrackingImage; /// - /// Occurs when the user invokes the drop down menu. + /// Occurs when the user invokes the drop-down menu. /// [Category(@"Action")] - [Description(@"Occurs when user invokes the drop down menu.")] + [Description(@"Occurs when user invokes the drop-down menu.")] public event EventHandler? GalleryDropMenu; #endregion @@ -196,10 +196,10 @@ public override bool AutoSize } /// - /// Gets the collection of drop down ranges. + /// Gets the collection of drop-down ranges. /// [Category(@"Visuals")] - [Description(@"Collection of drop down ranges")] + [Description(@"Collection of drop-down ranges")] [MergableProperty(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public KryptonGalleryRangeCollection DropButtonRanges { get; } @@ -230,10 +230,10 @@ public Size PreferredItemSize } /// - /// Gets and sets the maximum number of lines items for the drop down menu. + /// Gets and sets the maximum number of lines items for the drop-down menu. /// [Category(@"Layout")] - [Description(@"Maximum number of line items for the drop down menu.")] + [Description(@"Maximum number of line items for the drop-down menu.")] [DefaultValue(128)] public int DropMaxItemWidth { @@ -250,10 +250,10 @@ public int DropMaxItemWidth } /// - /// Gets and sets the minimum number of lines items for the drop down menu. + /// Gets and sets the minimum number of lines items for the drop-down menu. /// [Category(@"Layout")] - [Description(@"Minimum number of line items for the drop down menu.")] + [Description(@"Minimum number of line items for the drop-down menu.")] [DefaultValue(3)] public int DropMinItemWidth { @@ -846,7 +846,7 @@ private void OnDropMenuClosed(object? sender, ToolStripDropDownClosedEventArgs e { if (_dropMenu != null) { - // Remove any tracking caused by the drop down menu + // Remove any tracking caused by the drop-down menu TrackingIndex = -1; // Unhook from events diff --git a/Source/Krypton Components/Krypton.Ribbon/EventArgs/GalleryDropMenuEventArgs.cs b/Source/Krypton Components/Krypton.Ribbon/EventArgs/GalleryDropMenuEventArgs.cs index 58b728710..78983c122 100644 --- a/Source/Krypton Components/Krypton.Ribbon/EventArgs/GalleryDropMenuEventArgs.cs +++ b/Source/Krypton Components/Krypton.Ribbon/EventArgs/GalleryDropMenuEventArgs.cs @@ -15,7 +15,7 @@ namespace Krypton.Ribbon { /// - /// Event arguments for the drop down menu of a gallery. + /// Event arguments for the drop-down menu of a gallery. /// public class GalleryDropMenuEventArgs : CancelEventArgs { diff --git a/Source/Krypton Components/Krypton.Ribbon/General/Definitions.cs b/Source/Krypton Components/Krypton.Ribbon/General/Definitions.cs index d28f31463..daa23a264 100644 --- a/Source/Krypton Components/Krypton.Ribbon/General/Definitions.cs +++ b/Source/Krypton Components/Krypton.Ribbon/General/Definitions.cs @@ -386,12 +386,12 @@ public enum GroupButtonType Check, /// - /// Specifies a button that when pressed shows a drop down. + /// Specifies a button that when pressed shows a drop-down. /// DropDown, /// - /// Specifies a button that is split between push area and drop down area. + /// Specifies a button that is split between push area and drop-down area. /// Split } diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupButton.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupButton.cs index f8b412fd1..21c56b2f6 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupButton.cs @@ -59,10 +59,10 @@ public class KryptonRibbonGroupButton : KryptonRibbonGroupItem public event EventHandler? Click; /// - /// Occurs when the drop down button type is pressed. + /// Occurs when the drop-down button type is pressed. /// [Category(@"Ribbon")] - [Description(@"Occurs when the drop down button type is pressed.")] + [Description(@"Occurs when the drop-down button type is pressed.")] public event EventHandler? DropDown; /// diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterButton.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterButton.cs index d24dd6eab..e7b315226 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterButton.cs @@ -57,10 +57,10 @@ public class KryptonRibbonGroupClusterButton : KryptonRibbonGroupItem public event EventHandler? Click; /// - /// Occurs when the drop down button type is pressed. + /// Occurs when the drop-down button type is pressed. /// [Category(@"Ribbon")] - [Description(@"Occurs when the drop down button type is pressed.")] + [Description(@"Occurs when the drop-down button type is pressed.")] public event EventHandler? DropDown; /// diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterColorButton.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterColorButton.cs index cbfaec629..364a1060b 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterColorButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupClusterColorButton.cs @@ -85,10 +85,10 @@ public class KryptonRibbonGroupClusterColorButton : KryptonRibbonGroupItem public event EventHandler? Click; /// - /// Occurs when the drop down color button type is pressed. + /// Occurs when the drop-down color button type is pressed. /// [Category(@"Ribbon")] - [Description(@"Occurs when the drop down color button type is pressed.")] + [Description(@"Occurs when the drop-down color button type is pressed.")] public event EventHandler? DropDown; /// diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupColorButton.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupColorButton.cs index 472c4070e..9eca53f18 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupColorButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupColorButton.cs @@ -89,10 +89,10 @@ public class KryptonRibbonGroupColorButton : KryptonRibbonGroupItem public event EventHandler? Click; /// - /// Occurs when the drop down color button type is pressed. + /// Occurs when the drop-down color button type is pressed. /// [Category(@"Ribbon")] - [Description(@"Occurs when the drop down color button type is pressed.")] + [Description(@"Occurs when the drop-down color button type is pressed.")] public event EventHandler? DropDown; /// diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupComboBox.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupComboBox.cs index 7d8e76f1c..ea5035c6f 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupComboBox.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupComboBox.cs @@ -498,10 +498,10 @@ public virtual ComboBoxStyle DropDownStyle } /// - /// Gets and sets the height, in pixels, of the drop down box in a KryptonComboBox. + /// Gets and sets the height, in pixels, of the drop-down box in a KryptonComboBox. /// [Category(@"Behavior")] - [Description(@"The height, in pixels, of the drop down box in a KryptonComboBox.")] + [Description(@"The height, in pixels, of the drop-down box in a KryptonComboBox.")] [EditorBrowsable(EditorBrowsableState.Always)] [DefaultValue(200)] [Browsable(true)] @@ -512,10 +512,10 @@ public int DropDownHeight } /// - /// Gets and sets the width, in pixels, of the drop down box in a KryptonComboBox. + /// Gets and sets the width, in pixels, of the drop-down box in a KryptonComboBox. /// [Category(@"Behavior")] - [Description(@"The width, in pixels, of the drop down box in a KryptonComboBox.")] + [Description(@"The width, in pixels, of the drop-down box in a KryptonComboBox.")] [EditorBrowsable(EditorBrowsableState.Always)] [DefaultValue(143)] [Browsable(true)] diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupDateTimePicker.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupDateTimePicker.cs index 1e2137bfb..74aa44ea2 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupDateTimePicker.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupDateTimePicker.cs @@ -62,17 +62,17 @@ public class KryptonRibbonGroupDateTimePicker : KryptonRibbonGroupItem public event EventHandler? ValueNullableChanged; /// - /// Occurs when the drop down is shown. + /// Occurs when the drop-down is shown. /// [Category(@"Action")] - [Description(@"Event raised when the drop down is shown.")] + [Description(@"Event raised when the drop-down is shown.")] public event EventHandler? DropDown; /// - /// Occurs when the drop down has been closed. + /// Occurs when the drop-down has been closed. /// [Category(@"Action")] - [Description(@"Event raised when the drop down has been closed.")] + [Description(@"Event raised when the drop-down has been closed.")] public event EventHandler? CloseUp; /// @@ -440,10 +440,10 @@ public Day CalendarFirstDayOfWeek } /// - /// Gets and sets if clicking the Today button closes the drop down menu. + /// Gets and sets if clicking the Today button closes the drop-down menu. /// [Category(@"MonthCalendar")] - [Description(@"Indicates if clicking the Today button closes the drop down menu.")] + [Description(@"Indicates if clicking the Today button closes the drop-down menu.")] [DefaultValue(false)] public bool CalendarCloseOnTodayClick { diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs index e29b3beb6..eaaa06ed0 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs @@ -68,10 +68,10 @@ public class KryptonRibbonGroupGallery : KryptonRibbonGroupContainer public event EventHandler? TrackingImage; /// - /// Occurs when the user invokes the drop down menu. + /// Occurs when the user invokes the drop-down menu. /// [Category(@"Action")] - [Description(@"Occurs when user invokes the drop down menu.")] + [Description(@"Occurs when user invokes the drop-down menu.")] public event EventHandler? GalleryDropMenu; /// @@ -158,10 +158,10 @@ public KryptonRibbonGroupGallery() public KryptonGallery Gallery { get; } /// - /// Gets the collection of drop down ranges. + /// Gets the collection of drop-down ranges. /// [Category(@"Visuals")] - [Description(@"Collection of drop down ranges")] + [Description(@"Collection of drop-down ranges")] [MergableProperty(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public KryptonGalleryRangeCollection DropButtonRanges => Gallery.DropButtonRanges; @@ -298,10 +298,10 @@ public int DropButtonItemWidth } /// - /// Gets and sets the maximum number of lines items for the drop down menu. + /// Gets and sets the maximum number of lines items for the drop-down menu. /// [Category(@"Visuals")] - [Description(@"Maximum number of line items for the drop down menu.")] + [Description(@"Maximum number of line items for the drop-down menu.")] [DefaultValue(128)] public int DropMaxItemWidth { @@ -318,10 +318,10 @@ public int DropMaxItemWidth } /// - /// Gets and sets the minimum number of lines items for the drop down menu. + /// Gets and sets the minimum number of lines items for the drop-down menu. /// [Category(@"Visuals")] - [Description(@"Minimum number of line items for the drop down menu.")] + [Description(@"Minimum number of line items for the drop-down menu.")] [DefaultValue(3)] public int DropMinItemWidth { diff --git a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs.rej b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs.rej new file mode 100644 index 000000000..c248f50cf --- /dev/null +++ b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs.rej @@ -0,0 +1,14 @@ +diff a/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs b/Source/Krypton Components/Krypton.Ribbon/Group Contents/KryptonRibbonGroupGallery.cs (rejected hunks) +@@ -68,10 +68,10 @@ namespace Krypton.Ribbon + public event EventHandler? TrackingImage; + + /// +- /// Occurs when the user invokes the drop-down menu. ++ /// Occurs when the user invokes the drop-down menu. + /// + [Category(@"Action")] +- [Description(@"Occurs when user invokes the drop-down menu.")] ++ [Description(@"Occurs when user invokes the drop-down menu.")] + public event EventHandler GalleryDropMenu; + + /// diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs index d7aae87d7..b678a2220 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs @@ -408,7 +408,7 @@ private void CreateMediumSmallButtonView() // Create the layout docker for the contents of the button var contentLayout = new ViewLayoutDocker(); - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallImage = new ViewDrawRibbonGroupButtonImage(_ribbon, GroupButton!, false); _viewMediumSmallText1 = new ViewDrawRibbonGroupButtonText(_ribbon, GroupButton!, true); _viewMediumSmallText2 = new ViewDrawRibbonGroupButtonText(_ribbon, GroupButton!, false); @@ -500,7 +500,7 @@ private void UpdateDropDownState() var dropDown = GroupButton!.ButtonType == GroupButtonType.DropDown; var splitButton = GroupButton.ButtonType == GroupButtonType.Split; - // Only show text line 2 separators is a drop down is showing with no text + // Only show text line 2 separators is a drop-down is showing with no text var separators = (dropDown || splitButton) && (!string.IsNullOrEmpty(GroupButton.TextLine2)); // Update large view diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs.rej b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs.rej new file mode 100644 index 000000000..346f6ced8 --- /dev/null +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs.rej @@ -0,0 +1,19 @@ +diff a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs (rejected hunks) +@@ -408,7 +408,7 @@ namespace Krypton.Ribbon + // Create the layout docker for the contents of the button + var contentLayout = new ViewLayoutDocker(); + +- // Create the image and drop-down content ++ // Create the image and drop-down content + _viewMediumSmallImage = new ViewDrawRibbonGroupButtonImage(_ribbon, GroupButton, false); + _viewMediumSmallText1 = new ViewDrawRibbonGroupButtonText(_ribbon, GroupButton, true); + _viewMediumSmallText2 = new ViewDrawRibbonGroupButtonText(_ribbon, GroupButton, false); +@@ -500,7 +500,7 @@ namespace Krypton.Ribbon + var dropDown = GroupButton.ButtonType == GroupButtonType.DropDown; + var splitButton = GroupButton.ButtonType == GroupButtonType.Split; + +- // Only show text line 2 separators is a drop-down is showing with no text ++ // Only show text line 2 separators is a drop-down is showing with no text + var separators = (dropDown || splitButton) && (!string.IsNullOrEmpty(GroupButton.TextLine2)); + + // Update large view diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonBackBorder.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonBackBorder.cs index 436b35320..356c8dfb5 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonBackBorder.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonBackBorder.cs @@ -43,7 +43,7 @@ internal class ViewDrawRibbonGroupButtonBackBorder : ViewComposite public event MouseEventHandler? ContextClick; /// - /// Occurs when the drop down button is clicked. + /// Occurs when the drop-down button is clicked. /// public event EventHandler? DropDown; #endregion diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs index 7addd1ce2..7b2f2fcba 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs @@ -347,7 +347,7 @@ private void CreateMediumSmallCheckBoxView() // Create the layout docker for the contents of the button _viewMediumSmall = new ViewLayoutRibbonCheckBox(); - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallImage = new ViewDrawRibbonGroupCheckBoxImage(_ribbon, GroupCheckBox, false); _viewMediumSmallText1 = new ViewDrawRibbonGroupCheckBoxText(_ribbon, GroupCheckBox, true); _viewMediumSmallText2 = new ViewDrawRibbonGroupCheckBoxText(_ribbon, GroupCheckBox, false); diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs index 896bb2c4c..516b83fca 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs @@ -359,7 +359,7 @@ private void CreateView() // Create the layout docker for the contents of the button var contentLayout = new ViewLayoutDocker(); - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallImage = new ViewDrawRibbonGroupClusterButtonImage(_ribbon, GroupClusterButton!); _viewMediumSmallText1 = new ViewDrawRibbonGroupClusterButtonText(_ribbon, GroupClusterButton!) { diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs.rej b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs.rej new file mode 100644 index 000000000..d2c8645ac --- /dev/null +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButton.cs (rejected hunks) +@@ -359,7 +359,7 @@ namespace Krypton.Ribbon + // Create the layout docker for the contents of the button + var contentLayout = new ViewLayoutDocker(); + +- // Create the image and drop-down content ++ // Create the image and drop-down content + _viewMediumSmallImage = new ViewDrawRibbonGroupClusterButtonImage(_ribbon, GroupClusterButton); + _viewMediumSmallText1 = new ViewDrawRibbonGroupClusterButtonText(_ribbon, GroupClusterButton) + { diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs index d101a0ce2..094ba8985 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs @@ -359,7 +359,7 @@ private void CreateView() // Create the layout docker for the contents of the button var contentLayout = new ViewLayoutDocker(); - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallImage = new ViewDrawRibbonGroupClusterColorButtonImage(_ribbon, GroupClusterColorButton!); _viewMediumSmallText1 = new ViewDrawRibbonGroupClusterColorButtonText(_ribbon, GroupClusterColorButton!) { @@ -441,7 +441,7 @@ private void UpdateCheckedState() private void UpdateDropDownState() { - // Only show the drop down if the button is the correct type + // Only show the drop-down if the button is the correct type var dropDown = GroupClusterColorButton!.ButtonType is GroupButtonType.DropDown or GroupButtonType.Split; _viewMediumSmallDropArrow.Visible = dropDown; diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs.rej b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs.rej new file mode 100644 index 000000000..eb27b2f5b --- /dev/null +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs.rej @@ -0,0 +1,19 @@ +diff a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButton.cs (rejected hunks) +@@ -359,7 +359,7 @@ namespace Krypton.Ribbon + // Create the layout docker for the contents of the button + var contentLayout = new ViewLayoutDocker(); + +- // Create the image and drop-down content ++ // Create the image and drop-down content + _viewMediumSmallImage = new ViewDrawRibbonGroupClusterColorButtonImage(_ribbon, GroupClusterColorButton); + _viewMediumSmallText1 = new ViewDrawRibbonGroupClusterColorButtonText(_ribbon, GroupClusterColorButton) + { +@@ -441,7 +441,7 @@ namespace Krypton.Ribbon + + private void UpdateDropDownState() + { +- // Only show the drop-down if the button is the correct type ++ // Only show the drop-down if the button is the correct type + var dropDown = GroupClusterColorButton.ButtonType is GroupButtonType.DropDown or GroupButtonType.Split; + + _viewMediumSmallDropArrow.Visible = dropDown; diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs index 3d628959e..d37c144de 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs @@ -406,7 +406,7 @@ private void CreateMediumSmallButtonView() // Create the layout docker for the contents of the button var contentLayout = new ViewLayoutDocker(); - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallImage = new ViewDrawRibbonGroupColorButtonImage(_ribbon, GroupColorButton!, false); _viewMediumSmallText1 = new ViewDrawRibbonGroupColorButtonText(_ribbon, GroupColorButton!, true); _viewMediumSmallText2 = new ViewDrawRibbonGroupColorButtonText(_ribbon, GroupColorButton!, false); @@ -494,10 +494,10 @@ private void UpdateCheckedState() private void UpdateDropDownState() { - // Only show the drop down if the button is the correct type + // Only show the drop-down if the button is the correct type var dropDown = GroupColorButton!.ButtonType is GroupButtonType.DropDown or GroupButtonType.Split; - // Only show text line 2 separators is a drop down is showing with no text + // Only show text line 2 separators is a drop-down is showing with no text var separators = dropDown && (!string.IsNullOrEmpty(GroupColorButton.TextLine2)); // Update large view diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs.rej b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs.rej new file mode 100644 index 000000000..420c6dd05 --- /dev/null +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs.rej @@ -0,0 +1,23 @@ +diff a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs (rejected hunks) +@@ -406,7 +406,7 @@ namespace Krypton.Ribbon + // Create the layout docker for the contents of the button + var contentLayout = new ViewLayoutDocker(); + +- // Create the image and drop-down content ++ // Create the image and drop-down content + _viewMediumSmallImage = new ViewDrawRibbonGroupColorButtonImage(_ribbon, GroupColorButton, false); + _viewMediumSmallText1 = new ViewDrawRibbonGroupColorButtonText(_ribbon, GroupColorButton, true); + _viewMediumSmallText2 = new ViewDrawRibbonGroupColorButtonText(_ribbon, GroupColorButton, false); +@@ -494,10 +494,10 @@ namespace Krypton.Ribbon + + private void UpdateDropDownState() + { +- // Only show the drop-down if the button is the correct type ++ // Only show the drop-down if the button is the correct type + var dropDown = GroupColorButton.ButtonType is GroupButtonType.DropDown or GroupButtonType.Split; + +- // Only show text line 2 separators is a drop-down is showing with no text ++ // Only show text line 2 separators is a drop-down is showing with no text + var separators = dropDown && (!string.IsNullOrEmpty(GroupColorButton.TextLine2)); + + // Update large view diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs index f31319691..cde6eb98f 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs @@ -307,7 +307,7 @@ private void CreateMediumSmallLabelView() _viewMediumSmall.MouseController = controller; } - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallLabelImage = new ViewDrawRibbonGroupLabelImage(_ribbon, GroupLabel!, false); _viewMediumSmallText1 = new ViewDrawRibbonGroupLabelText(_ribbon, GroupLabel!, true); _viewMediumSmallText2 = new ViewDrawRibbonGroupLabelText(_ribbon, GroupLabel!, false); diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs.rej b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs.rej new file mode 100644 index 000000000..9b42f07b5 --- /dev/null +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabel.cs (rejected hunks) +@@ -307,7 +307,7 @@ namespace Krypton.Ribbon + _viewMediumSmall.MouseController = controller; + } + +- // Create the image and drop-down content ++ // Create the image and drop-down content + _viewMediumSmallLabelImage = new ViewDrawRibbonGroupLabelImage(_ribbon, GroupLabel, false); + _viewMediumSmallText1 = new ViewDrawRibbonGroupLabelText(_ribbon, GroupLabel, true); + _viewMediumSmallText2 = new ViewDrawRibbonGroupLabelText(_ribbon, GroupLabel, false); diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs index 25c7f4655..177dd3d26 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs @@ -347,7 +347,7 @@ private void CreateMediumSmallRadioButtonView() // Create the layout docker for the contents of the button _viewMediumSmall = new ViewLayoutRibbonRadioButton(); - // Create the image and drop down content + // Create the image and drop-down content _viewMediumSmallImage = new ViewDrawRibbonGroupRadioButtonImage(_ribbon, GroupRadioButton, false); _viewMediumSmallText1 = new ViewDrawRibbonGroupRadioButtonText(_ribbon, GroupRadioButton, true); _viewMediumSmallText2 = new ViewDrawRibbonGroupRadioButtonText(_ribbon, GroupRadioButton, false); diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecAny.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecAny.cs index f5d33c866..c0bc1d574 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecAny.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecAny.cs @@ -168,7 +168,7 @@ public ButtonCheckState Checked /// [Localizable(true)] [Category(@"Behavior")] - [Description(@"Displays a drop down arrow on the button.")] + [Description(@"Displays a drop-down arrow on the button.")] [RefreshProperties(RefreshProperties.All)] [DefaultValue(false)] public bool ShowDrop diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs index a39d47475..2ba41045d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs @@ -64,16 +64,10 @@ public ButtonSpecView([DisallowNull] PaletteRedirect redirector, PaletteContentStyle.ButtonButtonSpec, needPaint); - // Create the view for displaying a button ViewButton = new ViewDrawButton(_palette, _palette, _palette, _palette, paletteMetric, this, VisualOrientation.Top, false); - var images = new DropDownButtonImages(needPaint); - // Image need an extra redirector to check the local images first - var paletteDropDownButtonImages = new PaletteRedirectDropDownButton(redirector, images); - ViewButton.DropDownPalette = paletteDropDownButtonImages; - // Associate the view with the source component (for design time support) if (ButtonSpec.AllowComponent) { diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuMonthCalendar.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuMonthCalendar.cs index 502f80b2e..ece6d9c2c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuMonthCalendar.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuMonthCalendar.cs @@ -236,11 +236,11 @@ public bool AutoClose } /// - /// Gets and sets if clicking the Today button closes the drop down menu. + /// Gets and sets if clicking the Today button closes the drop-down menu. /// [KryptonPersist] [Category(@"Behavior")] - [Description(@"Indicates if clicking the Today button closes the drop down menu.")] + [Description(@"Indicates if clicking the Today button closes the drop-down menu.")] [DefaultValue(false)] public bool CloseOnTodayClick { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumb.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumb.cs index 57632bd47..b052618de 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumb.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumb.cs @@ -64,17 +64,17 @@ public BreadCrumbButtonSpecCollection(KryptonBreadCrumb owner) public event EventHandler? Initialized; /// - /// Occurs when the drop down portion of a bread crumb is pressed. + /// Occurs when the drop-down portion of a bread crumb is pressed. /// [Category(@"Action")] - [Description(@"Occurs when the drop down portion of a bread crumb is pressed.")] + [Description(@"Occurs when the drop-down portion of a bread crumb is pressed.")] public event EventHandler? CrumbDropDown; /// - /// Occurs when the drop down portion of the overflow button is pressed. + /// Occurs when the drop-down portion of the overflow button is pressed. /// [Category(@"Action")] - [Description(@"Occurs when the drop down portion of the overflow button is pressed.")] + [Description(@"Occurs when the drop-down portion of the overflow button is pressed.")] public event EventHandler? OverflowDropDown; /// @@ -268,10 +268,10 @@ public bool UseMnemonic public BreadCrumbButtonSpecCollection ButtonSpecs { get; } /// - /// Gets and sets a value indicating if drop down buttons should allow navigation to children. + /// Gets and sets a value indicating if drop-down buttons should allow navigation to children. /// [Category(@"Visuals")] - [Description(@"Should drop down buttons allow navigation to children.")] + [Description(@"Should drop-down buttons allow navigation to children.")] [DefaultValue(true)] public bool DropDownNavigation { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs.rej new file mode 100644 index 000000000..661f40dd4 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonButton.cs (rejected hunks) +@@ -1101,7 +1101,7 @@ namespace Krypton.Toolkit + midPoint with { Y = midPoint.Y + 2 } + }; + +- // Issue 1388, an adaptation from PR 1500 applied here to fix the color of the drop-down arrow. ++ // Issue 1388, an adaptation from PR 1500 applied here to fix the color of the drop-down arrow. + // This version does not have the customizable Values.DropArrowColor property. + // This applies the theme color and if something is null, it'll be Black. + SolidBrush brush = new( KryptonManager.CurrentGlobalPalette?.GetContentShortTextColor1(PaletteContentStyle.ButtonStandalone, PaletteState.Normal) ?? Color.Black ); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs index b57d48e00..2ce98d0e6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs @@ -28,7 +28,6 @@ public class KryptonColorButton : VisualSimpleBase, IButtonControl, IContentValu private readonly ViewDrawButton _drawButton; private ButtonStyle _style; private readonly ButtonController _buttonController; - private readonly PaletteRedirectDropDownButton _paletteDropDownButtonImages; private readonly PaletteTripleOverride _overrideFocus; private readonly PaletteTripleOverride _overrideNormal; private readonly PaletteTripleOverride _overrideTracking; @@ -67,10 +66,10 @@ public class KryptonColorButton : VisualSimpleBase, IButtonControl, IContentValu #region Events /// - /// Occurs when the drop down portion of the color button is pressed. + /// Occurs when the drop-down portion of the color button is pressed. /// [Category(@"Action")] - [Description(@"Occurs when the drop down portion of the color button is pressed.")] + [Description(@"Occurs when the drop-down portion of the color button is pressed.")] public event EventHandler? DropDown; /// @@ -162,10 +161,6 @@ public KryptonColorButton() // Create content storage Values = CreateButtonValues(NeedPaintDelegate); Values.TextChanged += OnButtonTextChanged; - Images = new DropDownButtonImages(NeedPaintDelegate); - - // Image need an extra redirector to check the local images first - _paletteDropDownButtonImages = new PaletteRedirectDropDownButton(Redirector, Images); // Create the palette storage Strings = new PaletteColorButtonStrings(); @@ -197,8 +192,7 @@ public KryptonColorButton() // Set default color button state DropDown = true, Splitter = true, - TestForFocusCues = true, - DropDownPalette = _paletteDropDownButtonImages + TestForFocusCues = true }; // Create a color button controller to handle button style behaviour @@ -537,10 +531,10 @@ public virtual VisualOrientation DropDownOrientation } /// - /// Gets and sets if the color button works as a splitter or as a drop down. + /// Gets and sets if the color button works as a splitter or as a drop-down. /// [Category(@"Visuals")] - [Description(@"Determine if color button acts as a splitter or just a drop down.")] + [Description(@"Determine if color button acts as a splitter or just a drop-down.")] [DefaultValue(true)] public virtual bool Splitter { @@ -590,16 +584,6 @@ public ButtonStyle ButtonStyle private bool ShouldSerializeValues() => !Values.IsDefault; - /// - /// Gets access to the image value overrides. - /// - [Category(@"Visuals")] - [Description(@"Image value overrides.")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public DropDownButtonImages Images { get; } - - private bool ShouldSerializeImages() => !Images.IsDefault; - /// /// Gets access to the context menu display strings. /// @@ -1147,7 +1131,7 @@ private void OnButtonClick(object? sender, MouseEventArgs e) { var showingContextMenu = false; - // Do we need to show a drop down menu? + // Do we need to show a drop-down menu? if (!_clickOverriden && (!Splitter || (Splitter && _drawButton.SplitRectangle.Contains(e.Location))) ) @@ -1224,7 +1208,7 @@ private bool ShowDropDown() break; } - // We are showing a drop down + // We are showing a drop-down showingContextMenu = true; // Decide which separators are needed diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs index dc2ed6449..628fb4054 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs @@ -278,7 +278,7 @@ protected override void WndProc(ref Message m) rect.top += borderSize.Height; rect.bottom -= borderSize.Height; - // Create rectangle that represents the drop down button + // Create rectangle that represents the drop-down button var dropRect = new Rectangle(rect.right + 2, rect.top, dropDownWidth - 2, rect.bottom - rect.top); @@ -347,10 +347,10 @@ protected override void WndProc(ref Message m) rect.top += borderSize.Height; rect.bottom -= borderSize.Height; - // Create rectangle that represents the drop down button + // Create rectangle that represents the drop-down button Rectangle dropRect; - // Update text and drop down rects dependent on the right to left setting + // Update text and drop-down rects dependent on the right to left setting if (_kryptonComboBox.RightToLeft == RightToLeft.Yes) { dropRect = new Rectangle(rect.left + borderSize.Width + 1, rect.top + 1, dropDownWidth - 2, rect.bottom - rect.top - 2); @@ -429,7 +429,7 @@ protected override void WndProc(ref Message m) // Remove clipping settings PI.SelectClipRgn(hdc, IntPtr.Zero); - // Draw the drop down button + // Draw the drop-down button DrawDropButton(g, dropRect); } @@ -503,7 +503,7 @@ private void DrawDropButton(Graphics? g, Rectangle drawRect) this, VisualOrientation.Top, false); } - // Update with the latest button style for the drop down + // Update with the latest button style for the drop-down _palette.SetStyles(_kryptonComboBox.DropButtonStyle); // Find the new state for the button @@ -534,7 +534,7 @@ private void DrawDropButton(Graphics? g, Rectangle drawRect) _viewButton.ElementState = state; - // Position the button element inside the available drop down button area + // Position the button element inside the available drop-down button area using (var layoutContext = new ViewLayoutContext(_kryptonComboBox, _kryptonComboBox.Renderer)) { // Define the available area for layout @@ -556,7 +556,7 @@ private void DrawDropButton(Graphics? g, Rectangle drawRect) // Ask the button element to draw itself _viewButton.Render(renderContext); - // Call the renderer directly to draw the drop down glyph + // Call the renderer directly to draw the drop-down glyph renderContext.Renderer!.RenderGlyph.DrawInputControlDropDownGlyph(renderContext, _viewButton.ClientRectangle, _palette.PaletteContent, @@ -1261,7 +1261,7 @@ public virtual void EndInit() // We are no longer initializing IsInitializing = false; - // Force calculation of the drop down items again so they are sized correctly + // Force calculation of the drop-down items again so they are sized correctly _comboBox.DrawMode = DrawMode.OwnerDrawVariable; // Raise event to show control is now initialized @@ -1652,10 +1652,10 @@ public bool IntegralHeight } /// - /// Gets and sets the height, in pixels, of the drop down box in a KryptonComboBox. + /// Gets and sets the height, in pixels, of the drop-down box in a KryptonComboBox. /// [Category(@"Behavior")] - [Description(@"The height, in pixels, of the drop down box in a KryptonComboBox.")] + [Description(@"The height, in pixels, of the drop-down box in a KryptonComboBox.")] [EditorBrowsable(EditorBrowsableState.Always)] [DefaultValue(200)] [Browsable(true)] @@ -1666,10 +1666,10 @@ public int DropDownHeight } /// - /// Gets and sets the width, in pixels, of the drop down box in a KryptonComboBox. + /// Gets and sets the width, in pixels, of the drop-down box in a KryptonComboBox. /// [Category(@"Behavior")] - [Description(@"The width, in pixels, of the drop down box in a KryptonComboBox.")] + [Description(@"The width, in pixels, of the drop-down box in a KryptonComboBox.")] [EditorBrowsable(EditorBrowsableState.Always)] [Browsable(true)] public int DropDownWidth @@ -2960,8 +2960,8 @@ private void UpdateContentFromItemIndex(int index) } // Always ensure there is some text that can be measured, if only a single space. The height of - // the first item is used to calculate the total height of the drop down. So if the first time - // had null then the height would be very small for the item and also the drop down. + // the first item is used to calculate the total height of the drop-down. So if the first time + // had null then the height would be very small for the item and also the drop-down. if (string.IsNullOrEmpty(_contentValues.ShortText)) { _contentValues.ShortText = @" "; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs.rej new file mode 100644 index 000000000..ae1546718 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs (rejected hunks) +@@ -556,7 +556,7 @@ namespace Krypton.Toolkit + // Ask the button element to draw itself + _viewButton.Render(renderContext); + +- // Call the renderer directly to draw the drop-down glyph ++ // Call the renderer directly to draw the drop-down glyph + renderContext.Renderer.RenderGlyph.DrawInputControlDropDownGlyph(renderContext, + _viewButton.ClientRectangle, + _palette.PaletteContent, diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs index fd77d474b..799ef651a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs @@ -1437,29 +1437,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s return retImage ?? _redirector.GetRadioButtonImage(enabled, checkState, tracking, pressed); } - /// - /// Gets a drop-down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) - { - // Grab state specific image - var retImage = state switch - { - PaletteState.Disabled => Images.DropDownButton.Disabled, - PaletteState.Normal => Images.DropDownButton.Normal, - PaletteState.Tracking => Images.DropDownButton.Tracking, - PaletteState.Pressed => Images.DropDownButton.Pressed, - _ => null - }; - - // Use common image as the last resort - retImage ??= Images.DropDownButton.Common; - - // If nothing found then use the base palette - return retImage ?? _redirector.GetDropDownButtonImage(state); - } - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs.rej new file mode 100644 index 000000000..5683f90cb --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs.rej @@ -0,0 +1,31 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs (rejected hunks) +@@ -1466,29 +1466,6 @@ namespace Krypton.Toolkit + return retImage ?? _redirector.GetRadioButtonImage(enabled, checkState, tracking, pressed); + } + +- /// +- /// Gets a drop-down button image appropriate for the provided state. +- /// +- /// PaletteState for which image is required. +- public override Image? GetDropDownButtonImage(PaletteState state) +- { +- // Grab state specific image +- Image? retImage = state switch +- { +- PaletteState.Disabled => Images.DropDownButton.Disabled, +- PaletteState.Normal => Images.DropDownButton.Normal, +- PaletteState.Tracking => Images.DropDownButton.Tracking, +- PaletteState.Pressed => Images.DropDownButton.Pressed, +- _ => null +- }; +- +- // Use common image as the last resort +- retImage ??= Images.DropDownButton.Common; +- +- // If nothing found then use the base palette +- return retImage ?? _redirector.GetDropDownButtonImage(state); +- } +- + /// + /// Gets a checked image appropriate for a context menu item. + /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs index df7ae92a0..c7928cfb0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs @@ -191,10 +191,10 @@ public int MaxDropDownItems } /// - /// Gets and sets the height, in pixels, of the drop down box in a KryptonComboBox. + /// Gets and sets the height, in pixels, of the drop-down box in a KryptonComboBox. /// [Category(@"Behavior")] - [Description(@"The height, in pixels, of the drop down box in a KryptonComboBox.")] + [Description(@"The height, in pixels, of the drop-down box in a KryptonComboBox.")] [EditorBrowsable(EditorBrowsableState.Always)] [DefaultValue(200)] [Browsable(true)] @@ -234,10 +234,10 @@ public int DropDownHeight } /// - /// Gets and sets the width, in pixels, of the drop down box in a KryptonComboBox. + /// Gets and sets the width, in pixels, of the drop-down box in a KryptonComboBox. /// [Category(@"Behavior")] - [Description(@"The width, in pixels, of the drop down box in a KryptonComboBox.")] + [Description(@"The width, in pixels, of the drop-down box in a KryptonComboBox.")] [EditorBrowsable(EditorBrowsableState.Always)] [Browsable(true)] public int DropDownWidth diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs index 6c9d8f76d..3fde43df3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs @@ -641,10 +641,10 @@ public bool CalendarShowToday } /// - /// Gets and sets if clicking the Today button closes the drop down menu. + /// Gets and sets if clicking the Today button closes the drop-down menu. /// [Category(@"MonthCalendar")] - [Description(@"Indicates if clicking the Today button closes the drop down menu.")] + [Description(@"Indicates if clicking the Today button closes the drop-down menu.")] [DefaultValue(false)] public bool CalendarCloseOnTodayClick { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs index e5a9d51e6..4fecde230 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs @@ -115,17 +115,17 @@ public DateTimePickerButtonSpecCollection(KryptonDateTimePicker owner) public event EventHandler? ActiveFragmentChanged; /// - /// Occurs when the drop down is shown. + /// Occurs when the drop-down is shown. /// [Category(@"Action")] - [Description(@"Event raised when the drop down is shown.")] + [Description(@"Event raised when the drop-down is shown.")] public event EventHandler? DropDown; /// - /// Occurs when the drop down has been closed. + /// Occurs when the drop-down has been closed. /// [Category(@"Action")] - [Description(@"Event raised when the drop down has been closed.")] + [Description(@"Event raised when the drop-down has been closed.")] public event EventHandler? CloseUp; /// @@ -255,7 +255,7 @@ public KryptonDateTimePicker() _paletteDropDown = new PaletteTripleToPalette(Redirector, PaletteBackStyle.ButtonInputControl, PaletteBorderStyle.ButtonInputControl, PaletteContentStyle.ButtonInputControl); _paletteUpDown = new PaletteTripleToPalette(Redirector, PaletteBackStyle.ButtonInputControl, PaletteBorderStyle.ButtonInputControl, PaletteContentStyle.ButtonInputControl); - // Create buttons for drawing the drop down and up/down buttons + // Create buttons for drawing the drop-down and up/down buttons _buttonDropDown = new ViewDrawDateTimeButton(this, _paletteDropDown, new PaletteMetricRedirect(Redirector), this, ViewDrawDateTimeButton.DrawDateTimeGlyph.DropDownButton, NeedPaintDelegate, false); _buttonUp = new ViewDrawDateTimeButton(this, _paletteUpDown, new PaletteMetricRedirect(Redirector), this, ViewDrawDateTimeButton.DrawDateTimeGlyph.UpButton, NeedPaintDelegate, true); _buttonDown = new ViewDrawDateTimeButton(this, _paletteUpDown, new PaletteMetricRedirect(Redirector), this, ViewDrawDateTimeButton.DrawDateTimeGlyph.DownButton, NeedPaintDelegate, true); @@ -263,7 +263,7 @@ public KryptonDateTimePicker() _buttonUp.Click += OnUpClick; _buttonDown.Click += OnDownClick; - // Stretch the drop down button to be the height of the available area + // Stretch the drop-down button to be the height of the available area _dropStretch = new ViewLayoutStretch(Orientation.Vertical) { _buttonDropDown @@ -443,10 +443,10 @@ public string CalendarTodayText public bool CalendarShowToday { get; set; } /// - /// Gets and sets if clicking the Today button closes the drop down menu. + /// Gets and sets if clicking the Today button closes the drop-down menu. /// [Category(@"MonthCalendar")] - [Description(@"Indicates if clicking the Today button closes the drop down menu.")] + [Description(@"Indicates if clicking the Today button closes the drop-down menu.")] [DefaultValue(false)] public bool CalendarCloseOnTodayClick { get; set; } @@ -1326,7 +1326,7 @@ public void SelectLastFragment() public bool IsMouseOver { get; private set; } /// - /// Gets a value indicating if the drop down calendar is showing. + /// Gets a value indicating if the drop-down calendar is showing. /// [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] @@ -2188,7 +2188,7 @@ private void OnMonthCalendarDateChanged(object? sender, DateRangeEventArgs e) // Use new value Value = newDt; - // Remember that the date was changed from the drop down month calendar + // Remember that the date was changed from the drop-down month calendar _dropDownMonthChanged = true; } @@ -2275,7 +2275,7 @@ public class DTPContextMenu : KryptonContextMenu /// /// Initialize a new instance of the DTPContextMenu class. /// - /// Screen rectangle of the drop down button on the KryptonDateTimePicker. + /// Screen rectangle of the drop-down button on the KryptonDateTimePicker. public DTPContextMenu(Rectangle dropScreenRect) => _dropScreenRect = dropScreenRect; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs index efdf5091e..fea27d51c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs @@ -13,7 +13,7 @@ namespace Krypton.Toolkit { /// - /// Combines drop down button functionality with the styling features of the Krypton Toolkit. + /// Combines drop-down button functionality with the styling features of the Krypton Toolkit. /// [ToolboxItem(true)] [ToolboxBitmap(typeof(KryptonDropButton), "ToolboxBitmaps.KryptonDropButton.bmp")] @@ -28,7 +28,6 @@ public class KryptonDropButton : VisualSimpleBase, IButtonControl, IContentValue private readonly ViewDrawButton _drawButton; private ButtonStyle _style; private readonly ButtonController _buttonController; - private readonly PaletteRedirectDropDownButton _paletteDropDownButtonImages; private readonly PaletteTripleOverride _overrideFocus; private readonly PaletteTripleOverride _overrideNormal; private readonly PaletteTripleOverride _overrideTracking; @@ -41,10 +40,10 @@ public class KryptonDropButton : VisualSimpleBase, IButtonControl, IContentValue #region Events /// - /// Occurs when the drop down portion of the button is pressed. + /// Occurs when the drop-down portion of the button is pressed. /// [Category(@"Action")] - [Description(@"Occurs when the drop down portion of the button is pressed.")] + [Description(@"Occurs when the drop-down portion of the button is pressed.")] public event EventHandler? DropDown; /// @@ -74,10 +73,6 @@ public KryptonDropButton() // Create content storage Values = CreateButtonValues(NeedPaintDelegate); Values.TextChanged += OnButtonTextChanged; - Images = new DropDownButtonImages(NeedPaintDelegate); - - // Image need an extra redirector to check the local images first - _paletteDropDownButtonImages = new PaletteRedirectDropDownButton(Redirector, Images); // Create the palette storage StateCommon = new PaletteTripleRedirect(Redirector, PaletteBackStyle.ButtonStandalone, PaletteBorderStyle.ButtonStandalone, PaletteContentStyle.ButtonStandalone, NeedPaintDelegate); @@ -107,8 +102,7 @@ public KryptonDropButton() // Set default button state DropDown = true, Splitter = true, - TestForFocusCues = true, - DropDownPalette = _paletteDropDownButtonImages + TestForFocusCues = true }; // Create a button controller to handle button style behaviour @@ -259,10 +253,10 @@ public VisualOrientation DropDownOrientation } /// - /// Gets and sets if the button works as a splitter or as a drop down. + /// Gets and sets if the button works as a splitter or as a drop-down. /// [Category(@"Visuals")] - [Description(@"Determine if button acts as a splitter or just a drop down.")] + [Description(@"Determine if button acts as a splitter or just a drop-down.")] [DefaultValue(true)] public bool Splitter { @@ -312,16 +306,6 @@ public ButtonStyle ButtonStyle private bool ShouldSerializeValues() => !Values.IsDefault; - /// - /// Gets access to the image value overrides. - /// - [Category(@"Visuals")] - [Description(@"Image value overrides.")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public DropDownButtonImages Images { get; } - - private bool ShouldSerializeImages() => !Images.IsDefault; - /// /// Gets access to the common button appearance that other states can override. /// @@ -779,7 +763,7 @@ private void OnButtonClick(object? sender, MouseEventArgs e) { var showingContextMenu = false; - // Do we need to show a drop down menu? + // Do we need to show a drop-down menu? if (!Splitter || (Splitter && _drawButton.SplitRectangle.Contains(e.Location))) { showingContextMenu = ShowDropDown(); @@ -853,7 +837,7 @@ private bool ShowDropDown() break; } - // We are showing a drop down + // We are showing a drop-down showingContextMenu = true; // Show relative to the screen rectangle @@ -867,7 +851,7 @@ private bool ShowDropDown() Rectangle screenRect = RectangleToScreen(ClientRectangle); if (CommonHelper.ValidContextMenuStrip(cpma.ContextMenuStrip)) { - // We are showing a drop down + // We are showing a drop-down showingContextMenu = true; //...show the context menu below and at th left of the button diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs.rej new file mode 100644 index 000000000..292544167 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDropButton.cs (rejected hunks) +@@ -5,7 +5,7 @@ + * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. + * + * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) +- * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. ++ * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. + * + */ + #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualContextMenuDTP.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualContextMenuDTP.cs index 175db85ff..8794386b4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualContextMenuDTP.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualContextMenuDTP.cs @@ -13,7 +13,7 @@ namespace Krypton.Toolkit { /// - /// Specialized version of the visual context menu that knows about the KryptonDateTimePicker drop down button. + /// Specialized version of the visual context menu that knows about the KryptonDateTimePicker drop-down button. /// public class VisualContextMenuDTP : VisualContextMenu { @@ -33,7 +33,7 @@ public class VisualContextMenuDTP : VisualContextMenu /// Collection of context menu items to be displayed. /// Enabled state of the context menu. /// Was the context menu activate by a keyboard action. - /// Screen rectangle of the drop down button. + /// Screen rectangle of the drop-down button. public VisualContextMenuDTP(KryptonContextMenu contextMenu, PaletteBase? palette, PaletteMode paletteMode, @@ -57,7 +57,7 @@ public VisualContextMenuDTP(KryptonContextMenu contextMenu, /// Screen coordinates point. /// True to eat message; otherwise false. public override bool DoesMouseDownGetEaten(Message m, Point pt) => - // If the user dismissed the context menu by clicking down on the drop down button of + // If the user dismissed the context menu by clicking down on the drop-down button of // the KryptonDateTimePicker then eat the down message to prevent the down press from // opening the menu again. _dropScreenRect.Contains(new Point(pt.X, pt.Y)); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopup.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopup.cs index 18661418a..da9e7a810 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopup.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopup.cs @@ -229,7 +229,7 @@ public virtual bool DoesCurrentMouseDownEndAllTracking(Message m, Point pt) if (length > 0) { // If let the message occur as it is being pressed on a combo box - // drop down list and so it will process the message appropriately + // drop-down list and so it will process the message appropriately if (className.ToString() == "ComboLBox") { endTracking = false; 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 8cfc497e7..20e8f7553 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonColorButtonActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonColorButtonActionList.cs @@ -88,7 +88,7 @@ public Color SelectedColour } /// - /// Gets and sets the visual drop down position. + /// Gets and sets the visual drop-down position. /// public VisualOrientation DropDownPosition { @@ -103,7 +103,7 @@ public VisualOrientation DropDownPosition } /// - /// Gets and sets the visual drop down orientation. + /// Gets and sets the visual drop-down orientation. /// public VisualOrientation DropDownOrientation { @@ -118,7 +118,7 @@ public VisualOrientation DropDownOrientation } /// - /// Gets and sets the splitter or drop down functionality. + /// Gets and sets the splitter or drop-down functionality. /// public bool Splitter { 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 c658e83a7..afa39afe6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs @@ -139,7 +139,7 @@ public override DesignerActionItemCollection GetSortedActionItems() // Add the list of label specific actions actions.Add(new DesignerActionHeaderItem(nameof(Appearance))); actions.Add(new DesignerActionPropertyItem(nameof(KryptonContextMenu), @"Krypton Context Menu", nameof(Appearance), @"The Krypton Context Menu for the control.")); - actions.Add(new DesignerActionPropertyItem(nameof(DropDownStyle), @"Drop Down Style", nameof(Appearance), @"The combobox drop down style.")); + actions.Add(new DesignerActionPropertyItem(nameof(DropDownStyle), @"Drop Down Style", nameof(Appearance), @"The combobox drop-down style.")); actions.Add(new DesignerActionPropertyItem(nameof(InputControlStyle), @"Style", nameof(Appearance), @"ComboBox display style.")); actions.Add(new DesignerActionPropertyItem(nameof(Font), nameof(Font), nameof(Appearance), @"The font for the combobox.")); actions.Add(new DesignerActionHeaderItem(@"Visuals")); diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs.rej new file mode 100644 index 000000000..cea536787 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs.rej @@ -0,0 +1,21 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonComboBoxActionList.cs (rejected hunks) +@@ -53,8 +53,8 @@ namespace Krypton.Toolkit + } + } + +- /// Gets or sets the drop-down style. +- /// The drop-down style. ++ /// Gets or sets the drop-down style. ++ /// The drop-down style. + public ComboBoxStyle DropDownStyle + { + get => _comboBox.DropDownStyle; +@@ -156,7 +156,7 @@ namespace Krypton.Toolkit + // Add the list of label specific actions + actions.Add(new DesignerActionHeaderItem(nameof(Appearance))); + actions.Add(new DesignerActionPropertyItem(nameof(KryptonContextMenu), @"Krypton Context Menu", nameof(Appearance), @"The Krypton Context Menu for the control.")); +- actions.Add(new DesignerActionPropertyItem(nameof(DropDownStyle), @"Drop Down Style", nameof(Appearance), @"The combobox drop-down style.")); ++ actions.Add(new DesignerActionPropertyItem(nameof(DropDownStyle), @"drop-down Style", nameof(Appearance), @"The combobox drop-down style.")); + actions.Add(new DesignerActionPropertyItem(nameof(InputControlStyle), @"Style", nameof(Appearance), @"ComboBox display style.")); + actions.Add(new DesignerActionPropertyItem(nameof(Font), nameof(Font), nameof(Appearance), @"The font for the combobox.")); + actions.Add(new DesignerActionPropertyItem(nameof(StateCommonCornerRoundingRadius), @"State Common Corner Rounding Radius", nameof(Appearance), @"The corner rounding radius of the control.")); 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 30050af9a..6656389a6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDropButtonActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonDropButtonActionList.cs @@ -88,7 +88,7 @@ public KryptonContextMenu? KryptonContextMenu } /// - /// Gets and sets the visual drop down position. + /// Gets and sets the visual drop-down position. /// public VisualOrientation DropDownPosition { @@ -105,7 +105,7 @@ public VisualOrientation DropDownPosition } /// - /// Gets and sets the visual drop down orientation. + /// Gets and sets the visual drop-down orientation. /// public VisualOrientation DropDownOrientation { @@ -122,7 +122,7 @@ public VisualOrientation DropDownOrientation } /// - /// Gets and sets the splitter or drop down functionality. + /// Gets and sets the splitter or drop-down functionality. /// public bool Splitter { diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonDropButtonDesigner.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonDropButtonDesigner.cs.rej new file mode 100644 index 000000000..4d035246d --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonDropButtonDesigner.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonDropButtonDesigner.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonDropButtonDesigner.cs (rejected hunks) +@@ -37,7 +37,7 @@ namespace Krypton.Toolkit + // Create a collection of action lists + var actionLists = new DesignerActionListCollection + { +- // Add the drop-down button specific list ++ // Add the drop-down button specific list + new KryptonDropButtonActionList(this) + }; + diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs index 70590ce33..25b9f5682 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs @@ -20,7 +20,7 @@ internal class PaletteDrawBordersEditor : UITypeEditor /// An ITypeDescriptorContext that can be used to gain additional context information. /// UITypeEditorEditStyle value. /// - /// We show a drop down for editing the PaletteDrawBorders value. + /// We show a drop-down for editing the PaletteDrawBorders value. /// public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? context) => context?.Instance != null ? UITypeEditorEditStyle.DropDown @@ -43,7 +43,7 @@ public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? conte if ((context is not null) && (value is not null)) { - // Grab the service needed to show the drop down + // Grab the service needed to show the drop-down if (provider.GetService(typeof(IWindowsFormsEditorService)) is IWindowsFormsEditorService service) { // Create the custom control used to edit value @@ -53,7 +53,7 @@ public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? conte Value = (PaletteDrawBorders)value }; - // Show as a drop down control + // Show as a drop-down control service.DropDownControl(selector); // Return the updated value diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs.rej new file mode 100644 index 000000000..674cc33b9 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs (rejected hunks) +@@ -39,7 +39,7 @@ namespace Krypton.Toolkit + { + if ((context != null) && (provider != null) && (value != null)) + { +- // Grab the service needed to show the drop-down ++ // Grab the service needed to show the drop-down + var service = (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService)); + + if (service != null) diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Other/OverrideComboBoxStyleDropDownStyle.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Other/OverrideComboBoxStyleDropDownStyle.cs index 84a244f6f..4a469b0c9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Other/OverrideComboBoxStyleDropDownStyle.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Other/OverrideComboBoxStyleDropDownStyle.cs @@ -20,7 +20,7 @@ internal class OverrideComboBoxStyleDropDownStyle : UITypeEditor /// An ITypeDescriptorContext that can be used to gain additional context information. /// UITypeEditorEditStyle value. /// - /// We show a drop down for editing the PaletteDrawBorders value. + /// We show a drop-down for editing the PaletteDrawBorders value. /// public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? context) => context?.Instance != null ? UITypeEditorEditStyle.DropDown diff --git a/Source/Krypton Components/Krypton.Toolkit/EventArgs/DateTimePickerDropArgs.cs b/Source/Krypton Components/Krypton.Toolkit/EventArgs/DateTimePickerDropArgs.cs index 3bfb9078c..1ea764045 100644 --- a/Source/Krypton Components/Krypton.Toolkit/EventArgs/DateTimePickerDropArgs.cs +++ b/Source/Krypton Components/Krypton.Toolkit/EventArgs/DateTimePickerDropArgs.cs @@ -13,7 +13,7 @@ namespace Krypton.Toolkit { /// - /// Details about the context menu about to be shown when clicking the drop down button on a KryptonDateTimePicker. + /// Details about the context menu about to be shown when clicking the drop-down button on a KryptonDateTimePicker. /// public class DateTimePickerDropArgs : CancelEventArgs { diff --git a/Source/Krypton Components/Krypton.Toolkit/General/DesignTimeUtilities.cs b/Source/Krypton Components/Krypton.Toolkit/General/DesignTimeUtilities.cs index a3cb0268d..a92240d48 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/DesignTimeUtilities.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/DesignTimeUtilities.cs @@ -348,7 +348,7 @@ internal class DesignTimeUtilities internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_ARROW_RIGHT = @"Arrow Right"; internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_ARROW_UP = @"Arrow Up"; internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_ARROW_DOWN = @"Arrow Down"; - internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_DROP_DOWN = @"Drop Down"; + internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_DROP_DOWN = @"drop-down"; internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_PIN_VERTICAL = @"Pin Vertical"; internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_PIN_HORIZONTAL = @"Pin Horizontal"; internal const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_FORM_CLOSE = @"Form Close"; diff --git a/Source/Krypton Components/Krypton.Toolkit/General/PlatformInvoke.cs b/Source/Krypton Components/Krypton.Toolkit/General/PlatformInvoke.cs index 2b64ba2e0..aa5afb473 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/PlatformInvoke.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/PlatformInvoke.cs @@ -2548,7 +2548,7 @@ public const uint DEFSPLITBUTTON = 0x0, // Creates a split button that behaves like a BS_PUSHBUTTON style button, but also has a distinctive appearance. If the split button is in a dialog box, the user can select the split button by pressing the ENTER key, even when the split button does not have the input focus. This style is useful for enabling the user to quickly select the most likely (default) option. NOTIFY = 0x0, // Enables a button to send BN_KILLFOCUS and BN_SETFOCUS notification codes to its parent window. //Note that buttons send the BN_CLICKED notification code regardless of whether it has this style. To get BN_DBLCLK notification codes, the button must have the BS_RADIOBUTTON or BS_OWNERDRAW style. -SPLITBUTTON = 0x0, // Creates a split button. A split button has a drop down arrow. +SPLITBUTTON = 0x0, // Creates a split button. A split button has a drop-down arrow. BS_ICON or BS_BITMAP set? BM_SETIMAGE called? Result Yes Yes Show icon only. No Yes Show icon and text. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs index d56eb5223..0284b16d2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs @@ -3308,7 +3308,7 @@ public enum PaletteButtonSpecStyle ArrowDown, /// - /// Specifies a drop down button specification. + /// Specifies a drop-down button specification. /// DropDown, @@ -4192,7 +4192,7 @@ public enum PaletteRibbonGalleryButton Down, /// - /// Specifies the drop down gallery button. + /// Specifies the drop-down gallery button. /// DropDown } 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 669ec7222..c6bf1a344 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs @@ -668,12 +668,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s /// Appropriate image for drawing; otherwise null. public override Image? GetRadioButtonImage(bool enabled, bool checkState, bool tracking, bool pressed) => _target?.GetRadioButtonImage(enabled, checkState, tracking, pressed); - /// - /// Gets a drop-down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _target?.GetDropDownButtonImage(state); - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs.rej b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs.rej new file mode 100644 index 000000000..9ad4e42dc --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs.rej @@ -0,0 +1,14 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirect.cs (rejected hunks) +@@ -666,12 +666,6 @@ namespace Krypton.Toolkit + /// Appropriate image for drawing; otherwise null. + public override Image? GetRadioButtonImage(bool enabled, bool checkState, bool tracking, bool pressed) => _target?.GetRadioButtonImage(enabled, checkState, tracking, pressed); + +- /// +- /// Gets a drop-down button image appropriate for the provided state. +- /// +- /// PaletteState for which image is required. +- public override Image? GetDropDownButtonImage(PaletteState state) => _target?.GetDropDownButtonImage(state); +- + /// + /// Gets a checked image appropriate for a context menu item. + /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/PaletteBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/PaletteBase.cs index 59bcd7e52..371ec7c56 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/PaletteBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/PaletteBase.cs @@ -731,12 +731,6 @@ public abstract Padding GetBorderContentPadding(KryptonForm? owningForm, Palette /// Appropriate image for drawing; otherwise null. public abstract Image? GetRadioButtonImage(bool enabled, bool checkState, bool tracking, bool pressed); - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public abstract Image? GetDropDownButtonImage(PaletteState state); - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Bases/PaletteMicrosoft365Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Bases/PaletteMicrosoft365Base.cs index f5a843773..32d1a0613 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Bases/PaletteMicrosoft365Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Bases/PaletteMicrosoft365Base.cs @@ -3266,12 +3266,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkMode.cs index cfae1fd8a..b2e9c065d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkMode.cs @@ -419,12 +419,6 @@ public PaletteMicrosoft365BlackDarkMode() : base(_schemeOfficeColors, _checkBoxL #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); /// /// Gets an image indicating a sub-menu on a context menu item. @@ -3905,12 +3899,6 @@ public override Image GetCheckBoxImage(bool enabled, CheckState checkState, bool } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5618,7 +5606,7 @@ public KryptonColorTable365BlackDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkModeAlternate.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkModeAlternate.cs index d4b2c0d49..8a7d06d8a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkModeAlternate.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlackDarkModeAlternate.cs @@ -421,13 +421,6 @@ public PaletteMicrosoft365BlackDarkModeAlternate() : base(_schemeOfficeColors, _ #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3833,12 +3826,6 @@ public override Image GetCheckBoxImage(bool enabled, CheckState checkState, bool } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5546,7 +5533,7 @@ public KryptonColorTable365BlackDarkModeAlternate([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueDarkMode.cs index 128b5c904..1f92570b0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueDarkMode.cs @@ -414,13 +414,6 @@ public PaletteMicrosoft365BlueDarkMode() : base(_schemeOfficeColors, _checkBoxLi #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3766,12 +3759,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5479,7 +5466,7 @@ public KryptonColorTable365BlueDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueLightMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueLightMode.cs index 64c3f797b..df7f8aecf 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueLightMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365BlueLightMode.cs @@ -426,13 +426,6 @@ public PaletteMicrosoft365BlueLightMode() : base(_schemeOfficeColors, _checkBoxL #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3813,12 +3806,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5541,7 +5528,7 @@ public KryptonColorTable365BlueLightMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverDarkMode.cs index e948ba23b..c6693d038 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverDarkMode.cs @@ -414,13 +414,6 @@ public PaletteMicrosoft365SilverDarkMode() : base(_schemeOfficeColors, _checkBox #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3789,12 +3782,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5517,7 +5504,7 @@ public KryptonColorTable365SilverDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverLightMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverLightMode.cs index 7c35c4a86..ba84c3926 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverLightMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/PaletteMicrosoft365SilverLightMode.cs @@ -418,13 +418,6 @@ public PaletteMicrosoft365SilverLightMode() : base(_schemeOfficeColors, _checkBo #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3807,12 +3800,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5536,7 +5523,7 @@ public KryptonColorTable365SilverLightMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/PaletteMicrosoft365Blue.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/PaletteMicrosoft365Blue.cs index 19924f7f5..f0ad211a7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/PaletteMicrosoft365Blue.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/PaletteMicrosoft365Blue.cs @@ -425,13 +425,6 @@ public PaletteMicrosoft365Blue() : base(_schemeOfficeColors, _checkBoxList, _gal #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Black.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Black.cs index 466642aeb..5621a38eb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Black.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Black.cs @@ -431,13 +431,6 @@ public PaletteMicrosoft365Black() : base(_schemeOfficeColors, _checkBoxList, _ga #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365DarkGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365DarkGray.cs index 9d442f097..7cfc2e9ac 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365DarkGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365DarkGray.cs @@ -414,12 +414,6 @@ public PaletteMicrosoft365DarkGray() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Silver.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Silver.cs index bbf717199..b3388ffd8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Silver.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Silver.cs @@ -428,13 +428,6 @@ public PaletteMicrosoft365Silver() : base(_schemeOfficeColors, _checkBoxList, _g #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - /// - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365White.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365White.cs index e5bec02e6..845bcce74 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365White.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365White.cs @@ -418,12 +418,6 @@ public PaletteMicrosoft365White() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Bases/PaletteOffice2007Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Bases/PaletteOffice2007Base.cs index c102cf459..4426992a1 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Bases/PaletteOffice2007Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Bases/PaletteOffice2007Base.cs @@ -3786,12 +3786,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlackDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlackDarkMode.cs index ffe0e45ad..b89921afe 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlackDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlackDarkMode.cs @@ -504,12 +504,6 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -4539,12 +4533,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -6484,7 +6472,7 @@ public KryptonColorTable2007BlackDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueDarkMode.cs index e712cf583..e0d0b476d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueDarkMode.cs @@ -344,12 +344,6 @@ public PaletteOffice2007BlueDarkMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3831,12 +3825,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5756,7 +5744,7 @@ public KryptonColorTable2007BlueDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueLightMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueLightMode.cs index 7c1791efd..b9bc0f84a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueLightMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007BlueLightMode.cs @@ -346,12 +346,6 @@ public PaletteOffice2007BlueLightMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -4307,12 +4301,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -6232,7 +6220,7 @@ public KryptonColorTable2007BlueLightMode([DisallowNull] Color[] colours, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverDarkMode.cs index 97913a623..21df7fb74 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverDarkMode.cs @@ -350,12 +350,6 @@ public PaletteOffice2007SilverDarkMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -4281,12 +4275,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -6192,7 +6180,7 @@ public KryptonColorTable2007SilverDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverLightMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverLightMode.cs index 4f8530ccd..1c66fdd4f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverLightMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/PaletteOffice2007SilverLightMode.cs @@ -350,12 +350,6 @@ public PaletteOffice2007SilverLightMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -4332,12 +4326,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -6230,7 +6218,7 @@ public KryptonColorTable2007SilverLightMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007DarkGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007DarkGray.cs index 9cd2c69d6..71fe926fd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007DarkGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007DarkGray.cs @@ -345,12 +345,6 @@ public PaletteOffice2007DarkGray() : base(_themeName, _schemeOfficeColours, _che #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007White.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007White.cs index 54b3d8382..23ed82e9c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007White.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007White.cs @@ -358,12 +358,6 @@ public PaletteOffice2007White() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Black.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Black.cs index d704257f9..5e4e9fc56 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Black.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Black.cs @@ -518,12 +518,6 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Blue.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Blue.cs index 6abae4ec7..49bba35b3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Blue.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Blue.cs @@ -349,12 +349,6 @@ public PaletteOffice2007Blue() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Silver.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Silver.cs index 9adec4db2..6c8e43d8a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Silver.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/PaletteOffice2007Silver.cs @@ -349,12 +349,6 @@ public PaletteOffice2007Silver() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010Base.cs index 54f4cba49..a08b3d007 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010Base.cs @@ -3580,12 +3580,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlackDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlackDarkMode.cs index 33fea8298..e4efa2831 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlackDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlackDarkMode.cs @@ -631,12 +631,6 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -4101,12 +4095,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5801,7 +5789,7 @@ public KryptonColorTable2010BlackDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueDarkMode.cs index 97746df87..483e0dabf 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueDarkMode.cs @@ -368,12 +368,6 @@ public PaletteOffice2010BlueDarkMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3723,12 +3717,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5423,7 +5411,7 @@ public KryptonColorTable2010BlueDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueLightMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueLightMode.cs index 66e7f84f0..ea6bb363e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueLightMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010BlueLightMode.cs @@ -380,12 +380,6 @@ public PaletteOffice2010BlueLightMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3713,12 +3707,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5413,7 +5401,7 @@ public KryptonColorTable2010BlueLightMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverDarkMode.cs index 5d06e0efb..1574696c0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverDarkMode.cs @@ -370,12 +370,6 @@ public PaletteOffice2010SilverDarkMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3749,12 +3743,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5510,7 +5498,7 @@ public KryptonColorTable2010SilverDarkMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverLightMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverLightMode.cs index 2776142d2..d1989e47a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverLightMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/PaletteOffice2010SilverLightMode.cs @@ -374,12 +374,6 @@ public PaletteOffice2010SilverLightMode() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3732,12 +3726,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// @@ -5433,7 +5421,7 @@ public KryptonColorTable2010SilverLightMode([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010DarkGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010DarkGray.cs index 2a0e2a1d7..83e098589 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010DarkGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010DarkGray.cs @@ -362,12 +362,6 @@ public PaletteOffice2010DarkGray() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010White.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010White.cs index 3e461e30f..66726c7cd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010White.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010White.cs @@ -365,12 +365,6 @@ public PaletteOffice2010White() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Black.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Black.cs index ede118328..bde3ec68c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Black.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Black.cs @@ -393,12 +393,6 @@ public PaletteOffice2010Black() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blackDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3750,12 +3744,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Blue.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Blue.cs index dbf42b419..9901be4e3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Blue.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Blue.cs @@ -372,12 +372,6 @@ public PaletteOffice2010Blue() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Silver.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Silver.cs index f0b1fd899..6b1c624bd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Silver.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/PaletteOffice2010Silver.cs @@ -365,12 +365,6 @@ public PaletteOffice2010Silver() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013Base.cs index 4e66e17b1..e5be4e708 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013Base.cs @@ -3176,12 +3176,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013DarkGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013DarkGray.cs index 91d75c32f..a92b860af 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013DarkGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013DarkGray.cs @@ -357,12 +357,6 @@ public PaletteOffice2013DarkGray() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013LightGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013LightGray.cs index 32a46eff4..7675d228f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013LightGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013LightGray.cs @@ -357,12 +357,6 @@ public PaletteOffice2013LightGray() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013White.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013White.cs index d5cd2e1c8..0c9ea6352 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013White.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/PaletteOffice2013White.cs @@ -364,12 +364,6 @@ public PaletteOffice2013White() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _silverDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// @@ -3555,12 +3549,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalOffice2003.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalOffice2003.cs index b782a92eb..d36be982d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalOffice2003.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalOffice2003.cs @@ -3113,24 +3113,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s /// Appropriate image for drawing; otherwise null. public override Image? GetRadioButtonImage(bool enabled, bool checkState, bool tracking, bool pressed) => null; // null is intentional; Apparently ?!?!? - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) - { - if (state != PaletteState.Disabled) - { - return _normalDropDownImage ??= CreateDropDownImage(SystemColors.ControlText); - //_normalDropDownColor = SystemColors.ControlText; - } - else - { - return _disabledDropDownImage ??= CreateDropDownImage(SystemColors.ControlDark); - //_disabledDropDownColor = SystemColors.ControlDark; - } - } - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalSystem.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalSystem.cs index f1a698b27..4a6ed1979 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalSystem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalSystem.cs @@ -2819,26 +2819,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s /// Appropriate image for drawing; otherwise null. public override Image? GetRadioButtonImage(bool enabled, bool checkState, bool tracking, bool pressed) => null; - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) - { - if (state != PaletteState.Disabled) - { - _normalDropDownImage ??= CreateDropDownImage(SystemColors.ControlText); - - return _normalDropDownImage; - } - else - { - _disabledDropDownImage ??= CreateDropDownImage(SystemColors.ControlDark); - - return _disabledDropDownImage; - } - } - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBase.cs index 24b66f0a3..5c791b78e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBase.cs @@ -3144,12 +3144,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state == PaletteState.Disabled ? _disabledDropDown : _sparkleDropDownOutlineButton; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/PaletteSparkleBlueDarkMode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/PaletteSparkleBlueDarkMode.cs index 4b33bede2..1cb4bb07a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/PaletteSparkleBlueDarkMode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/PaletteSparkleBlueDarkMode.cs @@ -3376,12 +3376,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state == PaletteState.Disabled ? _disabledDropDown : _sparkleDropDownOutlineButton; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/PaletteVisualStudioBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/PaletteVisualStudioBase.cs index 0ea820bc3..b43ac1880 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/PaletteVisualStudioBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/PaletteVisualStudioBase.cs @@ -2348,12 +2348,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2007/PaletteVisualStudio2010With2007Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2007/PaletteVisualStudio2010With2007Base.cs index a807f048c..d49d6d413 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2007/PaletteVisualStudio2010With2007Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2007/PaletteVisualStudio2010With2007Base.cs @@ -3139,12 +3139,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2010/PaletteVisualStudio2010With2010Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2010/PaletteVisualStudio2010With2010Base.cs index 3224865c1..83c5c8baf 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2010/PaletteVisualStudio2010With2010Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2010/PaletteVisualStudio2010With2010Base.cs @@ -3140,12 +3140,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2013/PaletteVisualStudio2010With2013Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2013/PaletteVisualStudio2010With2013Base.cs index b4627a9b5..1205ec4ed 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2013/PaletteVisualStudio2010With2013Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/2013/PaletteVisualStudio2010With2013Base.cs @@ -3137,12 +3137,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/365/PaletteVisualStudio2010With365Base.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/365/PaletteVisualStudio2010With365Base.cs index 40f2d7d3e..0e5990824 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/365/PaletteVisualStudio2010With365Base.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Base/Visual Studio 2010/Renderers/365/PaletteVisualStudio2010With365Base.cs @@ -3139,12 +3139,6 @@ public override Padding GetMetricPadding(KryptonForm? owningForm, PaletteState s } } - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => _disabledDropDown; - /// /// Gets a checked image appropriate for a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/PaletteVisualStudio2010Office2007Variation.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/PaletteVisualStudio2010Office2007Variation.cs index a97e315fc..8f939d32d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/PaletteVisualStudio2010Office2007Variation.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/PaletteVisualStudio2010Office2007Variation.cs @@ -346,12 +346,6 @@ public PaletteVisualStudio2010Office2007Variation() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/PaletteVisualStudio2010Office2010Variation.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/PaletteVisualStudio2010Office2010Variation.cs index 873a8bec5..18753dab9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/PaletteVisualStudio2010Office2010Variation.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/PaletteVisualStudio2010Office2010Variation.cs @@ -361,12 +361,6 @@ public PaletteVisualStudio2010Office2010Variation() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/PaletteVisualStudio2010Office2013Variation.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/PaletteVisualStudio2010Office2013Variation.cs index 13fd18589..7389d9f19 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/PaletteVisualStudio2010Office2013Variation.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/PaletteVisualStudio2010Office2013Variation.cs @@ -352,12 +352,6 @@ public PaletteVisualStudio2010Office2013Variation() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/PaletteVisualStudio2010Microsoft365Variation.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/PaletteVisualStudio2010Microsoft365Variation.cs index 3c0749704..544080aa9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/PaletteVisualStudio2010Microsoft365Variation.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/PaletteVisualStudio2010Microsoft365Variation.cs @@ -352,12 +352,6 @@ public PaletteVisualStudio2010Microsoft365Variation() #endregion #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) => state != PaletteState.Disabled ? _blueDropDownButton : base.GetDropDownButtonImage(state); - /// /// Gets an image indicating a sub-menu on a context menu item. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecs.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecs.cs index 4c4fae2e4..c08a4963f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecs.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecs.cs @@ -329,11 +329,11 @@ public void PopulateFromBase() #region DropDown /// - /// Gets access to the drop down button specification. + /// Gets access to the drop-down button specification. /// [KryptonPersist] [Category(@"Visuals")] - [Description(@"Overrides for defining drop down button specifications.")] + [Description(@"Overrides for defining drop-down button specifications.")] [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public KryptonPaletteButtonSpecTyped DropDown { get; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImages.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImages.cs index 627645ff7..dc2231487 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImages.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImages.cs @@ -32,7 +32,6 @@ public KryptonPaletteImages([DisallowNull] PaletteRedirect redirector, // Create the different image sets CheckBox = new KryptonPaletteImagesCheckBox(redirector, needPaint); ContextMenu = new KryptonPaletteImagesContextMenu(redirector, needPaint); - DropDownButton = new KryptonPaletteImagesDropDownButton(redirector, needPaint); GalleryButtons = new KryptonPaletteImagesGalleryButtons(redirector, needPaint); RadioButton = new KryptonPaletteImagesRadioButton(redirector, needPaint); TreeView = new KryptonPaletteImagesTreeView(redirector, needPaint); @@ -48,7 +47,6 @@ public KryptonPaletteImages([DisallowNull] PaletteRedirect redirector, [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => CheckBox.IsDefault && ContextMenu.IsDefault && - DropDownButton.IsDefault && GalleryButtons.IsDefault && RadioButton.IsDefault && TreeView.IsDefault; @@ -64,7 +62,6 @@ public void PopulateFromBase() // Populate only the designated styles CheckBox.PopulateFromBase(); ContextMenu.PopulateFromBase(); - DropDownButton.PopulateFromBase(); GalleryButtons.PopulateFromBase(); RadioButton.PopulateFromBase(); TreeView.PopulateFromBase(); @@ -99,20 +96,6 @@ public void PopulateFromBase() #endregion - #region DropDownButton - /// - /// Gets access to the drop down button set of images. - /// - [KryptonPersist] - [Category(@"Visuals")] - [Description(@"Overrides for defining drop down button images.")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public KryptonPaletteImagesDropDownButton DropDownButton { get; } - - private bool ShouldSerializeDropDownButton() => !DropDownButton.IsDefault; - - #endregion - #region CheckBox /// /// Gets access to the gallery button images. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesDropDownButton.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesDropDownButton.cs deleted file mode 100644 index 1cc2f7b72..000000000 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesDropDownButton.cs +++ /dev/null @@ -1,235 +0,0 @@ -#region BSD License -/* - * - * Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE) - * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. - * - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2024. All rights reserved. - * - */ -#endregion - -namespace Krypton.Toolkit -{ - /// - /// Storage for palette drop down button images. - /// - public class KryptonPaletteImagesDropDownButton : Storage - { - #region Instance Fields - private PaletteRedirect? _redirect; - private Image? _common; - private Image? _disabled; - private Image? _normal; - private Image? _tracking; - private Image? _pressed; - #endregion - - #region Identity - /// - /// Initialize a new instance of the KryptonPaletteImagesDropDownButton class. - /// - /// Redirector to inherit values from. - /// Delegate for notifying paint requests. - public KryptonPaletteImagesDropDownButton(PaletteRedirect? redirect, - NeedPaintHandler needPaint) - { - // Store the redirector - _redirect = redirect; - - // Store the provided paint notification delegate - NeedPaint = needPaint; - - // Create the storage - _common = null; - _disabled = null; - _normal = null; - _tracking = null; - _pressed = null; - } - #endregion - - #region IsDefault - /// - /// Gets a value indicating if all values are default. - /// - [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (_common == null) && - (_disabled == null) && - (_normal == null) && - (_tracking == null) && - (_pressed == null); - - #endregion - - #region PopulateFromBase - /// - /// Populate values from the base palette. - /// - public void PopulateFromBase() - { - _disabled = _redirect?.GetDropDownButtonImage(PaletteState.Disabled); - _normal = _redirect?.GetDropDownButtonImage(PaletteState.Normal); - _tracking = _redirect?.GetDropDownButtonImage(PaletteState.Tracking); - _pressed = _redirect?.GetDropDownButtonImage(PaletteState.Pressed); - } - #endregion - - #region SetRedirector - /// - /// Update the redirector with new reference. - /// - /// Target redirector. - public void SetRedirector(PaletteRedirect? redirect) => - // Update our cached reference - _redirect = redirect; - #endregion - - #region Common - /// - /// Gets and sets the common image that other drop down button images inherit from. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Common image that other drop down button images inherit from.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Common - { - get => _common; - - set - { - if (_common != value) - { - _common = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Common property to its default value. - /// - public void ResetCommon() => Common = null; - #endregion - - #region Disabled - /// - /// Gets and sets the image for use when the drop down button is disabled. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is disabled.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Disabled - { - get => _disabled; - - set - { - if (_disabled != value) - { - _disabled = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Disabled property to its default value. - /// - public void ResetDisabled() => Disabled = null; - #endregion - - #region Normal - /// - /// Gets and sets the image for use when the drop down button is not disabled. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is not disabled.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Normal - { - get => _normal; - - set - { - if (_normal != value) - { - _normal = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Normal property to its default value. - /// - public void ResetNormal() => Normal = null; - #endregion - - #region Tracking - /// - /// Gets and sets the image for use when the drop down button is tracking. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is tracking.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Tracking - { - get => _tracking; - - set - { - if (_tracking != value) - { - _tracking = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Tracking property to its default value. - /// - public void ResetTracking() => Tracking = null; - #endregion - - #region Pressed - /// - /// Gets and sets the image for use when the drop down button is pressed. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is pressed.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Pressed - { - get => _pressed; - - set - { - if (_pressed != value) - { - _pressed = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Pressed property to its default value. - /// - public void ResetPressed() => Pressed = null; - #endregion - } -} diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesGalleryButtons.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesGalleryButtons.cs index a22dfd0ad..92b96ca46 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesGalleryButtons.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteImagesGalleryButtons.cs @@ -86,11 +86,11 @@ public void PopulateFromBase() #region DropDown /// - /// Gallery drop down button images. + /// Gallery drop-down button images. /// [KryptonPersist(true)] [Category(@"Visuals")] - [Description(@"Gallery drop down button images.")] + [Description(@"Gallery drop-down button images.")] [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public KryptonPaletteImagesGalleryButton DropDown { get; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2007.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2007.cs index 10cb7b353..f35f13a7d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2007.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2007.cs @@ -563,7 +563,7 @@ public KryptonColorTable2007([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2010.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2010.cs index bfeb7feee..40e267f4a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2010.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2010.cs @@ -599,7 +599,7 @@ public KryptonColorTable2010([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2013.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2013.cs index e5ea6458a..4470a1220 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2013.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable2013.cs @@ -605,7 +605,7 @@ public KryptonColorTable2013([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable365.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable365.cs index 12078591e..50cc09279 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable365.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTable365.cs @@ -606,7 +606,7 @@ public KryptonColorTable365([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableMicrosoft365.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableMicrosoft365.cs index b7c77ee1b..897e0e381 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableMicrosoft365.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableMicrosoft365.cs @@ -570,7 +570,7 @@ public KryptonColorTableMicrosoft365([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableSparkle.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableSparkle.cs index 3036cfb99..485f4393a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableSparkle.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableSparkle.cs @@ -560,7 +560,7 @@ public KryptonColorTableSparkle([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableVisualStudio.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableVisualStudio.cs index 1312458d7..547359a4b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableVisualStudio.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonColorTableVisualStudio.cs @@ -568,7 +568,7 @@ public KryptonColorTableVisualStudio([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2007ColorTable.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2007ColorTable.cs index 21c515fb1..7e79a27f5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2007ColorTable.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2007ColorTable.cs @@ -561,7 +561,7 @@ public KryptonVisualStudio2010With2007ColorTable([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2010ColorTable.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2010ColorTable.cs index 36cfb75c9..75542f5ea 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2010ColorTable.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2010ColorTable.cs @@ -562,7 +562,7 @@ public KryptonVisualStudio2010With2010ColorTable([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2013ColorTable.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2013ColorTable.cs index 6e4d3c99c..4a07263bb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2013ColorTable.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010With2013ColorTable.cs @@ -568,7 +568,7 @@ public KryptonVisualStudio2010With2013ColorTable([DisallowNull] Color[] colors, #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010WithMicrosoft365ColorTable.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010WithMicrosoft365ColorTable.cs index a1a0a9559..9f2cd56df 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010WithMicrosoft365ColorTable.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonVisualStudio2010WithMicrosoft365ColorTable.cs @@ -569,7 +569,7 @@ public KryptonVisualStudio2010WithMicrosoft365ColorTable([DisallowNull] Color[] #region ToolStripDropDownBackground /// - /// Gets the background color for drop down menus. + /// Gets the background color for drop-down menus. /// public override Color ToolStripDropDownBackground => _contextMenuBackground; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectDropDownButton.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectDropDownButton.cs deleted file mode 100644 index 216749796..000000000 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteRedirectDropDownButton.cs +++ /dev/null @@ -1,91 +0,0 @@ -#region BSD License -/* - * - * Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE) - * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. - * - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2024. All rights reserved. - * - */ -#endregion - -namespace Krypton.Toolkit -{ - /// - /// Redirects requests for drop down button images from the DropDownButtonImages instance. - /// - public class PaletteRedirectDropDownButton : PaletteRedirect - { - #region Instance Fields - private readonly DropDownButtonImages _images; - #endregion - - #region Identity - /// - /// Initialize a new instance of the PaletteRedirectDropDownButton class. - /// - /// Reference to source of drop down button images. - public PaletteRedirectDropDownButton(DropDownButtonImages images) - : this(null, images) - { - } - - /// - /// Initialize a new instance of the PaletteRedirectDropDownButton class. - /// - /// Initial palette target for redirection. - /// Reference to source of drop down button images. - public PaletteRedirectDropDownButton(PaletteBase? target, - [DisallowNull] DropDownButtonImages images) - : base(target) - { - Debug.Assert(images != null); - - // Remember incoming target - _images = images!; - } - #endregion - - #region Images - /// - /// Gets a drop down button image appropriate for the provided state. - /// - /// PaletteState for which image is required. - public override Image? GetDropDownButtonImage(PaletteState state) - { - // Grab state specific image - Image? retImage = state switch - { - PaletteState.Disabled => _images.Disabled, - PaletteState.Normal => _images.Normal, - PaletteState.Tracking => _images.Tracking, - PaletteState.Pressed => _images.Pressed, - _ => null - }; - - // Not found, then get the common image - if (retImage == null) - { - retImage = _images.Common; - if ((state == PaletteState.Disabled) - && (retImage != null) - ) - { - // Convert the image into the disabled equivalent - var disabledImage = new Bitmap(retImage.Width, retImage.Height); - using Graphics g = Graphics.FromImage(disabledImage); - using var ia = new ImageAttributes(); - ia.SetColorMatrix(CommonHelper.MatrixDisabled); - var rect = new Rectangle(0, 0, retImage.Width, retImage.Height); - g.DrawImage(retImage, rect, rect.X, rect.Y, rect.Width, rect.Height, GraphicsUnit.Pixel, ia); - retImage = disabledImage; - } - } - - // Not found, then inherit from target - return retImage ?? Target?.GetDropDownButtonImage(state); - } - #endregion - } -} diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMicrosoft365Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMicrosoft365Renderer.cs index 2cf0b5f7d..5c841ad82 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMicrosoft365Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMicrosoft365Renderer.cs @@ -1550,7 +1550,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + rect.Width / 2; y = rect.Bottom - (rect.Height - 3) / 2; - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2007Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2007Renderer.cs index a5defd553..35798ff52 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2007Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2007Renderer.cs @@ -1467,7 +1467,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + (rect.Width / 2); y = rect.Bottom - ((rect.Height - 3) / 2); - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2010Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2010Renderer.cs index e8dcd82e7..295873365 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2010Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2010Renderer.cs @@ -1553,7 +1553,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + (rect.Width / 2); y = rect.Bottom - ((rect.Height - 3) / 2); - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2013Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2013Renderer.cs index e66fecb3d..cebe9cd5b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2013Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonOffice2013Renderer.cs @@ -1553,7 +1553,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + rect.Width / 2; y = rect.Bottom - (rect.Height - 3) / 2; - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonSparkleRenderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonSparkleRenderer.cs index a3b9a7c17..675f65982 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonSparkleRenderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonSparkleRenderer.cs @@ -1382,7 +1382,7 @@ private static GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + (rect.Width / 2); y = rect.Bottom - ((rect.Height - 3) / 2); - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2007Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2007Renderer.cs index 251827cab..7851657df 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2007Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2007Renderer.cs @@ -1472,7 +1472,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + (rect.Width / 2); y = rect.Bottom - ((rect.Height - 3) / 2); - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2010Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2010Renderer.cs index 6f982c08f..b523ad19e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2010Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2010Renderer.cs @@ -1549,7 +1549,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + (rect.Width / 2); y = rect.Bottom - ((rect.Height - 3) / 2); - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2013Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2013Renderer.cs index 440d1705b..d81abd446 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2013Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010With2013Renderer.cs @@ -1549,7 +1549,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + rect.Width / 2; y = rect.Bottom - (rect.Height - 3) / 2; - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010WithMicrosoft365Renderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010WithMicrosoft365Renderer.cs index b54b66fef..4c998c535 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010WithMicrosoft365Renderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudio2010WithMicrosoft365Renderer.cs @@ -1544,7 +1544,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + rect.Width / 2; y = rect.Bottom - (rect.Height - 3) / 2; - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudioRender.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudioRender.cs index bf682d449..83d5bc190 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudioRender.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonVisualStudioRender.cs @@ -1543,7 +1543,7 @@ private GraphicsPath CreateArrowPath(ToolStripItem item, x = rect.X + rect.Width / 2; y = rect.Bottom - (rect.Height - 3) / 2; - // The drop down button is position 1 pixel incorrectly when in RTL + // The drop-down button is position 1 pixel incorrectly when in RTL if ((item is ToolStripDropDownButton) && (item.RightToLeft == RightToLeft.Yes)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs index 0f7f9cd3b..0a5c2b652 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs @@ -580,19 +580,19 @@ public abstract void DrawRadioButton(RenderContext context, bool pressed); /// - /// Calculate the requested display size for the drop down button. + /// Calculate the requested display size for the drop-down button. /// /// Render context. /// Palette for sourcing display values. /// State for which image size is needed. /// How to orientate the image. public abstract Size GetDropDownButtonPreferredSize(ViewLayoutContext context, - PaletteBase palette, + IPaletteContent palette, PaletteState state, VisualOrientation orientation); /// - /// Perform drawing of a drop down button. + /// Perform drawing of a drop-down button. /// /// Render context. /// Display area available for drawing. @@ -600,10 +600,10 @@ public abstract Size GetDropDownButtonPreferredSize(ViewLayoutContext context, /// State for which image size is needed. /// How to orientate the image. public abstract void DrawDropDownButton(RenderContext context, - Rectangle displayRect, - PaletteBase palette, - PaletteState state, - VisualOrientation orientation); + Rectangle displayRect, + IPaletteContent palette, + PaletteState state, + VisualOrientation orientation); /// /// Draw a numeric up button image appropriate for a input control. @@ -630,7 +630,7 @@ public abstract void DrawInputControlNumericDownGlyph(RenderContext context, PaletteState state); /// - /// Draw a drop down grid appropriate for a input control. + /// Draw a drop-down grid appropriate for a input control. /// /// Render context. /// Available drawing rectangle space. @@ -638,10 +638,9 @@ public abstract void DrawInputControlNumericDownGlyph(RenderContext context, /// State associated with rendering. public abstract void DrawInputControlDropDownGlyph(RenderContext context, Rectangle cellRect, - IPaletteContent? paletteContent, + IPaletteContent paletteContent, PaletteState state); - /// /// Perform drawing of a ribbon dialog box launcher glyph. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderDefinitions.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderDefinitions.cs index f449c2253..e9be0ba3f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderDefinitions.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderDefinitions.cs @@ -558,19 +558,19 @@ void DrawRadioButton(RenderContext context, bool pressed); /// - /// Calculate the requested display size for the drop down button. + /// Calculate the requested display size for the drop-down button. /// /// Render context. /// Palette for sourcing display values. /// State for which image size is needed. /// How to orientate the image. Size GetDropDownButtonPreferredSize(ViewLayoutContext context, - PaletteBase palette, - PaletteState state, - VisualOrientation orientation); + IPaletteContent palette, + PaletteState state, + VisualOrientation orientation); /// - /// Perform drawing of a drop down button. + /// Perform drawing of a drop-down button. /// /// Render context. /// Display area available for drawing. @@ -578,13 +578,13 @@ Size GetDropDownButtonPreferredSize(ViewLayoutContext context, /// State for which image size is needed. /// How to orientate the image. void DrawDropDownButton(RenderContext context, - Rectangle displayRect, - PaletteBase palette, - PaletteState state, - VisualOrientation orientation); + Rectangle displayRect, + IPaletteContent palette, + PaletteState state, + VisualOrientation orientation); /// - /// Draw a drop down button image appropriate for a input control. + /// Draw a drop-down button image appropriate for a input control. /// /// Render context. /// Available drawing rectangle space. @@ -592,7 +592,7 @@ void DrawDropDownButton(RenderContext context, /// State associated with rendering. void DrawInputControlDropDownGlyph(RenderContext context, Rectangle cellRect, - IPaletteContent? paletteContent, + IPaletteContent paletteContent, PaletteState state); /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderSparkle.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderSparkle.cs index 507d4cd1c..7ea7bf180 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderSparkle.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderSparkle.cs @@ -164,45 +164,6 @@ public override void DrawRibbonDropArrow(PaletteRibbonShape shape, #region RenderGlyph Overrides - /// - /// Draw a drop down grid appropriate for a input control. - /// - /// Render context. - /// Available drawing rectangle space. - /// Content palette for getting colors. - /// State associated with rendering. - /// - public override void DrawInputControlDropDownGlyph([DisallowNull] RenderContext context, - Rectangle cellRect, - IPaletteContent? paletteContent, - PaletteState state) - { - Debug.Assert(context is not null); - Debug.Assert(paletteContent is not null); - - // Validate parameter references - if (context is null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (paletteContent is null) - { - throw new ArgumentNullException(nameof(paletteContent)); - } - - Color c1 = paletteContent.GetContentShortTextColor1(state); - - // Find the top left starting position for drawing lines - var xStart = cellRect.Left + ((cellRect.Right - cellRect.Left - 4) / 2); - var yStart = cellRect.Top + ((cellRect.Bottom - cellRect.Top - 3) / 2); - - using var darkPen = new Pen(c1); - context.Graphics.DrawLine(darkPen, xStart, yStart, xStart + 4, yStart); - context.Graphics.DrawLine(darkPen, xStart + 1, yStart + 1, xStart + 3, yStart + 1); - context.Graphics.DrawLine(darkPen, xStart + 2, yStart + 2, xStart + 2, yStart + 1); - } - /// /// Draw a numeric up button image appropriate for a input control. /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs index 687f9e117..30a420141 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs @@ -2506,28 +2506,15 @@ public override void DrawRadioButton([DisallowNull] RenderContext context, /// State for which image size is needed. /// How to orientate the image. public override Size GetDropDownButtonPreferredSize(ViewLayoutContext context, - [DisallowNull] PaletteBase palette, - PaletteState state, - VisualOrientation orientation) + [DisallowNull] IPaletteContent palette, + PaletteState state, + VisualOrientation orientation) { - // Grab an image appropriate to the state - Image? drawImage = palette.GetDropDownButtonImage(state); + var square = Math.Min(context.DisplayRectangle.Width, context.DisplayRectangle.Height); + square = Math.Min(square, 16); + square = (int)(square * context.Graphics.DpiY / 96f); - // Get the image defined size - var imageSize = Size.Empty; - if (drawImage != null) - { - imageSize = drawImage.Size; - } - - // Alter size for different orientations - if (orientation is VisualOrientation.Left or VisualOrientation.Right) - { - // Switch dimensions to reflect rotation of 90 or 270 degrees - imageSize = new Size(imageSize.Height, imageSize.Width); - } - - return imageSize; + return new Size(square, square); } /// @@ -2540,10 +2527,10 @@ public override Size GetDropDownButtonPreferredSize(ViewLayoutContext context, /// How to orientate the image. /// public override void DrawDropDownButton([DisallowNull] RenderContext context, - Rectangle displayRect, - [DisallowNull] PaletteBase palette, - PaletteState state, - VisualOrientation orientation) + Rectangle displayRect, + [DisallowNull] IPaletteContent palette, + PaletteState state, + VisualOrientation orientation) { Debug.Assert(context != null); Debug.Assert(palette != null); @@ -2559,13 +2546,71 @@ public override void DrawDropDownButton([DisallowNull] RenderContext context, throw new ArgumentNullException(nameof(palette)); } - // Grab an image appropriate to the state - Image? drawImage = palette.GetDropDownButtonImage(state); - if (drawImage != null) + var translateX = 0; + var translateY = 0; + var rotation = 0f; + + // Perform any transformations needed for orientation + switch (orientation) { - DrawImageHelper(context, drawImage, GlobalStaticValues.EMPTY_COLOR, - displayRect, orientation, PaletteImageEffect.Normal, - GlobalStaticValues.EMPTY_COLOR, GlobalStaticValues.EMPTY_COLOR); + case VisualOrientation.Bottom: + // Translate to opposite side of origin, so the rotate can + // then bring it back to original position but mirror image + translateX = (displayRect.X * 2) + displayRect.Width; + translateY = (displayRect.Y * 2) + displayRect.Height; + rotation = 180f; + break; + + case VisualOrientation.Left: + // Invert the dimensions of the rectangle for drawing upwards + displayRect = displayRect with { Width = displayRect.Height, Height = displayRect.Width }; + // Translate back from a quarter left turn to the original place + translateX = displayRect.X - displayRect.Y; + translateY = displayRect.X + displayRect.Y + displayRect.Width; + rotation = -90f; + break; + + case VisualOrientation.Right: + // Invert the dimensions of the rectangle for drawing upwards + displayRect = displayRect with { Width = displayRect.Height, Height = displayRect.Width }; + // Translate back from a quarter right turn to the original place + translateX = displayRect.X + displayRect.Y + displayRect.Height; + translateY = -(displayRect.X - displayRect.Y); + rotation = 90f; + break; + } + + try + { + // Apply the transforms if we have any to apply + if ((translateX != 0) || (translateY != 0)) + { + context.Graphics.TranslateTransform(translateX, translateY); + } + + if (rotation != 0f) + { + context.Graphics.RotateTransform(rotation); + } + + // Finally, just draw the image and let the transforms do the rest + DrawInputControlDropDownGlyph(context, displayRect, palette, state); + } + catch (ArgumentException) + { + } + finally + { + if (rotation != 0f) + { + context.Graphics.RotateTransform(-rotation); + } + + // Remove the applied transforms + if ((translateX != 0) | (translateY != 0)) + { + context.Graphics.TranslateTransform(-translateX, -translateY); + } } } @@ -2663,13 +2708,13 @@ public override void DrawInputControlNumericDownGlyph(RenderContext context, /// Content palette for getting colors. /// State associated with rendering. /// - public override void DrawInputControlDropDownGlyph(RenderContext context, + public override void DrawInputControlDropDownGlyph([DisallowNull] RenderContext context, Rectangle cellRect, - IPaletteContent? paletteContent, + [DisallowNull] IPaletteContent paletteContent, PaletteState state) { - Debug.Assert(context is not null); - Debug.Assert(paletteContent is not null); + Debug.Assert(context != null); + Debug.Assert(paletteContent != null); // Validate parameter references if (context == null) @@ -2684,18 +2729,38 @@ public override void DrawInputControlDropDownGlyph(RenderContext context, Color c1 = paletteContent.GetContentShortTextColor1(state); Color c2 = paletteContent.GetContentShortTextColor2(state); + if (c2 == Color.Empty + || c2 == Color.Transparent) + { + c2 = Color.FromArgb(64, c1.R, c1.G, c1.B); + } // Find the top left starting position for drawing lines - var xStart = cellRect.Left + ((cellRect.Right - cellRect.Left - 4) / 2); - var yStart = cellRect.Top + ((cellRect.Bottom - cellRect.Top - 3) / 2); + float xOffset = cellRect.Width / 4f; + float yOffset = cellRect.Height / 4f; + float xStart = cellRect.Left + xOffset; + float yStart = cellRect.Top + yOffset; - using var darkPen = new Pen(c1); - context.Graphics.DrawLine(darkPen, xStart, yStart, xStart + 4, yStart); - context.Graphics.DrawLine(darkPen, xStart + 1, yStart + 1, xStart + 3, yStart + 1); - context.Graphics.DrawLine(darkPen, xStart + 2, yStart + 2, xStart + 2, yStart + 1); - using var lightPen = new Pen(c2); - context.Graphics.DrawLine(lightPen, xStart, yStart + 1, xStart + 2, yStart + 3); - context.Graphics.DrawLine(lightPen, xStart + 2, yStart + 3, xStart + 4, yStart + 1); + //using Pen darkPen = new Pen(c1), + // lightPen = new Pen(c2); + + using var path = new GraphicsPath(); + // Define path with the geometry information only + path.AddLines([ + new PointF(xStart, yStart), + new PointF(xStart + 2 * xOffset, yStart), + new PointF(xStart + xOffset, yStart + 2 * yOffset) + ]); + path.CloseFigure(); + + using var aa = new AntiAlias(context.Graphics); + // Fill Triangle + using var brush = new SolidBrush(c2); + context.Graphics.FillPath(brush, path); + + // Draw Triangle + using Pen darkPen = new Pen(c1); + context.Graphics.DrawPath(darkPen, path); } /// diff --git a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs index 3df596968..dddeef220 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs @@ -85,7 +85,7 @@ private protected override void WndMessage(object sender, CWPRETSTRUCT e, out bo panel.Width += (int)(30 * _scaleFactor); } } - // Also Hide the Combo filter drop down + // Also Hide the Combo filter drop-down var filterCombo = _commonDialogHandler.Controls.FirstOrDefault(static ctl => ctl.DlgCtrlId == 0x470); if (filterCombo != null) { diff --git a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs.rej b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs.rej new file mode 100644 index 000000000..0a8a70a91 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellBrowserDialogTFM.cs (rejected hunks) +@@ -70,7 +70,7 @@ namespace Krypton.Toolkit + + if (e.message == PI.WM_.INITDIALOG) + { +- // TODO: Also Disable the Combo filter drop-down ++ // TODO: Also Disable the Combo filter drop-down + var button = _commonDialogHandler.Controls.FirstOrDefault(static ctl => ctl.DlgCtrlId == 1); + if (button?.Button != null) + { diff --git a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs index f3086ccbe..461550391 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs @@ -111,7 +111,7 @@ private protected virtual void FormResize(object? sender, EventArgs e) return; } _commonDialogHandler._wrapperForm.SuspendLayout(); - // Align the button underneath the drop down + // Align the button underneath the drop-down var clientSize = _commonDialogHandler._wrapperForm.ClientSize; foreach (var button in _commonDialogHandler.Controls.Where(static ctl => ctl.Button != null)) { diff --git a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs.rej b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs.rej new file mode 100644 index 000000000..71fdfda45 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs.rej @@ -0,0 +1,10 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs b/Source/Krypton Components/Krypton.Toolkit/ShellDialogs/ShellDialogWrapper.cs (rejected hunks) +@@ -106,7 +106,7 @@ namespace Krypton.Toolkit + + private protected virtual void FormResize(object sender, EventArgs e) + { +- // Align the button underneath the drop-down ++ // Align the button underneath the drop-down + var clientSize = _commonDialogHandler._wrapperForm.ClientSize; + foreach (var button in _commonDialogHandler.Controls.Where(static ctl => ctl.Button != null)) + { diff --git a/Source/Krypton Components/Krypton.Toolkit/Translations/Converters/PaletteButtonSpecStyleStrings.cs b/Source/Krypton Components/Krypton.Toolkit/Translations/Converters/PaletteButtonSpecStyleStrings.cs index 81d2d4944..c148c7223 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Translations/Converters/PaletteButtonSpecStyleStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Translations/Converters/PaletteButtonSpecStyleStrings.cs @@ -26,7 +26,7 @@ public class PaletteButtonSpecStyleStrings : GlobalId private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_ARROW_RIGHT = @"Arrow Right"; private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_ARROW_UP = @"Arrow Up"; private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_ARROW_DOWN = @"Arrow Down"; - private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_DROP_DOWN = @"Drop Down"; + private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_DROP_DOWN = @"drop-down"; private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_PIN_VERTICAL = @"Pin Vertical"; private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_PIN_HORIZONTAL = @"Pin Horizontal"; private const string DEFAULT_PALETTE_BUTTON_SPEC_STYLE_FORM_CLOSE = @"Form Close"; @@ -197,9 +197,9 @@ public void Reset() [RefreshProperties(RefreshProperties.All)] public string ArrowDown { get; set; } - /// Gets or sets the drop down palette button spec style string. + /// Gets or sets the drop-down palette button spec style string. [Category(@"Visuals")] - [Description(@"The drop down palette button spec style.")] + [Description(@"The drop-down palette button spec style.")] [DefaultValue(DEFAULT_PALETTE_BUTTON_SPEC_STYLE_DROP_DOWN)] [RefreshProperties(RefreshProperties.All)] public string DropDown { get; set; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs index d02299805..3bf37cc72 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs @@ -103,12 +103,6 @@ public static void ScalePalette(float factorDpiX, float factorDpiY, KryptonCusto cm.Checked = GetScaledImage(cm.Checked, scaleFactor); cm.Indeterminate = GetScaledImage(cm.Indeterminate, scaleFactor); cm.SubMenu = GetScaledImage(cm.SubMenu, scaleFactor); - // DropDownButton - KryptonPaletteImagesDropDownButton ddb = pal.Images.DropDownButton; - ddb.Disabled = GetScaledImage(ddb.Disabled, scaleFactor); - ddb.Normal = GetScaledImage(ddb.Normal, scaleFactor); - ddb.Pressed = GetScaledImage(ddb.Pressed, scaleFactor); - ddb.Tracking = GetScaledImage(ddb.Tracking, scaleFactor); // GalleryButtons // I'm not using these so I'm skipping it // Radio Buttons diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs index 9af8081c2..40a6d4c37 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs @@ -347,10 +347,10 @@ public bool ShowSplitOption #region DropDownArrowColor - /// Gets or sets the color of the drop down arrow. - /// The color of the drop down arrow. + /// Gets or sets the color of the drop-down arrow. + /// The color of the drop-down arrow. [Category(@"Visuals")] - [Description(@"Sets the drop down arrow color.")] + [Description(@"Sets the drop-down arrow color.")] [DefaultValue(typeof(Color), @"Empty")] public Color? DropDownArrowColor { diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/DropDownButtonImages.cs b/Source/Krypton Components/Krypton.Toolkit/Values/DropDownButtonImages.cs deleted file mode 100644 index cecbd0ede..000000000 --- a/Source/Krypton Components/Krypton.Toolkit/Values/DropDownButtonImages.cs +++ /dev/null @@ -1,214 +0,0 @@ -#region BSD License -/* - * - * Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE) - * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. - * - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2024. All rights reserved. - * - */ -#endregion - -namespace Krypton.Toolkit -{ - /// - /// Storage for drop down button images. - /// - public class DropDownButtonImages : Storage - { - #region Instance Fields - private Image? _common; - private Image? _disabled; - private Image? _normal; - private Image? _tracking; - private Image? _pressed; - #endregion - - #region Identity - /// - /// Initialize a new instance of the DropDownButtonImages class. - /// - public DropDownButtonImages() - : this(null) - { - } - - /// - /// Initialize a new instance of the DropDownButtonImages class. - /// - /// Delegate for notifying paint requests. - public DropDownButtonImages(NeedPaintHandler? needPaint) - { - // Store the provided paint notification delegate - NeedPaint = needPaint; - - // Create the storage - _common = null; - _normal = null; - _disabled = null; - _tracking = null; - _pressed = null; - } - #endregion - - #region IsDefault - /// - /// Gets a value indicating if all values are default. - /// - [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (_common == null) && - (_disabled == null) && - (_normal == null) && - (_tracking == null) && - (_pressed == null); - - #endregion - - #region Common - /// - /// Gets and sets the common image that other drop down button images inherit from. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Common image that other drop down button images inherit from.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Common - { - get => _common; - - set - { - if (_common != value) - { - _common = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Common property to its default value. - /// - public void ResetCommon() => Common = null; - #endregion - - #region Disabled - /// - /// Gets and sets the image for use when the drop down button is disabled. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is disabled.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Disabled - { - get => _disabled; - - set - { - if (_disabled != value) - { - _disabled = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Disabled property to its default value. - /// - public void ResetDisabled() => Disabled = null; - #endregion - - #region Normal - /// - /// Gets and sets the image for use when the drop down button is normal. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is normal.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Normal - { - get => _normal; - - set - { - if (_normal != value) - { - _normal = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Normal property to its default value. - /// - public void ResetNormal() => Normal = null; - #endregion - - #region Tracking - /// - /// Gets and sets the image for use when the drop down button is tracking. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is tracking.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Tracking - { - get => _tracking; - - set - { - if (_tracking != value) - { - _tracking = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Tracking property to its default value. - /// - public void ResetTracking() => Tracking = null; - #endregion - - #region Pressed - /// - /// Gets and sets the image for use when the drop down button is pressed. - /// - [KryptonPersist(false)] - [Category(@"Visuals")] - [Description(@"Image for use when the drop down button is pressed.")] - [DefaultValue(null)] - [RefreshProperties(RefreshProperties.All)] - public Image? Pressed - { - get => _pressed; - - set - { - if (_pressed != value) - { - _pressed = value; - PerformNeedPaint(true); - } - } - } - - /// - /// Resets the Pressed property to its default value. - /// - public void ResetPressed() => Pressed = null; - #endregion - } -} diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/GalleryImages.cs b/Source/Krypton Components/Krypton.Toolkit/Values/GalleryImages.cs index e8c64f560..5f922b47d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/GalleryImages.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/GalleryImages.cs @@ -72,11 +72,11 @@ public GalleryImages(NeedPaintHandler needPaint) #region DropDown /// - /// Gallery drop down button images. + /// Gallery drop-down button images. /// [KryptonPersist(true)] [Category(@"Visuals")] - [Description(@"Gallery drop down button images.")] + [Description(@"Gallery drop-down button images.")] [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public GalleryButtonImages DropDown { get; } diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawButton.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawButton.cs index d24e85329..29c20184b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawButton.cs @@ -110,9 +110,9 @@ public ViewDrawButton(IPaletteTriple paletteDisabled, _splitter = false; _dropDownPosition = VisualOrientation.Right; - // Create the drop down view + // Create the drop-down view _drawDropDown = new ViewLayoutCenter(1); - _drawDropDownButton = new ViewDrawDropDownButton(); + _drawDropDownButton = new ViewDrawDropDownButton(_paletteNormal.PaletteContent!); _drawDropDown.Add(_drawDropDownButton); _drawOuterSeparator = new ViewLayoutSeparator(1); @@ -175,7 +175,7 @@ public override string ToString() => #region DropDown /// - /// Gets and sets the drop down capability of the button. + /// Gets and sets the drop-down capability of the button. /// public bool DropDown { @@ -194,7 +194,7 @@ public bool DropDown #region DropDownPosition /// - /// Gets and sets the drop down position. + /// Gets and sets the drop-down position. /// public VisualOrientation DropDownPosition { @@ -213,7 +213,7 @@ public VisualOrientation DropDownPosition #region DropDownOrientation /// - /// Gets and sets the drop down orientation. + /// Gets and sets the drop-down orientation. /// public VisualOrientation DropDownOrientation { @@ -230,20 +230,9 @@ public VisualOrientation DropDownOrientation } #endregion - #region DropDownPalette - /// - /// Gets and sets the drop down capability of the button. - /// - public PaletteBase DropDownPalette - { - get => _drawDropDownButton.Palette; - set => _drawDropDownButton.Palette = value; - } - #endregion - #region Splitter /// - /// Gets and sets if the drop down button needs a splitter. + /// Gets and sets if the drop-down button needs a splitter. /// public bool Splitter { @@ -520,7 +509,7 @@ public override void Layout([DisallowNull] ViewLayoutContext context) _nonSplitRectangle = ClientRectangle; if (_dropDown && _splitter) { - // Splitter rectangle depends on drop down position + // Splitter rectangle depends on drop-down position switch (_dropDownPosition) { case VisualOrientation.Top: diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawCommandLinkButton.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawCommandLinkButton.cs index 38a88da0c..25e8e404d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawCommandLinkButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawCommandLinkButton.cs @@ -102,7 +102,7 @@ public ViewDrawCommandLinkButton(IPaletteTriple paletteDisabled, Checked = false; AllowUncheck = true; - // Create the drop down view + // Create the drop-down view _drawImageContent = new ViewDrawContent(_paletteNormal.PaletteContent, imageValues, orientation); _drawImage = new ViewLayoutCenter(paletteMetric, PaletteMetricPadding.BarPaddingOnly, orientation, _drawImageContent); diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDateTimeButton.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDateTimeButton.cs index aca1b0af6..828b02a1c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDateTimeButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDateTimeButton.cs @@ -24,7 +24,7 @@ public class ViewDrawDateTimeButton : ViewDrawButton public enum DrawDateTimeGlyph { /// - /// Specifies the drop down button glyph. + /// Specifies the drop-down button glyph. /// DropDownButton, @@ -118,7 +118,7 @@ public override string ToString() => /// /// Layout context. public override Size GetPreferredSize(ViewLayoutContext context) => - // We want to be as wide as drop down buttons on standard controls + // We want to be as wide as drop-down buttons on standard controls new Size(SystemInformation.VerticalScrollBarWidth - 2, 0); /// @@ -190,7 +190,7 @@ protected override void CheckPaletteState(ViewContext context) { PaletteState state = ElementState; - // If the drop down calendar is showing then always draw button as pressed + // If the drop-down calendar is showing then always draw button as pressed if (_dateTimePicker.IsDropped) { state = PaletteState.Pressed; diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDropDownButton.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDropDownButton.cs index 86f4dfd4c..c2c41003b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDropDownButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawDropDownButton.cs @@ -13,7 +13,7 @@ namespace Krypton.Toolkit { /// - /// Draws a drop down button using the provided renderer. + /// Draws a drop-down button using the provided renderer. /// public class ViewDrawDropDownButton : ViewLeaf { @@ -21,7 +21,11 @@ public class ViewDrawDropDownButton : ViewLeaf /// /// Initialize a new instance of the ViewDrawDropDownButton class. /// - public ViewDrawDropDownButton() => Orientation = VisualOrientation.Top; + public ViewDrawDropDownButton(IPaletteContent palette) + { + Palette = palette; + Orientation = VisualOrientation.Top; + } /// /// Obtains the String representation of this instance. @@ -37,13 +41,13 @@ public override string ToString() => /// /// Gets and sets the palette to use. /// - public PaletteBase Palette { get; set; } + public IPaletteContent Palette { get; } #endregion #region Orientation /// - /// Gets and sets the orientation of the drop down button. + /// Gets and sets the orientation of the drop-down button. /// public VisualOrientation Orientation { get; set; } @@ -68,7 +72,7 @@ public override Size GetPreferredSize([DisallowNull] ViewLayoutContext context) throw new ArgumentNullException(nameof(context.Renderer)); } - // Ask the renderer for the required size of the drop down button + // Ask the renderer for the required size of the drop-down button return context.Renderer.RenderGlyph.GetDropDownButtonPreferredSize(context, Palette, State, Orientation); } diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthUpDown.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthUpDown.cs index 7e2e5976f..d8eb9b6cd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthUpDown.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthUpDown.cs @@ -24,7 +24,7 @@ public class ViewDrawMonthUpDown : ViewDrawButton public enum DrawMonthCalendarGlyph { /// - /// Specifies the drop down button glyph. + /// Specifies the drop-down button glyph. /// DropDownButton, @@ -101,7 +101,7 @@ public override string ToString() => /// /// Layout context. public override Size GetPreferredSize(ViewLayoutContext context) => - // We want to be as wide as drop down buttons on standard controls + // We want to be as wide as drop-down buttons on standard controls new Size(SystemInformation.VerticalScrollBarWidth - 2, 0); /// diff --git a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs index 74ed5ab2a..00475b310 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs @@ -325,8 +325,7 @@ private void CreateOverflowButton() this, VisualOrientation.Top, false) { Splitter = true, - TestForFocusCues = true, - DropDownPalette = _kryptonBreadCrumb.GetRedirector() + TestForFocusCues = true }; // Create controller for operating the button @@ -351,7 +350,7 @@ private void SyncBreadCrumbs() // If we do not have a button to represent this crumb... if (!_crumbToButton.TryGetValue(item, out ViewDrawButton? crumbButton)) { - // Setup the button for drawing as a drop down button if required + // Setup the button for drawing as a drop-down button if required crumbButton = new ViewDrawButton(_kryptonBreadCrumb.StateDisabled.BreadCrumb, _kryptonBreadCrumb.StateNormal.BreadCrumb, _kryptonBreadCrumb.StateTracking.BreadCrumb, @@ -360,8 +359,7 @@ private void SyncBreadCrumbs() item, VisualOrientation.Top, false) { Splitter = true, - TestForFocusCues = true, - DropDownPalette = _kryptonBreadCrumb.GetRedirector() + TestForFocusCues = true }; // Create controller for operating the button @@ -378,7 +376,7 @@ private void SyncBreadCrumbs() _buttonToCrumb.Add(crumbButton, item); } - // Only show a drop down button if we have some children to choose from + // Only show a drop-down button if we have some children to choose from crumbButton.DropDown = _kryptonBreadCrumb.DropDownNavigation && (item.Items.Count > 0); // Add crumb to end of child collection @@ -402,7 +400,7 @@ private void OnButtonClick(object? sender, MouseEventArgs e) var controller = viewButton?.MouseController as ButtonController; var breadCrumb = controller?.Tag as KryptonBreadCrumbItem; - // Do we need to show a drop down menu? + // Do we need to show a drop-down menu? if (viewButton!.DropDown && viewButton.SplitRectangle.Contains(e.Location)) { // Create a context menu with a items collection diff --git a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs.rej b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs.rej new file mode 100644 index 000000000..292cee479 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs.rej @@ -0,0 +1,22 @@ +diff a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs (rejected hunks) +@@ -347,9 +346,9 @@ namespace Krypton.Toolkit + while (item != null) + { + // If we do not have a button to represent this crumb... +- if (!_crumbToButton.TryGetValue(item, out ViewDrawButton crumbButton)) ++ if (!_crumbToButton.TryGetValue(item, out ViewDrawButton? crumbButton)) + { +- // Setup the button for drawing as a drop-down button if required ++ // Setup the button for drawing as a drop-down button if required + crumbButton = new ViewDrawButton(_kryptonBreadCrumb.StateDisabled.BreadCrumb, + _kryptonBreadCrumb.StateNormal.BreadCrumb, + _kryptonBreadCrumb.StateTracking.BreadCrumb, +@@ -400,7 +398,7 @@ namespace Krypton.Toolkit + var controller = viewButton.MouseController as ButtonController; + var breadCrumb = controller.Tag as KryptonBreadCrumbItem; + +- // Do we need to show a drop-down menu? ++ // Do we need to show a drop-down menu? + if (viewButton.DropDown && viewButton.SplitRectangle.Contains(e.Location)) + { + // Create a context menu with a items collection