diff --git a/Documents/Changelog/Changelog.md b/Documents/Changelog/Changelog.md index b1da0bad9c..2c3624dfb0 100644 --- a/Documents/Changelog/Changelog.md +++ b/Documents/Changelog/Changelog.md @@ -45,6 +45,8 @@ ## 2026-11-xx - Build 2611 (V110 Nightly) - November 2026 +* Implemented [#1738](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1738), Move methods out of `GlobalStaticVariables` into 'new' `GlobalStaticFunctions` +* Implemented [#2125](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2125), Adding `NotificationIcon Size` in `ToastNotification`. Added `NotificationIconWidth` and `NotificationIconHeight` to toast data models and wired basic toast views to render and layout icons using custom dimensions. * Resolved [#3342](https://github.com/Krypton-Suite/Standard-Toolkit/issues/3342), `KryptonTextBox`, text flickers when resizing the control (multiline active) * Resolved [#3348](https://github.com/Krypton-Suite/Standard-Toolkit/issues/3348), Cannot install `Krypton.Standard.Toolkit` NuGet package * Resolved [#3341](https://github.com/Krypton-Suite/Standard-Toolkit/issues/3341), Discord notifications report the wrong version number diff --git a/Source/Krypton Components/Krypton.Docking/ViewDraw/ViewDrawAutoHiddenTab.cs b/Source/Krypton Components/Krypton.Docking/ViewDraw/ViewDrawAutoHiddenTab.cs index 773026693f..88e5ae9454 100644 --- a/Source/Krypton Components/Krypton.Docking/ViewDraw/ViewDrawAutoHiddenTab.cs +++ b/Source/Krypton Components/Krypton.Docking/ViewDraw/ViewDrawAutoHiddenTab.cs @@ -90,7 +90,7 @@ public ViewDrawAutoHiddenTab([DisallowNull] KryptonPage page, /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackDocking.cs b/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackDocking.cs index 7e635df4c3..29805a3467 100644 --- a/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackDocking.cs +++ b/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackDocking.cs @@ -225,7 +225,7 @@ public override void Start(IPaletteDragDrop paletteDragDrop, // Create and show a solid feedback window without it taking focus. // Position off-screen initially to avoid a visible 1x1 artifact at top-left (0,0). _solid = new DropSolidWindow(PaletteDragDrop, Renderer); - _solid.SetBounds(GlobalStaticValues.OFF_SCREEN_POSITION, GlobalStaticValues.OFF_SCREEN_POSITION, 1, 1, BoundsSpecified.All); + _solid.SetBounds(GlobalStaticConstants.OFF_SCREEN_POSITION, GlobalStaticConstants.OFF_SCREEN_POSITION, 1, 1, BoundsSpecified.All); _solid.ShowWithoutActivate(); _solid.Refresh(); } diff --git a/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackSolid.cs b/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackSolid.cs index c35c953c32..4649aa9f4f 100644 --- a/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackSolid.cs +++ b/Source/Krypton Components/Krypton.Navigator/Dragging/DragFeedbackSolid.cs @@ -58,7 +58,7 @@ public override void Start(IPaletteDragDrop paletteDragDrop, // Create and show a window without it taking focus. // Position off-screen initially to avoid a visible 1x1 artifact at top-left (0,0). _solid = new DropSolidWindow(PaletteDragDrop, Renderer); - _solid.SetBounds(GlobalStaticValues.OFF_SCREEN_POSITION, GlobalStaticValues.OFF_SCREEN_POSITION, 1, 1, BoundsSpecified.All); + _solid.SetBounds(GlobalStaticConstants.OFF_SCREEN_POSITION, GlobalStaticConstants.OFF_SCREEN_POSITION, 1, 1, BoundsSpecified.All); _solid.ShowWithoutActivate(); _solid.Refresh(); } diff --git a/Source/Krypton Components/Krypton.Navigator/Dragging/DropSolidWindow.cs b/Source/Krypton Components/Krypton.Navigator/Dragging/DropSolidWindow.cs index 2827d4a41e..75e5871f67 100644 --- a/Source/Krypton Components/Krypton.Navigator/Dragging/DropSolidWindow.cs +++ b/Source/Krypton Components/Krypton.Navigator/Dragging/DropSolidWindow.cs @@ -41,8 +41,8 @@ public DropSolidWindow(IPaletteDragDrop paletteDragDrop, IRenderer renderer) MaximizeBox = false; MinimizeBox = false; ShowInTaskbar = false; - BackColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - TransparencyKey = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + BackColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + TransparencyKey = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; Opacity = _paletteDragDrop.GetDragDropSolidOpacity(); } @@ -85,7 +85,7 @@ public Rectangle SolidRect if (value.IsEmpty) { // Move off-screen to avoid a visible artifact at (0,0) when no target is matched - bounds = new Rectangle(GlobalStaticValues.OFF_SCREEN_POSITION, GlobalStaticValues.OFF_SCREEN_POSITION, 0, 0); + bounds = new Rectangle(GlobalStaticConstants.OFF_SCREEN_POSITION, GlobalStaticConstants.OFF_SCREEN_POSITION, 0, 0); } else { diff --git a/Source/Krypton Components/Krypton.Navigator/General/PageToToolTipMapping.cs b/Source/Krypton Components/Krypton.Navigator/General/PageToToolTipMapping.cs index ed70406cae..aa52cb9bc6 100644 --- a/Source/Krypton Components/Krypton.Navigator/General/PageToToolTipMapping.cs +++ b/Source/Krypton Components/Krypton.Navigator/General/PageToToolTipMapping.cs @@ -95,7 +95,7 @@ public PageToToolTipMapping([DisallowNull] KryptonPage page, /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonNavigatorDesigner.cs b/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonNavigatorDesigner.cs index 0f7eefee58..67b55baf82 100644 --- a/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonNavigatorDesigner.cs +++ b/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonNavigatorDesigner.cs @@ -72,9 +72,9 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); - _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_selectionService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); + _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_selectionService))); // We need to know when we are being removed _changeService.ComponentRemoving += OnComponentRemoving; diff --git a/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonPageDesigner.cs b/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonPageDesigner.cs index 46e216ae63..9f958abdfe 100644 --- a/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonPageDesigner.cs +++ b/Source/Krypton Components/Krypton.Navigator/Navigator/KryptonPageDesigner.cs @@ -50,8 +50,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Acquire service interfaces - _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_selectionService))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_selectionService))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed _changeService.ComponentRemoving += OnComponentRemoving; diff --git a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs index e77d7faa9e..08536082a0 100644 --- a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs +++ b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs @@ -2121,8 +2121,8 @@ private void OnDropDownClick(object? sender, EventArgs e) addRemoveButtons.Items.Add(addRemoveButtonItems); // Setup the transparent color for the images - moreButtons.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - fewerButtons.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + moreButtons.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + fewerButtons.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; // Decide if the more/fewer buttons should be enabled/disabled moreButtons.Enabled = AreMoreButtons(); diff --git a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderStackCheckButtonBase.cs b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderStackCheckButtonBase.cs index 16d89c0b2e..fea815a301 100644 --- a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderStackCheckButtonBase.cs +++ b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderStackCheckButtonBase.cs @@ -46,7 +46,7 @@ public override void Construct([DisallowNull] KryptonNavigator navigator, base.Construct(navigator, manager, redirector); // Get the current root element - _oldRoot = ViewManager!.Root as ViewLayoutPageShow ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ViewManager.Root))); + _oldRoot = ViewManager!.Root as ViewLayoutPageShow ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ViewManager.Root))); // Create and initialize all objects ViewManager.Root = CreateStackCheckButtonView()!; diff --git a/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavCheckButtonBase.cs b/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavCheckButtonBase.cs index 35cc912164..9a8f2edf5c 100644 --- a/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavCheckButtonBase.cs +++ b/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavCheckButtonBase.cs @@ -348,7 +348,7 @@ public virtual KryptonPage? Page /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavRibbonTab.cs b/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavRibbonTab.cs index 943aee557e..fe25a66f11 100644 --- a/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavRibbonTab.cs +++ b/Source/Krypton Components/Krypton.Navigator/View Draw/ViewDrawNavRibbonTab.cs @@ -409,7 +409,7 @@ public override void Render([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/AppButtonController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/AppButtonController.cs index a3ca45400f..86ee9e0ed0 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/AppButtonController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/AppButtonController.cs @@ -255,12 +255,12 @@ public void KeyDown(Control c, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) @@ -390,7 +390,7 @@ public void KeyTipSelect(KryptonRibbon? ribbon) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } // We leave key tips usage whenever we use the application button diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/AppTabController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/AppTabController.cs index 8d1ec1178a..5bea4d3196 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/AppTabController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/AppTabController.cs @@ -250,12 +250,12 @@ public void KeyDown(Control c, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) @@ -376,12 +376,12 @@ public void KeyTipSelect(KryptonRibbon? ribbon) { if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull("ribbon")); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull("ribbon")); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull("ribbon.TabsArea")); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull("ribbon.TabsArea")); } // We leave key tips usage whenever we use the application button diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/ButtonSpecRibbonController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/ButtonSpecRibbonController.cs index 099d892b96..9437574ddd 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/ButtonSpecRibbonController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/ButtonSpecRibbonController.cs @@ -49,21 +49,21 @@ public override void KeyDown(Control c, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } if (ribbon.TabsArea.ButtonSpecManager is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea.ButtonSpecManager))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea.ButtonSpecManager))); } // Get the button spec associated with this controller - ViewDrawButton? viewButton = Target as ViewDrawButton ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(Target))); + ViewDrawButton? viewButton = Target as ViewDrawButton ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(Target))); ButtonSpec? buttonSpec = ribbon.TabsArea.ButtonSpecManager.GetButtonSpecFromView(viewButton) ?? throw new NullReferenceException( "ribbon.TabsArea.ButtonSpecManager.GetButtonSpecFromView(viewButton) returned null."); diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/CollapsedGroupController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/CollapsedGroupController.cs index 293d275bda..4b5e23fb78 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/CollapsedGroupController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/CollapsedGroupController.cs @@ -253,7 +253,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/ComboBoxController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/ComboBoxController.cs index 5adfcf3baa..13a540fdc5 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/ComboBoxController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/ComboBoxController.cs @@ -39,9 +39,9 @@ public ComboBoxController([DisallowNull] KryptonRibbon ribbon, [DisallowNull] KryptonRibbonGroupComboBox comboBox, [DisallowNull] ViewDrawRibbonGroupComboBox target) { - _ribbon = ribbon ?? throw new Exception( GlobalStaticValues.VariableCannotBeNull(nameof(_ribbon))); - _comboBox = comboBox ?? throw new Exception(GlobalStaticValues.VariableCannotBeNull(nameof(_comboBox))); - _target = target ?? throw new Exception(GlobalStaticValues.VariableCannotBeNull(nameof(_target))); + _ribbon = ribbon ?? throw new Exception( GlobalStaticFunctions.VariableCannotBeNull(nameof(_ribbon))); + _comboBox = comboBox ?? throw new Exception(GlobalStaticFunctions.VariableCannotBeNull(nameof(_comboBox))); + _target = target ?? throw new Exception(GlobalStaticFunctions.VariableCannotBeNull(nameof(_target))); } #endregion @@ -158,7 +158,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/CustomControlController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/CustomControlController.cs index 1bbd8cee10..d3624cb483 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/CustomControlController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/CustomControlController.cs @@ -157,12 +157,12 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon is null) { - throw new ArgumentNullException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new ArgumentNullException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/DateTimePickerController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/DateTimePickerController.cs index e52428ea09..5b9d384f7f 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/DateTimePickerController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/DateTimePickerController.cs @@ -162,7 +162,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/DialogLauncherButtonController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/DialogLauncherButtonController.cs index 71f2931b8a..a9a695f0d1 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/DialogLauncherButtonController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/DialogLauncherButtonController.cs @@ -160,7 +160,7 @@ private void KeyDownRibbon(KeyEventArgs e) if (Ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(Ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(Ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/DomainUpDownController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/DomainUpDownController.cs index 2a692da59b..f8dd9e5b42 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/DomainUpDownController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/DomainUpDownController.cs @@ -162,7 +162,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs index f952f9a1ca..d6a51b6ffc 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/GalleryController.cs @@ -147,7 +147,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs index 0c699497ba..20173765d8 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupButtonController.cs @@ -615,7 +615,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupCheckBoxController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupCheckBoxController.cs index 10424b3940..e427a965e6 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupCheckBoxController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupCheckBoxController.cs @@ -443,12 +443,12 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupRadioButtonController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupRadioButtonController.cs index f382f9a78f..7c74205e02 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/GroupRadioButtonController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/GroupRadioButtonController.cs @@ -443,12 +443,12 @@ private void KeyDownRibbon(KryptonRibbon ribbon, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/MaskedTextBoxController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/MaskedTextBoxController.cs index 7d64281077..d2e456ac67 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/MaskedTextBoxController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/MaskedTextBoxController.cs @@ -157,12 +157,12 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/NumericUpDownController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/NumericUpDownController.cs index 2d4f53d9a4..4b1f91035c 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/NumericUpDownController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/NumericUpDownController.cs @@ -157,12 +157,12 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/RibbonTabController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/RibbonTabController.cs index 08f305af1f..6f588271f8 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/RibbonTabController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/RibbonTabController.cs @@ -229,7 +229,7 @@ public void KeyDown(Control c, KeyEventArgs e) if (_ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(_ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(_ribbon.TabsArea))); } // When there is no selected tab then tab and shift+tab become right and left diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/RichTextBoxController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/RichTextBoxController.cs index 4cb5bd6ec8..65447ed9cd 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/RichTextBoxController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/RichTextBoxController.cs @@ -157,12 +157,12 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/TextBoxController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/TextBoxController.cs index 4842176d6a..467b839324 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/TextBoxController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/TextBoxController.cs @@ -158,12 +158,12 @@ private void KeyDownRibbon(KryptonRibbon ribbon, KeyEventArgs e) if (ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.ParameterCannotBeNull(nameof(ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.ParameterCannotBeNull(nameof(ribbon))); } if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controller/TrackBarController.cs b/Source/Krypton Components/Krypton.Ribbon/Controller/TrackBarController.cs index 81d59bf407..9cc711edb1 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controller/TrackBarController.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controller/TrackBarController.cs @@ -162,7 +162,7 @@ private void KeyDownRibbon(KryptonRibbon? ribbon, KeyEventArgs e) if (ribbon.TabsArea is null) { - throw new NullReferenceException(GlobalStaticValues.PropertyCannotBeNull(nameof(ribbon.TabsArea))); + throw new NullReferenceException(GlobalStaticFunctions.PropertyCannotBeNull(nameof(ribbon.TabsArea))); } switch (e.KeyData) diff --git a/Source/Krypton Components/Krypton.Ribbon/Controls Visuals/KeyTipControl.cs b/Source/Krypton Components/Krypton.Ribbon/Controls Visuals/KeyTipControl.cs index da6bcee2c1..ee69fdc172 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Controls Visuals/KeyTipControl.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Controls Visuals/KeyTipControl.cs @@ -45,7 +45,7 @@ public KeyTipControl(KryptonRibbon ribbon, StartPosition = FormStartPosition.Manual; FormBorderStyle = FormBorderStyle.None; ShowInTaskbar = false; - TransparencyKey = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + TransparencyKey = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; StateCommon!.Border.DrawBorders = PaletteDrawBorders.None; StateCommon!.Border.Width = 0; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Collection Editors/KryptonRibbonQATButtonCollectionEditor.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Collection Editors/KryptonRibbonQATButtonCollectionEditor.cs index 0a9bf01036..8c71d7d818 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Collection Editors/KryptonRibbonQATButtonCollectionEditor.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Collection Editors/KryptonRibbonQATButtonCollectionEditor.cs @@ -39,7 +39,7 @@ public KryptonRibbonQATButtonCollectionEditor() protected override object? SetItems(object? editValue, object[]? value) { // Cast the context into the expected control type - var ribbon = Context?.Instance as KryptonRibbon ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("ribbon")); + var ribbon = Context?.Instance as KryptonRibbon ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("ribbon")); // Suspend changes until collection has been updated ribbon.SuspendLayout(); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstagePageDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstagePageDesigner.cs index 3ff8ace807..0d81050644 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstagePageDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstagePageDesigner.cs @@ -22,7 +22,7 @@ public override void Initialize([DisallowNull] IComponent component) base.Initialize(component); _page = component as KryptonBackstagePage; - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); _changeService.ComponentRemoving += OnComponentRemoving; // Lock the component from user size/location change when hosted inside a backstage view diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstageViewDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstageViewDesigner.cs index c48d2f59d3..89762c492f 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstageViewDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonBackstageViewDesigner.cs @@ -67,9 +67,9 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); - _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_selectionService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); + _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_selectionService))); // We need to know when we are being removed _changeService.ComponentRemoving += OnComponentRemoving; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonGalleryDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonGalleryDesigner.cs index c8e9e5dd18..d1737274e2 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonGalleryDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonGalleryDesigner.cs @@ -48,7 +48,7 @@ public override void Initialize([DisallowNull] IComponent component) _gallery = component as KryptonGallery; // We need to know when we are being removed - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); _changeService.ComponentRemoving += OnComponentRemoving; } @@ -130,7 +130,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if (e.Component == _gallery) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the range instances for (var i = _gallery!.DropButtonRanges.Count - 1; i >= 0; i--) diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonDesigner.cs index fc552eb64d..aba3f2d9e3 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonDesigner.cs @@ -54,7 +54,7 @@ public override void Initialize([DisallowNull] IComponent component) // Cast to correct type _ribbon = component as KryptonRibbon ?? throw new ArgumentNullException(nameof(_ribbon)); - if (_ribbon.GetViewManager() is ViewManager viewManager && viewManager is not null) + if (_ribbon.GetViewManager() is ViewManager viewManager) { // Hook into ribbon events viewManager.MouseUpProcessed += OnRibbonMouseUp; @@ -64,9 +64,9 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); - _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_selectionService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); + _selectionService = (ISelectionService?)GetService(typeof(ISelectionService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_selectionService))); // We need to know when we are being removed _changeService.ComponentRemoving += OnComponentRemoving; @@ -261,12 +261,12 @@ private void OnAddTab(object? sender, EventArgs e) { if (_designerHost is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); } if (_ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_ribbon))); } // Use a transaction to support undo/redo actions @@ -298,12 +298,12 @@ private void OnClearTabs(object? sender, EventArgs e) { if (_designerHost is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); } if (_ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_ribbon))); } // Use a transaction to support undo/redo actions @@ -317,7 +317,7 @@ private void OnClearTabs(object? sender, EventArgs e) RaiseComponentChanging(propertyPages); // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the tabs from the ribbon for (var i = _ribbon.RibbonTabs.Count - 1; i >= 0; i--) @@ -342,12 +342,12 @@ private void OnInsertStandardQATItems(object? sender, EventArgs e) { if (_designerHost is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); } if (_ribbon is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_ribbon))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_ribbon))); } DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbon InsertStandardQATItems"); @@ -422,7 +422,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if (Equals(e.Component, _ribbon)) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the button spec instances for (var i = _ribbon!.ButtonSpecs.Count - 1; i >= 0; i--) diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupButtonDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupButtonDesigner.cs index 2761ce24e0..f66e35f77a 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupButtonDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupButtonDesigner.cs @@ -139,9 +139,9 @@ private void UpdateVerbStatus() var moveNext = false; var moveLast = false; - if (_ribbonButton is not null && _ribbonButton.Ribbon is not null) + if (_ribbonButton?.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonButton) > 0; movePrev = items.IndexOf(_ribbonButton) > 0; moveNext = items.IndexOf(_ribbonButton) < (items.Count - 1); @@ -165,12 +165,10 @@ private void OnToggleHelpers(object? sender, EventArgs e) private void OnMoveFirst(object? sender, EventArgs e) { - if (_ribbonButton is not null - && _ribbonButton.Ribbon is not null - && _ribbonButton.RibbonContainer is not null) + if (_ribbonButton is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupButton MoveFirst"); @@ -199,12 +197,10 @@ private void OnMoveFirst(object? sender, EventArgs e) private void OnMovePrevious(object? sender, EventArgs e) { - if (_ribbonButton is not null - && _ribbonButton.Ribbon is not null - && _ribbonButton.RibbonContainer is not null) + if (_ribbonButton is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupButton MovePrevious"); @@ -235,12 +231,10 @@ private void OnMovePrevious(object? sender, EventArgs e) private void OnMoveNext(object? sender, EventArgs e) { - if (_ribbonButton is not null - && _ribbonButton.Ribbon is not null - && _ribbonButton.RibbonContainer is not null) + if (_ribbonButton is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupButton MoveNext"); @@ -271,12 +265,10 @@ private void OnMoveNext(object? sender, EventArgs e) private void OnMoveLast(object? sender, EventArgs e) { - if (_ribbonButton is not null - && _ribbonButton.RibbonContainer is not null - && _ribbonButton.Ribbon is not null) + if (_ribbonButton is { RibbonContainer: not null, Ribbon: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupButton MoveLast"); @@ -305,12 +297,10 @@ private void OnMoveLast(object? sender, EventArgs e) private void OnDeleteButton(object? sender, EventArgs e) { - if (_ribbonButton is not null - && _ribbonButton.Ribbon is not null - && _ribbonButton.RibbonContainer is not null) + if (_ribbonButton is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupButton DeleteButton"); @@ -408,7 +398,7 @@ private void OnTypeSplit(object? sender, EventArgs e) private void OnContextMenu(object? sender, MouseEventArgs e) { - if ( _ribbonButton is not null && _ribbonButton.Ribbon is not null) + if ( _ribbonButton?.Ribbon != null) { // Create the menu strip the first time around if (_cms == null) diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCheckBoxDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCheckBoxDesigner.cs index 2efb4f0db5..673e6de476 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCheckBoxDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCheckBoxDesigner.cs @@ -70,8 +70,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -162,12 +162,10 @@ private void OnToggleHelpers(object? sender, EventArgs e) private void OnMoveFirst(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null - && _ribbonCheckBox.Ribbon is not null - && _ribbonCheckBox.RibbonContainer is not null) + if (_ribbonCheckBox is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupCheckBox MoveFirst"); @@ -196,13 +194,11 @@ private void OnMoveFirst(object? sender, EventArgs e) private void OnMovePrevious(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null - && _ribbonCheckBox.Ribbon is not null - && _ribbonCheckBox.RibbonContainer is not null) + if (_ribbonCheckBox is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupCheckBox MovePrevious"); @@ -233,12 +229,10 @@ private void OnMovePrevious(object? sender, EventArgs e) private void OnMoveNext(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null - && _ribbonCheckBox.Ribbon is not null - && _ribbonCheckBox.RibbonContainer is not null) + if (_ribbonCheckBox is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupCheckBox MoveNext"); @@ -269,12 +263,10 @@ private void OnMoveNext(object? sender, EventArgs e) private void OnMoveLast(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null - && _ribbonCheckBox.Ribbon is not null - && _ribbonCheckBox.RibbonContainer is not null) + if (_ribbonCheckBox is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupCheckBox MoveLast"); @@ -303,12 +295,10 @@ private void OnMoveLast(object? sender, EventArgs e) private void OnDeleteCheckBox(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null - && _ribbonCheckBox.Ribbon is not null - && _ribbonCheckBox.RibbonContainer is not null) + if (_ribbonCheckBox is { Ribbon: not null, RibbonContainer: not null }) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupCheckBox DeleteCheckBox"); @@ -341,7 +331,7 @@ private void OnDeleteCheckBox(object? sender, EventArgs e) private void OnVisible(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null && _ribbonCheckBox.Ribbon is not null) + if (_ribbonCheckBox?.Ribbon != null) { _changeService.OnComponentChanged(_ribbonCheckBox, null, _ribbonCheckBox.Visible, !_ribbonCheckBox.Visible); @@ -351,7 +341,7 @@ private void OnVisible(object? sender, EventArgs e) private void OnEnabled(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null && _ribbonCheckBox.Ribbon is not null) + if (_ribbonCheckBox?.Ribbon != null) { _changeService.OnComponentChanged(_ribbonCheckBox, null, _ribbonCheckBox.Enabled, !_ribbonCheckBox.Enabled); _ribbonCheckBox.Enabled = !_ribbonCheckBox.Enabled; @@ -360,7 +350,7 @@ private void OnEnabled(object? sender, EventArgs e) private void OnAutoCheck(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null && _ribbonCheckBox.Ribbon is not null) + if (_ribbonCheckBox?.Ribbon != null) { _changeService.OnComponentChanged(_ribbonCheckBox, null, _ribbonCheckBox.AutoCheck, !_ribbonCheckBox.AutoCheck); _ribbonCheckBox.AutoCheck = !_ribbonCheckBox.AutoCheck; @@ -369,7 +359,7 @@ private void OnAutoCheck(object? sender, EventArgs e) private void OnThreeState(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null && _ribbonCheckBox.Ribbon is not null) + if (_ribbonCheckBox?.Ribbon != null) { _changeService.OnComponentChanged(_ribbonCheckBox, null, _ribbonCheckBox.ThreeState, !_ribbonCheckBox.ThreeState); _ribbonCheckBox.ThreeState = !_ribbonCheckBox.ThreeState; @@ -378,7 +368,7 @@ private void OnThreeState(object? sender, EventArgs e) private void OnChecked(object? sender, EventArgs e) { - if (_ribbonCheckBox is not null && _ribbonCheckBox.Ribbon is not null) + if (_ribbonCheckBox?.Ribbon != null) { _changeService.OnComponentChanged(_ribbonCheckBox, null, _ribbonCheckBox.Checked, !_ribbonCheckBox.Checked); _ribbonCheckBox.Checked = !_ribbonCheckBox.Checked; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterButtonDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterButtonDesigner.cs index aeee12bc8f..0c22d91541 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterButtonDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterButtonDesigner.cs @@ -73,8 +73,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterColorButtonDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterColorButtonDesigner.cs index 6b90b5ab3b..740d502a88 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterColorButtonDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterColorButtonDesigner.cs @@ -73,8 +73,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterDesigner.cs index 1c8086924c..ebedb86361 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupClusterDesigner.cs @@ -74,8 +74,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentRemoving += OnComponentRemoving; @@ -391,7 +391,7 @@ private void OnClearItems(object? sender, EventArgs e) RaiseComponentChanging(propertyItems); // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the buttons from the cluster group for (var i = _ribbonCluster.Items.Count - 1; i >= 0; i--) @@ -464,7 +464,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if (e.Component == _ribbonCluster) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all items from the cluster for (var j = _ribbonCluster!.Items.Count - 1; j >= 0; j--) @@ -511,8 +511,8 @@ private void OnContextMenu(object? sender, MouseEventArgs e) _deleteClusterMenu }); // Ensure add images have correct transparent background - _addButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addColorButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + _addButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addColorButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } // Update verbs to work out correct enable states diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupColorButtonDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupColorButtonDesigner.cs index 42348169fb..882185b128 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupColorButtonDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupColorButtonDesigner.cs @@ -73,8 +73,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupComboBoxDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupComboBoxDesigner.cs index f64ec10e1f..583c5af173 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupComboBoxDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupComboBoxDesigner.cs @@ -81,8 +81,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCustomControlDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCustomControlDesigner.cs index 93dfa2c9cb..f835deb7c3 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCustomControlDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupCustomControlDesigner.cs @@ -78,8 +78,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDateTimePickerDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDateTimePickerDesigner.cs index 744abd47be..af96dad52b 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDateTimePickerDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDateTimePickerDesigner.cs @@ -62,7 +62,7 @@ public override void Initialize([DisallowNull] IComponent component) // Cast to correct type _ribbonDateTimePicker = component as KryptonRibbonGroupDateTimePicker ?? throw new ArgumentNullException(nameof(component)); - if (_ribbonDateTimePicker is not null && _ribbonDateTimePicker.DateTimePicker is not null) + if (_ribbonDateTimePicker?.DateTimePicker != null) { _ribbonDateTimePicker.DateTimePickerDesigner = this; @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -206,7 +206,7 @@ private void UpdateVerbStatus() if (_ribbonDateTimePicker.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonDateTimePicker) > 0; movePrev = items.IndexOf(_ribbonDateTimePicker) > 0; moveNext = items.IndexOf(_ribbonDateTimePicker) < (items.Count - 1); @@ -233,7 +233,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonDateTimePicker.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDateTimePicker MoveFirst"); @@ -268,7 +268,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonDateTimePicker.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDateTimePicker MovePrevious"); @@ -305,7 +305,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonDateTimePicker.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDateTimePicker MoveNext"); @@ -342,7 +342,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonDateTimePicker.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDateTimePicker MoveLast"); @@ -377,7 +377,7 @@ private void OnDeleteDateTimePicker(object? sender, EventArgs e) if (_ribbonDateTimePicker.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDateTimePicker DeleteDateTimePicker"); @@ -414,7 +414,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonDateTimePicker.Ribbon != null) { - PropertyDescriptor propertyEnabled = TypeDescriptor.GetProperties(_ribbonDateTimePicker)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor propertyEnabled = TypeDescriptor.GetProperties(_ribbonDateTimePicker)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonDateTimePicker); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonDateTimePicker, null, oldValue, newValue); @@ -426,7 +426,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonDateTimePicker.Ribbon != null) { - PropertyDescriptor propertyVisible = TypeDescriptor.GetProperties(_ribbonDateTimePicker)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor propertyVisible = TypeDescriptor.GetProperties(_ribbonDateTimePicker)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonDateTimePicker); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonDateTimePicker, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDesigner.cs index d0992cf21b..b504c9281d 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDesigner.cs @@ -81,8 +81,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentRemoving += OnComponentRemoving; @@ -333,8 +333,7 @@ private void OnMoveLast(object? sender, EventArgs e) private void OnAddTriple(object? sender, EventArgs e) { - if ((_ribbonGroup.Ribbon != null) - && _ribbonGroup.RibbonTab is not null + if (_ribbonGroup is { Ribbon: not null, RibbonTab: not null } && _ribbonGroup.RibbonTab.Groups.Contains(_ribbonGroup)) { // Use a transaction to support undo/redo actions @@ -392,7 +391,7 @@ private void OnAddLines(object? sender, EventArgs e) RaiseComponentChanging(propertyItems); // Get designer to create the new lines component - var lines = (KryptonRibbonGroupLines)_designerHost.CreateComponent(typeof(KryptonRibbonGroupLines)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("lines")); + var lines = (KryptonRibbonGroupLines)_designerHost.CreateComponent(typeof(KryptonRibbonGroupLines)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("lines")); _ribbonGroup.Items.Add(lines); // Get access to the Lines.Items property @@ -497,7 +496,7 @@ private void OnClearItems(object? sender, EventArgs e) RaiseComponentChanging(propertyItems); // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the items from the tab for (var i = _ribbonGroup.Items.Count - 1; i >= 0; i--) @@ -593,7 +592,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if (e.Component == _ribbonGroup) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all containers from the group for (var j = _ribbonGroup.Items.Count - 1; j >= 0; j--) @@ -638,10 +637,10 @@ private void OnContextMenu(object? sender, MouseEventArgs e) _clearItemsMenu, new ToolStripSeparator(), _deleteGroupMenu }); - _addTripleMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addLinesMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addSeparatorMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addGalleryMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + _addTripleMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addLinesMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addSeparatorMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addGalleryMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } // Update verbs to work out correct enable states @@ -711,7 +710,7 @@ private void OnMoveToTab(object? sender, EventArgs e) var tabMenuItem = sender as ToolStripMenuItem ?? throw new ArgumentNullException(nameof(sender)); // Get access to the destination tab - var destination = tabMenuItem.Tag as KryptonRibbonTab ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(tabMenuItem.Tag))); + var destination = tabMenuItem.Tag as KryptonRibbonTab ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(tabMenuItem.Tag))); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroup MoveTabTo"); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDomainUpDownDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDomainUpDownDesigner.cs index e767cdc5cc..1b874537cb 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDomainUpDownDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupDomainUpDownDesigner.cs @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -206,7 +206,7 @@ private void UpdateVerbStatus() if (_ribbonDomainUpDown.Ribbon is not null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonDomainUpDown) > 0; movePrev = items.IndexOf(_ribbonDomainUpDown) > 0; moveNext = items.IndexOf(_ribbonDomainUpDown) < (items.Count - 1); @@ -233,7 +233,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonDomainUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDomainUpDown MoveFirst"); @@ -268,7 +268,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonDomainUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDomainUpDown MovePrevious"); @@ -305,7 +305,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonDomainUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDomainUpDown MoveNext"); @@ -342,7 +342,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonDomainUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDomainUpDown MoveLast"); @@ -377,7 +377,7 @@ private void OnDeleteDomainUpDown(object? sender, EventArgs e) if (_ribbonDomainUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupDomainUpDown DeleteDomainUpDown"); @@ -414,7 +414,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonDomainUpDown.Ribbon is not null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonDomainUpDown)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonDomainUpDown)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonDomainUpDown); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonDomainUpDown, null, oldValue, newValue); @@ -426,7 +426,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonDomainUpDown.Ribbon is not null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonDomainUpDown)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonDomainUpDown)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonDomainUpDown); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonDomainUpDown, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupGalleryDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupGalleryDesigner.cs index c677ba80dc..8108be9632 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupGalleryDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupGalleryDesigner.cs @@ -91,8 +91,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -409,7 +409,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonGallery.Ribbon != null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonGallery)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonGallery)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonGallery); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonGallery, null, oldValue, newValue); @@ -421,7 +421,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonGallery.Ribbon != null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonGallery)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonGallery)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonGallery); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonGallery, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLabelDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLabelDesigner.cs index 668d850e6b..8858a10969 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLabelDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLabelDesigner.cs @@ -68,8 +68,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -136,7 +136,7 @@ private void UpdateVerbStatus() if (_ribbonLabel.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonLabel) > 0; movePrev = items.IndexOf(_ribbonLabel) > 0; @@ -164,7 +164,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonLabel.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupLabel MoveFirst"); @@ -199,7 +199,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonLabel.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupLabel MovePrevious"); @@ -236,7 +236,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonLabel.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupLabel MoveNext"); @@ -273,7 +273,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonLabel.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupLabel MoveLast"); @@ -308,7 +308,7 @@ private void OnDeleteLabel(object? sender, EventArgs e) if (_ribbonLabel.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupLabel DeleteLabel"); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLinesDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLinesDesigner.cs index 48416e5cd3..a202f5d7e2 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLinesDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupLinesDesigner.cs @@ -125,8 +125,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentRemoving += OnComponentRemoving; @@ -331,8 +331,7 @@ private void OnMoveFirst(object? sender, EventArgs e) private void OnMovePrevious(object? sender, EventArgs e) { - if ((_ribbonLines.Ribbon != null) - && _ribbonLines.RibbonGroup is not null + if (_ribbonLines is { Ribbon: not null, RibbonGroup: not null } && _ribbonLines.RibbonGroup.Items.Contains(_ribbonLines)) { // Use a transaction to support undo/redo actions @@ -710,10 +709,7 @@ private void OnAddRichTextBox(object? sender, EventArgs e) private void OnAddComboBox(object? sender, EventArgs e) { - if (_ribbonLines is not null - && _ribbonLines.Ribbon is not null - && _ribbonLines.Items is not null - && _ribbonLines.RibbonGroup is not null + if (_ribbonLines is { Ribbon: not null, Items: not null, RibbonGroup: not null } && _ribbonLines.RibbonGroup.Items.Contains(_ribbonLines)) { // Use a transaction to support undo/redo actions @@ -954,7 +950,7 @@ private void OnClearItems(object? sender, EventArgs e) RaiseComponentChanging(propertyItems); // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the items from the lines group for (var i = _ribbonLines.Items.Count - 1; i >= 0; i--) @@ -1094,7 +1090,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if (e.Component == _ribbonLines) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all items from the lines groups if (_ribbonLines.Items is not null) @@ -1187,22 +1183,22 @@ private void OnContextMenu(object? sender, MouseEventArgs e) }); // Ensure add images have correct transparent background - _addButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addColorButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addCheckBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addRadioButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addLabelMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addCustomControlMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addClusterMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addTextBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addMaskedTextBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addRichTextBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addComboBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addNumericUpDownMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addDomainUpDownMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addDateTimePickerMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addTrackBarMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addThemeComboBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + _addButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addColorButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addCheckBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addRadioButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addLabelMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addCustomControlMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addClusterMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addTextBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addMaskedTextBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addRichTextBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addComboBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addNumericUpDownMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addDomainUpDownMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addDateTimePickerMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addTrackBarMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addThemeComboBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } // Update verbs to work out correct enable states @@ -1276,7 +1272,7 @@ private void OnMoveToGroup(object? sender, EventArgs e) var groupMenuItem = sender as ToolStripMenuItem ?? throw new ArgumentNullException(nameof(sender)); // Get access to the destination tab - var destination = groupMenuItem.Tag as KryptonRibbonGroup ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("destination")); + var destination = groupMenuItem.Tag as KryptonRibbonGroup ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("destination")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupLines MoveLinesToGroup"); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupMaskedTextBoxDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupMaskedTextBoxDesigner.cs index 2bd50155c3..8f2fd43ec8 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupMaskedTextBoxDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupMaskedTextBoxDesigner.cs @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("_designerHost")); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("_changeService")); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("_designerHost")); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("_changeService")); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -206,7 +206,7 @@ private void UpdateVerbStatus() if (_ribbonMaskedTextBox.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonMaskedTextBox) > 0; movePrev = items.IndexOf(_ribbonMaskedTextBox) > 0; moveNext = items.IndexOf(_ribbonMaskedTextBox) < (items.Count - 1); @@ -233,7 +233,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonMaskedTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupMaskedTextBox MoveFirst"); @@ -268,7 +268,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonMaskedTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupMaskedTextBox MovePrevious"); @@ -305,7 +305,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonMaskedTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupMaskedTextBox MoveNext"); @@ -342,7 +342,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonMaskedTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupMaskedTextBox MoveLast"); @@ -377,7 +377,7 @@ private void OnDeleteTextBox(object? sender, EventArgs e) if (_ribbonMaskedTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupMaskedTextBox DeleteTextBox"); @@ -414,7 +414,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonMaskedTextBox.Ribbon != null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonMaskedTextBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonMaskedTextBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonMaskedTextBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonMaskedTextBox, null, oldValue, newValue); @@ -426,7 +426,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonMaskedTextBox.Ribbon != null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonMaskedTextBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonMaskedTextBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonMaskedTextBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonMaskedTextBox, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupNumericUpDownDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupNumericUpDownDesigner.cs index 971a503203..ab9ff3cb48 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupNumericUpDownDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupNumericUpDownDesigner.cs @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("_designerHost")); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("_changeService")); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("_designerHost")); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("_changeService")); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -205,7 +205,7 @@ private void UpdateVerbStatus() if (_ribbonNumericUpDown.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonNumericUpDown) > 0; movePrev = items.IndexOf(_ribbonNumericUpDown) > 0; moveNext = items.IndexOf(_ribbonNumericUpDown) < (items.Count - 1); @@ -232,7 +232,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonNumericUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupNumericUpDown MoveFirst"); @@ -267,7 +267,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonNumericUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupNumericUpDown MovePrevious"); @@ -303,7 +303,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonNumericUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupNumericUpDown MoveNext"); @@ -340,7 +340,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonNumericUpDown.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupNumericUpDown MoveLast"); @@ -375,7 +375,7 @@ private void OnDeleteNumericUpDown(object? sender, EventArgs e) if (_ribbonNumericUpDown.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupNumericUpDown DeleteNumericUpDown"); @@ -412,7 +412,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonNumericUpDown.Ribbon != null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonNumericUpDown)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonNumericUpDown)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonNumericUpDown); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonNumericUpDown, null, oldValue, newValue); @@ -424,7 +424,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonNumericUpDown.Ribbon != null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonNumericUpDown)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonNumericUpDown)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonNumericUpDown); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonNumericUpDown, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRadioButtonDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRadioButtonDesigner.cs index 56924b3285..41ebfdaa37 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRadioButtonDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRadioButtonDesigner.cs @@ -68,8 +68,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService!.ComponentChanged += OnComponentChanged; @@ -136,7 +136,7 @@ private void UpdateVerbStatus() if (_ribbonRadioButton.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ParentItems))); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ParentItems))); moveFirst = items.IndexOf(_ribbonRadioButton) > 0; movePrev = items.IndexOf(_ribbonRadioButton) > 0; moveNext = items.IndexOf(_ribbonRadioButton) < (items.Count - 1); @@ -163,7 +163,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonRadioButton.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ParentItems))); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ParentItems))); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRadioButton MoveFirst"); @@ -171,7 +171,7 @@ private void OnMoveFirst(object? sender, EventArgs e) try { // Get access to the Items property - MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyItems")); + MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyItems")); RaiseComponentChanging(propertyItems); @@ -195,7 +195,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonRadioButton.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ParentItems))); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ParentItems))); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRadioButton MovePrevious"); @@ -203,7 +203,7 @@ private void OnMovePrevious(object? sender, EventArgs e) try { // Get access to the Items property - MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyItems")); + MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyItems")); RaiseComponentChanging(propertyItems); @@ -229,7 +229,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonRadioButton.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ParentItems))); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ParentItems))); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRadioButton MoveNext"); @@ -237,7 +237,7 @@ private void OnMoveNext(object? sender, EventArgs e) try { // Get access to the Items property - MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyItems")); + MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyItems")); RaiseComponentChanging(propertyItems); @@ -263,7 +263,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonRadioButton.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ParentItems))); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ParentItems))); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRadioButton MoveLast"); @@ -271,7 +271,7 @@ private void OnMoveLast(object? sender, EventArgs e) try { // Get access to the Items property - MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyItems")); + MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyItems")); RaiseComponentChanging(propertyItems); @@ -295,7 +295,7 @@ private void OnDeleteRadioButton(object? sender, EventArgs e) if (_ribbonRadioButton.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(ParentItems))); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(ParentItems))); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRadioButton DeleteRadioButton"); @@ -303,7 +303,7 @@ private void OnDeleteRadioButton(object? sender, EventArgs e) try { // Get access to the Items property - MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyItems")); + MemberDescriptor propertyItems = TypeDescriptor.GetProperties(_ribbonRadioButton.RibbonContainer!)[@"Items"] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyItems")); // Remove the ribbon group from the ribbon tab RaiseComponentChanging(null); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRichTextBoxDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRichTextBoxDesigner.cs index 16abca0481..8934ee2c9a 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRichTextBoxDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupRichTextBoxDesigner.cs @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -206,7 +206,7 @@ private void UpdateVerbStatus() if (_ribbonRichTextBox.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonRichTextBox) > 0; movePrev = items.IndexOf(_ribbonRichTextBox) > 0; moveNext = items.IndexOf(_ribbonRichTextBox) < (items.Count - 1); @@ -233,7 +233,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonRichTextBox.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRichTextBox MoveFirst"); @@ -268,7 +268,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonRichTextBox.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRichTextBox MovePrevious"); @@ -305,7 +305,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonRichTextBox.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRichTextBox MoveNext"); @@ -342,7 +342,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonRichTextBox.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRichTextBox MoveLast"); @@ -377,7 +377,7 @@ private void OnDeleteTextBox(object? sender, EventArgs e) if (_ribbonRichTextBox.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupRichTextBox DeleteRichTextBox"); @@ -414,7 +414,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonRichTextBox.Ribbon is not null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonRichTextBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonRichTextBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonRichTextBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonRichTextBox, null, oldValue, newValue); @@ -426,7 +426,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonRichTextBox.Ribbon is not null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonRichTextBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonRichTextBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonRichTextBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonRichTextBox, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupSeparatorDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupSeparatorDesigner.cs index edc8fa4662..58337ef9d9 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupSeparatorDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupSeparatorDesigner.cs @@ -67,8 +67,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -85,7 +85,7 @@ public override DesignerVerbCollection Verbs if (_verbs is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_verbs))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_verbs))); } return _verbs; @@ -424,7 +424,7 @@ private void OnMoveToGroup(object? sender, EventArgs e) var groupMenuItem = sender as ToolStripMenuItem ?? throw new ArgumentNullException(nameof(sender)); // Get access to the destination tab - var destination = groupMenuItem.Tag as KryptonRibbonGroup ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("destination")); + var destination = groupMenuItem.Tag as KryptonRibbonGroup ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("destination")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupSeparator MoveSeparatorToGroup"); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTextBoxDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTextBoxDesigner.cs index 87a5765891..f9d15fb129 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTextBoxDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTextBoxDesigner.cs @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -206,7 +206,7 @@ private void UpdateVerbStatus() if (_ribbonTextBox.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonTextBox) > 0; movePrev = items.IndexOf(_ribbonTextBox) > 0; moveNext = items.IndexOf(_ribbonTextBox) < (items.Count - 1); @@ -233,7 +233,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTextBox MoveFirst"); @@ -268,7 +268,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonTextBox.Ribbon != null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTextBox MovePrevious"); @@ -305,7 +305,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTextBox MoveNext"); @@ -342,7 +342,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTextBox MoveLast"); @@ -377,7 +377,7 @@ private void OnDeleteTextBox(object? sender, EventArgs e) if (_ribbonTextBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTextBox DeleteTextBox"); @@ -414,7 +414,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonTextBox.Ribbon is not null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonTextBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonTextBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonTextBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonTextBox, null, oldValue, newValue); @@ -426,7 +426,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonTextBox.Ribbon is not null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonTextBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonTextBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonTextBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonTextBox, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupThemeComboBoxDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupThemeComboBoxDesigner.cs index ff68883758..266a7344b0 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupThemeComboBoxDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupThemeComboBoxDesigner.cs @@ -77,8 +77,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("_designerHost")); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("_changeService")); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("_designerHost")); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("_changeService")); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -201,7 +201,7 @@ private void UpdateVerbStatus() if (_ribbonThemeComboBox.Ribbon is not null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonThemeComboBox) > 0; movePrev = items.IndexOf(_ribbonThemeComboBox) > 0; moveNext = items.IndexOf(_ribbonThemeComboBox) < (items.Count - 1); @@ -228,7 +228,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonThemeComboBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupThemeComboBoxBox MoveFirst"); @@ -263,7 +263,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonThemeComboBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupThemeComboBox MovePrevious"); @@ -300,7 +300,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonThemeComboBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupThemeComboBox MoveNext"); @@ -337,7 +337,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonThemeComboBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupThemeComboBox MoveLast"); @@ -372,7 +372,7 @@ private void OnDeleteThemeComboBox(object? sender, EventArgs e) if (_ribbonThemeComboBox.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupThemeComboBox DeleteThemeComboBox"); @@ -409,7 +409,7 @@ private void OnEnabled(object? sender, EventArgs e) { if (_ribbonThemeComboBox.Ribbon is not null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonThemeComboBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonThemeComboBox)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonThemeComboBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonThemeComboBox, null, oldValue, newValue); @@ -421,7 +421,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonThemeComboBox.Ribbon is not null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonThemeComboBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonThemeComboBox)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonThemeComboBox); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonThemeComboBox, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTrackBarDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTrackBarDesigner.cs index 1cde41469d..722acbf0f4 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTrackBarDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTrackBarDesigner.cs @@ -62,7 +62,7 @@ public override void Initialize([DisallowNull] IComponent component) // Cast to correct type _ribbonTrackBar = component as KryptonRibbonGroupTrackBar ?? throw new ArgumentNullException(nameof(component)); - if (_ribbonTrackBar is not null && _ribbonTrackBar.TrackBar is not null) + if (_ribbonTrackBar?.TrackBar != null) { _ribbonTrackBar.TrackBarDesigner = this; @@ -82,8 +82,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentChanged += OnComponentChanged; @@ -206,7 +206,7 @@ private void UpdateVerbStatus() if (_ribbonTrackBar.Ribbon != null) { - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); moveFirst = items.IndexOf(_ribbonTrackBar) > 0; movePrev = items.IndexOf(_ribbonTrackBar) > 0; moveNext = items.IndexOf(_ribbonTrackBar) < (items.Count - 1); @@ -233,7 +233,7 @@ private void OnMoveFirst(object? sender, EventArgs e) if (_ribbonTrackBar.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTrackBar MoveFirst"); @@ -268,7 +268,7 @@ private void OnMovePrevious(object? sender, EventArgs e) if (_ribbonTrackBar.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTrackBar MovePrevious"); @@ -305,7 +305,7 @@ private void OnMoveNext(object? sender, EventArgs e) if (_ribbonTrackBar.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTrackBar MoveNext"); @@ -342,7 +342,7 @@ private void OnMoveLast(object? sender, EventArgs e) if (_ribbonTrackBar.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTrackBar MoveLast"); @@ -377,7 +377,7 @@ private void OnDeleteTrackBar(object? sender, EventArgs e) if (_ribbonTrackBar.Ribbon is not null) { // Get access to the parent collection of items - var items = ParentItems ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("items")); + var items = ParentItems ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("items")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTrackBar DeleteTrackBar"); @@ -414,7 +414,7 @@ private void OnEnabled(object sender, EventArgs e) { if (_ribbonTrackBar.Ribbon is not null) { - PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonTrackBar)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyEnabled")); + PropertyDescriptor? propertyEnabled = TypeDescriptor.GetProperties(_ribbonTrackBar)[nameof(Enabled)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyEnabled")); var oldValue = (bool?)propertyEnabled.GetValue(_ribbonTrackBar); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonTrackBar, null, oldValue, newValue); @@ -426,7 +426,7 @@ private void OnVisible(object? sender, EventArgs e) { if (_ribbonTrackBar.Ribbon is not null) { - PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonTrackBar)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("propertyVisible")); + PropertyDescriptor? propertyVisible = TypeDescriptor.GetProperties(_ribbonTrackBar)[nameof(Visible)] ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("propertyVisible")); var oldValue = (bool?)propertyVisible.GetValue(_ribbonTrackBar); var newValue = !oldValue; _changeService.OnComponentChanged(_ribbonTrackBar, null, oldValue, newValue); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTripleDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTripleDesigner.cs index 8e63760917..afd23ddaeb 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTripleDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonGroupTripleDesigner.cs @@ -120,8 +120,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = GetService(typeof(IDesignerHost)) as IDesignerHost ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = GetService(typeof(IComponentChangeService)) as IComponentChangeService ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = GetService(typeof(IDesignerHost)) as IDesignerHost ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = GetService(typeof(IComponentChangeService)) as IComponentChangeService ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentRemoving += OnComponentRemoving; @@ -861,7 +861,7 @@ private void OnClearItems(object? sender, EventArgs e) RaiseComponentChanging(propertyItems); // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the items from the triple group for (var i = _ribbonTriple.Items.Count - 1 ; i >= 0 ; i--) @@ -986,7 +986,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if (e.Component == _ribbonTriple && _ribbonTriple.Items is not null) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all items from the triple group for (var j = _ribbonTriple.Items.Count - 1; j >= 0; j--) @@ -1067,21 +1067,21 @@ private void OnContextMenu(object? sender, MouseEventArgs e) }); // Ensure add images have correct transparent background - _addButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addColorButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addCheckBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addRadioButtonMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addLabelMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addCustomControlMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addTextBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addMaskedTextBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addRichTextBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addComboBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addNumericUpDownMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addDomainUpDownMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addDateTimePickerMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addTrackBarMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; - _addThemeComboBoxMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + _addButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addColorButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addCheckBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addRadioButtonMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addLabelMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addCustomControlMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addTextBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addMaskedTextBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addRichTextBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addComboBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addNumericUpDownMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addDomainUpDownMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addDateTimePickerMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addTrackBarMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; + _addThemeComboBoxMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } // Update verbs to work out correct enable states @@ -1168,7 +1168,7 @@ private void OnMoveToGroup(object? sender, EventArgs e) var groupMenuItem = sender as ToolStripMenuItem ?? throw new ArgumentNullException(nameof(sender)); // Get access to the destination tab - var destination = groupMenuItem.Tag as KryptonRibbonGroup ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("destination")); + var destination = groupMenuItem.Tag as KryptonRibbonGroup ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("destination")); // Use a transaction to support undo/redo actions DesignerTransaction transaction = _designerHost.CreateTransaction(@"KryptonRibbonGroupTriple MoveTripleToGroup"); diff --git a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonTabDesigner.cs b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonTabDesigner.cs index bcc5f92f97..edf2980157 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonTabDesigner.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Designers/Designers/KryptonRibbonTabDesigner.cs @@ -69,8 +69,8 @@ public override void Initialize([DisallowNull] IComponent component) } // Get access to the services - _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_designerHost))); - _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_changeService))); + _designerHost = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_designerHost))); + _changeService = (IComponentChangeService?)GetService(typeof(IComponentChangeService)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_changeService))); // We need to know when we are being removed/changed _changeService.ComponentRemoving += OnComponentRemoving; @@ -227,8 +227,7 @@ private void OnMoveFirst(object? sender, EventArgs e) private void OnMovePrevious(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { // Use a transaction to support undo/redo actions @@ -262,8 +261,7 @@ private void OnMovePrevious(object? sender, EventArgs e) private void OnMoveNext(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { @@ -298,8 +296,7 @@ private void OnMoveNext(object? sender, EventArgs e) private void OnMoveLast(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { // Use a transaction to support undo/redo actions @@ -331,8 +328,7 @@ private void OnMoveLast(object? sender, EventArgs e) private void OnAddGroup(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { // Use a transaction to support undo/redo actions @@ -361,8 +357,7 @@ private void OnAddGroup(object? sender, EventArgs e) private void OnClearGroups(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { // Use a transaction to support undo/redo actions @@ -376,7 +371,7 @@ private void OnClearGroups(object? sender, EventArgs e) RaiseComponentChanging(propertyGroups); // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the groups from the tab for (var i = _ribbonTab.Groups.Count - 1; i >= 0; i--) @@ -398,8 +393,7 @@ private void OnClearGroups(object? sender, EventArgs e) private void OnDeleteTab(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { // Use a transaction to support undo/redo actions @@ -433,8 +427,7 @@ private void OnDeleteTab(object? sender, EventArgs e) private void OnVisible(object? sender, EventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { _changeService.OnComponentChanged(_ribbonTab, null, _ribbonTab.Visible, !_ribbonTab.Visible); @@ -450,7 +443,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) if ( _ribbonTab is not null && e.Component == _ribbonTab) { // Need access to host in order to delete a component - var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("host")); + var host = (IDesignerHost?)GetService(typeof(IDesignerHost)) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("host")); // We need to remove all the groups from the tab for (var i = _ribbonTab.Groups.Count - 1; i >= 0; i--) @@ -464,8 +457,7 @@ private void OnComponentRemoving(object? sender, ComponentEventArgs e) private void OnContextMenu(object? sender, MouseEventArgs e) { - if ((_ribbonTab is not null) - && _ribbonTab.Ribbon != null + if (_ribbonTab?.Ribbon != null && _ribbonTab.Ribbon.RibbonTabs.Contains(_ribbonTab)) { // Create the menu strip the first time around @@ -488,7 +480,7 @@ private void OnContextMenu(object? sender, MouseEventArgs e) _clearGroupsMenu, new ToolStripSeparator(), _deleteTabMenu }); - _addGroupMenu.ImageTransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + _addGroupMenu.ImageTransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } // Update verbs to work out correct enable states diff --git a/Source/Krypton Components/Krypton.Ribbon/Palette/AppButtonToolTipToContent.cs b/Source/Krypton Components/Krypton.Ribbon/Palette/AppButtonToolTipToContent.cs index e01935c863..54cb1f10cb 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Palette/AppButtonToolTipToContent.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Palette/AppButtonToolTipToContent.cs @@ -80,7 +80,7 @@ public AppButtonToolTipToContent([DisallowNull] KryptonRibbon ribbon) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/Palette/QATButtonToolTipToContent.cs b/Source/Krypton Components/Krypton.Ribbon/Palette/QATButtonToolTipToContent.cs index 34e3dc7d60..bf4f9ef0be 100644 --- a/Source/Krypton Components/Krypton.Ribbon/Palette/QATButtonToolTipToContent.cs +++ b/Source/Krypton Components/Krypton.Ribbon/Palette/QATButtonToolTipToContent.cs @@ -101,7 +101,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonContextTitle.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonContextTitle.cs index d142131068..b1ce853f52 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonContextTitle.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonContextTitle.cs @@ -461,7 +461,7 @@ private Color CheckForContextColor() => /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignBase.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignBase.cs index 5d4fc5f3ea..22cefef15f 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignBase.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignBase.cs @@ -172,7 +172,7 @@ public override void RenderBefore(RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignCluster.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignCluster.cs index c5fd3c6dcd..465f49cc6c 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignCluster.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignCluster.cs @@ -35,7 +35,7 @@ static ViewDrawRibbonDesignCluster() // Use image list to convert background Magenta to transparent _imageList = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _imageList.Images.AddRange([ GenericImageResources.KryptonRibbonGroupClusterButton, diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupContainer.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupContainer.cs index cb1af5dda7..8b662aff86 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupContainer.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupContainer.cs @@ -35,7 +35,7 @@ static ViewDrawRibbonDesignGroupContainer() // Use image list to convert background Magenta to transparent _imageList = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _imageList.Images.AddRange([ GenericImageResources.KryptonRibbonGroupTriple, diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupLines.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupLines.cs index 3c363c0e9c..222c4b3798 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupLines.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupLines.cs @@ -35,7 +35,7 @@ static ViewDrawRibbonDesignGroupLines() // Use image list to convert background Magenta to transparent _imageList = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _imageList.Images.AddRange([ GenericImageResources.KryptonRibbonGroupButton, diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupTriple.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupTriple.cs index c0955f6df8..1bb015682b 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupTriple.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonDesignGroupTriple.cs @@ -38,7 +38,7 @@ static ViewDrawRibbonDesignGroupTriple() // Use image list to convert background Magenta to transparent _imageList = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _imageList.Images.AddRange([ GenericImageResources.KryptonRibbonGroupButton, diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonFileAppTab.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonFileAppTab.cs index 139f62f072..6e76cc15bc 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonFileAppTab.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonFileAppTab.cs @@ -200,7 +200,7 @@ public string GetShortText() => _ribbon.RibbonShape == PaletteRibbonShape.Office /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryButton.cs index c920979e03..d4b2f43116 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryButton.cs @@ -334,7 +334,7 @@ private GraphicsPath CreateBorderPath(Rectangle rect) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryItem.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryItem.cs index af6a95c0fd..81256961f5 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryItem.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGalleryItem.cs @@ -234,7 +234,7 @@ public override void Render([DisallowNull] RenderContext? context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonText.cs index f55c9b7f85..6232e5f3a9 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButtonText.cs @@ -309,7 +309,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs index 64c7c8580c..cd56cb250d 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBox.cs @@ -580,7 +580,7 @@ private void OnCheckBoxPropertyChanged(object? sender, PropertyChangedEventArgs /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBoxText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBoxText.cs index b0dc9808e5..7cb53b873a 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBoxText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupCheckBoxText.cs @@ -303,7 +303,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButtonText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButtonText.cs index a540423b61..21f1746cc0 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButtonText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterButtonText.cs @@ -278,7 +278,7 @@ public string GetShortText() => _ribbonButton.KryptonCommand != null /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButtonText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButtonText.cs index d304126a26..d0f3ee3848 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButtonText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupClusterColorButtonText.cs @@ -270,7 +270,7 @@ public string GetShortText() => _ribbonColorButton.KryptonCommand != null /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButtonText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButtonText.cs index 47c5220566..cd56eb7384 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButtonText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButtonText.cs @@ -303,7 +303,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupGalleryText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupGalleryText.cs index 0f53b98290..d57481a8ad 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupGalleryText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupGalleryText.cs @@ -288,7 +288,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabelText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabelText.cs index 37592e42ac..b57c8041df 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabelText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupLabelText.cs @@ -306,7 +306,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs index 279b87b3bd..951eac4653 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButton.cs @@ -560,7 +560,7 @@ private void OnRadioButtonPropertyChanged(object? sender, PropertyChangedEventAr /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButtonText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButtonText.cs index 0e61ac8c75..caf52643c6 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButtonText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupRadioButtonText.cs @@ -294,7 +294,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupText.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupText.cs index 2c8c94e7d3..b08df468c3 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupText.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupText.cs @@ -280,7 +280,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupTitle.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupTitle.cs index 919e3e65c4..206fe5af1e 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupTitle.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonGroupTitle.cs @@ -234,7 +234,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonKeyTip.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonKeyTip.cs index cceaa2e3e3..79cd78d5aa 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonKeyTip.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonKeyTip.cs @@ -96,7 +96,7 @@ public ViewDrawRibbonKeyTip(KeyTipInfo keyTipInfo, /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonNotificationBar.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonNotificationBar.cs index a4c9266704..35c7caaff9 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonNotificationBar.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonNotificationBar.cs @@ -108,7 +108,7 @@ public CommandButtonContent(IKryptonCommand command) public Image? GetOverlayImage(PaletteState state) => null; - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; public OverlayImagePosition GetOverlayImagePosition(PaletteState state) => OverlayImagePosition.TopRight; @@ -143,7 +143,7 @@ public ActionButtonContent(string text) public Image? GetOverlayImage(PaletteState state) => null; - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; public OverlayImagePosition GetOverlayImagePosition(PaletteState state) => OverlayImagePosition.TopRight; @@ -171,7 +171,7 @@ private class CloseButtonContent : IContentValues public Image? GetOverlayImage(PaletteState state) => null; - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; public OverlayImagePosition GetOverlayImagePosition(PaletteState state) => OverlayImagePosition.TopRight; @@ -868,7 +868,7 @@ public NotificationIconContent(KryptonRibbonNotificationBarData data) public Image? GetOverlayImage(PaletteState state) => null; - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; public OverlayImagePosition GetOverlayImagePosition(PaletteState state) => OverlayImagePosition.TopRight; @@ -910,7 +910,7 @@ public string GetShortText() public Image? GetOverlayImage(PaletteState state) => null; - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; public OverlayImagePosition GetOverlayImagePosition(PaletteState state) => OverlayImagePosition.TopRight; diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonQATButton.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonQATButton.cs index 4ff3e5f4cc..a38fb7d3c9 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonQATButton.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonQATButton.cs @@ -311,7 +311,7 @@ public Color GetImageTransparentColor(PaletteState state) => /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonRecentDocs.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonRecentDocs.cs index 12e0b0d858..997b4942e4 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonRecentDocs.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonRecentDocs.cs @@ -187,7 +187,7 @@ public string GetShortText() => !string.IsNullOrEmpty(KryptonManager.Strings.Rib /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonTab.cs b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonTab.cs index 43e47ce975..da2a47bd9f 100644 --- a/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonTab.cs +++ b/Source/Krypton Components/Krypton.Ribbon/View Draw/ViewDrawRibbonTab.cs @@ -510,7 +510,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpec.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpec.cs index 1b7a6ff53c..784c7f7c79 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpec.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpec.cs @@ -74,9 +74,9 @@ protected ButtonSpec() { _image = null; _toolTipImage = null; - _colorMap = GlobalStaticValues.EMPTY_COLOR; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; - _toolTipImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _colorMap = GlobalStaticVariables.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; + _toolTipImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _text = string.Empty; _extraText = string.Empty; UniqueName = CommonHelper.UniqueString; @@ -217,8 +217,8 @@ public Color ImageTransparentColor } } } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ImageStates @@ -328,8 +328,8 @@ public Color ToolTipImageTransparentColor } } } - private bool ShouldSerializeToolTipImageTransparentColor() => ToolTipImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetToolTipImageTransparentColor() => ToolTipImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeToolTipImageTransparentColor() => ToolTipImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetToolTipImageTransparentColor() => ToolTipImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolTipTitle @@ -545,8 +545,8 @@ public Color ColorMap } } } - private bool ShouldSerializeColorMap() => ColorMap != GlobalStaticValues.EMPTY_COLOR; - private void ResetColorMap() => ColorMap = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeColorMap() => ColorMap != GlobalStaticVariables.EMPTY_COLOR; + private void ResetColorMap() => ColorMap = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Style @@ -788,9 +788,9 @@ public virtual Color GetImageTransparentColor(PaletteBase? palette) return KryptonCommand.ImageTransparentColor; } - return ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR + return ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR ? ImageTransparentColor - : palette?.GetButtonSpecImageTransparentColor(ProtectedType) ?? GlobalStaticValues.EMPTY_COLOR; + : palette?.GetButtonSpecImageTransparentColor(ProtectedType) ?? GlobalStaticVariables.EMPTY_COLOR; } /// @@ -843,7 +843,7 @@ public virtual string GetToolTipTitle(PaletteBase palette) => !string.IsNullOrEm /// /// Palette to use for inheriting values. /// Color value. - public virtual Color GetColorMap(PaletteBase? palette) => ColorMap != GlobalStaticValues.EMPTY_COLOR + public virtual Color GetColorMap(PaletteBase? palette) => ColorMap != GlobalStaticVariables.EMPTY_COLOR ? ColorMap : palette!.GetButtonSpecColorMap(ProtectedType); diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecRemapByContentBase.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecRemapByContentBase.cs index 76dfba4fb5..62c9598e72 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecRemapByContentBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecRemapByContentBase.cs @@ -63,7 +63,7 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette Color mapColor = OverrideImageColor(state); // If a map color provided then return is - return (mapColor != GlobalStaticValues.EMPTY_COLOR) && (PaletteContent != null) ? mapColor : base.GetContentImageColorMap(style, state); + return (mapColor != GlobalStaticVariables.EMPTY_COLOR) && (PaletteContent != null) ? mapColor : base.GetContentImageColorMap(style, state); } #endregion @@ -80,7 +80,7 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS Color mapColor = OverrideImageColor(state); // If mapping occurring then return the target remap color - if ((mapColor != GlobalStaticValues.EMPTY_COLOR) && (PaletteContent != null)) + if ((mapColor != GlobalStaticVariables.EMPTY_COLOR) && (PaletteContent != null)) { PaletteState getState = PaletteState; @@ -144,7 +144,7 @@ private Color OverrideImageColor(PaletteState state) // ReSharper restore RedundantBaseQualifier // If we are supposed to remap a color - if (mapColor != GlobalStaticValues.EMPTY_COLOR) + if (mapColor != GlobalStaticVariables.EMPTY_COLOR) { // ReSharper disable RedundantBaseQualifier // Get the button style requested @@ -160,7 +160,7 @@ private Color OverrideImageColor(PaletteState state) } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } private bool OverrideTextColor(PaletteState state) diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecToContent.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecToContent.cs index 836ca337c2..e8eb7b6dda 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecToContent.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecToContent.cs @@ -87,7 +87,7 @@ public ButtonSpecToContent([DisallowNull] PaletteBase palette, /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs index c26103cd73..500bbe1659 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ButtonSpec/ButtonSpecView.cs @@ -392,7 +392,7 @@ public string GetLongText() => /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckBox.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckBox.cs index d8b0881aa1..f0f9a5099e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckBox.cs @@ -84,7 +84,7 @@ public KryptonContextMenuCheckBox(string initialText) _text = initialText; _extraText = string.Empty; _image = null; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _checkState = CheckState.Unchecked; _checked = false; _threeState = false; @@ -267,7 +267,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); + private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticVariables.EMPTY_COLOR); /// /// Gets and sets the check box label style. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckButton.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckButton.cs index b05329bebb..45a68a7eba 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuCheckButton.cs @@ -74,7 +74,7 @@ public KryptonContextMenuCheckButton(string initialText) _text = initialText; _extraText = string.Empty; _image = null; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _checked = false; _autoCheck = false; _style = ButtonStyle.Standalone; @@ -260,7 +260,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => (_imageTransparentColor == null) || !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); + private bool ShouldSerializeImageTransparentColor() => (_imageTransparentColor == null) || !_imageTransparentColor.Equals(GlobalStaticVariables.EMPTY_COLOR); /// /// Gets and sets the check button style. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuColorColumns.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuColorColumns.cs index 13a0514989..fc2fb55315 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuColorColumns.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuColorColumns.cs @@ -137,7 +137,7 @@ public KryptonContextMenuColorColumns(ColorScheme scheme) { // Default fields _autoClose = true; - _selectedColor = GlobalStaticValues.EMPTY_COLOR; + _selectedColor = GlobalStaticVariables.EMPTY_COLOR; _groupNonFirstRows = true; _blockSize = new Size(13, 13); SetColorScheme(scheme); diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs index c8cc3687f0..144b94bc95 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuHeading.cs @@ -59,7 +59,7 @@ public KryptonContextMenuHeading(string initialText) // Default fields _extraText = string.Empty; _image = null; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; // Create the redirector that can get values from the krypton context menu _redirectHeading = new PaletteRedirectTriple(); @@ -224,7 +224,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); + private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticVariables.EMPTY_COLOR); /// /// Gets access to the header instance specific appearance values. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuItem.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuItem.cs index 8014242fdc..c2bb57b120 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuItem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuItem.cs @@ -160,7 +160,7 @@ public KryptonContextMenuItem(string initialText, _showShortcutKeys = true; _largeKryptonCommandImage = false; _extraText = string.Empty; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _shortcutKeys = shortcut; _shortcutKeyDisplayString = string.Empty; _checkState = CheckState.Unchecked; @@ -324,8 +324,8 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); - private void ResetImageTransparentColor() => _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticVariables.EMPTY_COLOR); + private void ResetImageTransparentColor() => _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets and sets the shortcut key combination associated with the menu item. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuLinkLabel.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuLinkLabel.cs index 5e58fb8ee8..396e6ec514 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuLinkLabel.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuLinkLabel.cs @@ -70,7 +70,7 @@ public KryptonContextMenuLinkLabel(string initialText) _text = initialText; _extraText = string.Empty; _image = null; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _style = LabelStyle.NormalPanel; _autoClose = true; @@ -321,7 +321,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); + private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticVariables.EMPTY_COLOR); /// /// Gets access to the link label normal instance specific appearance values. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuRadioButton.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuRadioButton.cs index 4aefca9cec..286e73d8ab 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuRadioButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuRadioButton.cs @@ -75,7 +75,7 @@ public KryptonContextMenuRadioButton(string initialText) _text = initialText; _extraText = string.Empty; _image = null; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _checked = false; _autoCheck = true; _style = LabelStyle.NormalPanel; @@ -253,7 +253,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticValues.EMPTY_COLOR); + private bool ShouldSerializeImageTransparentColor() => !_imageTransparentColor.Equals(GlobalStaticVariables.EMPTY_COLOR); /// /// Gets and sets the radio button label style. diff --git a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuSeparator.cs b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuSeparator.cs index 7b09f95ba8..b883cc8023 100644 --- a/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuSeparator.cs +++ b/Source/Krypton Components/Krypton.Toolkit/ContextMenu/KryptonContextMenuSeparator.cs @@ -98,7 +98,7 @@ public override ViewBase GenerateView(IContextMenuProvider provider, // Take up same space as the image column, so separator starts close to actual text var imageContent = new ViewDrawContent(provider.ProviderStateCommon.ItemImage.Content, - new FixedContentValue(null, null, null, GlobalStaticValues.EMPTY_COLOR), VisualOrientation.Top); + new FixedContentValue(null, null, null, GlobalStaticVariables.EMPTY_COLOR), VisualOrientation.Top); var imageCanvas = new ViewDrawMenuImageCanvas(provider.ProviderStateCommon.ItemImage.Back, provider.ProviderStateCommon.ItemImage.Border, 0, true) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controller/MenuColorBlockController.cs b/Source/Krypton Components/Krypton.Toolkit/Controller/MenuColorBlockController.cs index e62fa1ea11..74e6c169ef 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controller/MenuColorBlockController.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controller/MenuColorBlockController.cs @@ -413,7 +413,7 @@ private void HighlightState() private void NormalState() { _highlight = false; - _menuColorBlock.KryptonContextMenuColorColumns.OnTrackingColor(new ColorEventArgs(GlobalStaticValues.EMPTY_COLOR)); + _menuColorBlock.KryptonContextMenuColorColumns.OnTrackingColor(new ColorEventArgs(GlobalStaticVariables.EMPTY_COLOR)); UpdateTarget(); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controller/SeparatorController.cs b/Source/Krypton Components/Krypton.Toolkit/Controller/SeparatorController.cs index 07b3daaca0..79e6521a6f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controller/SeparatorController.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controller/SeparatorController.cs @@ -94,7 +94,7 @@ public SeparatorIndicator() MinimizeBox = false; ShowInTaskbar = false; BackColor = Color.Black; - TransparencyKey = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + TransparencyKey = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; Opacity = 0.5; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumbItem.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumbItem.cs index 1b1ed532c8..8bfd6de3b1 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumbItem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonBreadCrumbItem.cs @@ -149,7 +149,7 @@ protected override void OnCleared(EventArgs e) /// Initialize a new instance of the KryptonBreadCrumbItem class. /// public KryptonBreadCrumbItem() - : this("ListItem", null, null, GlobalStaticValues.EMPTY_COLOR) + : this("ListItem", null, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -158,7 +158,7 @@ public KryptonBreadCrumbItem() /// /// Initial short text value. public KryptonBreadCrumbItem(string shortText) - : this(shortText, null, null, GlobalStaticValues.EMPTY_COLOR) + : this(shortText, null, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -168,7 +168,7 @@ public KryptonBreadCrumbItem(string shortText) /// Initial short text value. /// Initial long text value. public KryptonBreadCrumbItem(string shortText, string longText) - : this(shortText, longText, null, GlobalStaticValues.EMPTY_COLOR) + : this(shortText, longText, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -181,7 +181,7 @@ public KryptonBreadCrumbItem(string shortText, string longText) public KryptonBreadCrumbItem(string shortText, string longText, Image? image) - : this(shortText, longText, image, GlobalStaticValues.EMPTY_COLOR) + : this(shortText, longText, image, GlobalStaticVariables.EMPTY_COLOR) { } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCalcInput.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCalcInput.cs index bc9c6b52c2..e0d7f4f5ab 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCalcInput.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCalcInput.cs @@ -1383,7 +1383,7 @@ private void ShowCalculator() { // Use a palette-derived text color that contrasts with context menu surfaces var c = palette.GetContentShortTextColor1(PaletteContentStyle.ContextMenuItemTextStandard, PaletteState.Normal); - if (c != GlobalStaticValues.EMPTY_COLOR && !c.IsEmpty) + if (c != GlobalStaticVariables.EMPTY_COLOR && !c.IsEmpty) { displayItem.StateDisabled.ItemTextStandard.ShortText.Color1 = c; displayItem.StateDisabled.ItemTextStandard.ShortText.Color2 = c; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCheckedListBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCheckedListBox.cs index c322dca1ad..18ed803d21 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCheckedListBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCheckedListBox.cs @@ -1997,7 +1997,7 @@ public object? DataSource [DefaultValue("")] public string DisplayMember { - get => _displayMember ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _displayMember ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { if (_displayMember != value) @@ -2016,7 +2016,7 @@ public string DisplayMember [DefaultValue("")] public string ValueMember { - get => _valueMember ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _valueMember ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set => _valueMember = value; } @@ -2515,7 +2515,7 @@ private void UpdateContentFromItemIndex(int index) _contentValues!.ShortText = _listBox.GetItemText(Items[index]); _contentValues.LongText = null; _contentValues.Image = null; - _contentValues.ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _contentValues.ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs index 837fe3a080..7f446b54a0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonColorButton.cs @@ -975,7 +975,7 @@ public Color GetImageTransparentColor(PaletteState state) => /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. @@ -1487,7 +1487,7 @@ private void HookContextMenuEvents(KryptonContextMenuCollection collection, bool public void AddUpdateRecentColors(IList colors) { foreach (Color color in colors - .Where(static color => (color != null) && !color.Equals(GlobalStaticValues.EMPTY_COLOR)) + .Where(static color => (color != null) && !color.Equals(GlobalStaticVariables.EMPTY_COLOR)) .Where(color => !Enumerable.Contains(_recentColors, color))) { // Add to start of the list @@ -1530,7 +1530,7 @@ private void UpdateRecentColors(Color color) } // If this color valid and so possible to become a recent color - if ((color != null) && !color.Equals(GlobalStaticValues.EMPTY_COLOR)) + if ((color != null) && !color.Equals(GlobalStaticVariables.EMPTY_COLOR)) { var found = false; foreach (Color recentColor in _recentColors) @@ -1633,7 +1633,7 @@ private void UpdateContextMenu() } // Should the no color entry be checked? - _itemNoColor.Checked = _selectedColor.Equals(GlobalStaticValues.EMPTY_COLOR); + _itemNoColor.Checked = _selectedColor.Equals(GlobalStaticVariables.EMPTY_COLOR); } private void DecideOnVisible(KryptonContextMenuItemBase visible, KryptonContextMenuItemBase target) @@ -1672,7 +1672,7 @@ private void DecideOnVisible(KryptonContextMenuItemBase visible, KryptonContextM private void OnColumnsSelectedColorChanged(object? sender, ColorEventArgs e) => SelectedColor = e.Color; - private void OnClickNoColor(object? sender, EventArgs e) => SelectedColor = GlobalStaticValues.EMPTY_COLOR; + private void OnClickNoColor(object? sender, EventArgs e) => SelectedColor = GlobalStaticVariables.EMPTY_COLOR; private void OnClickMoreColors(object? sender, EventArgs e) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs index deef05149a..f0b96376fe 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs @@ -245,7 +245,7 @@ public bool MouseOver /// /// The state for which the image is needed. /// Color value. - public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content long text. @@ -265,7 +265,7 @@ public bool MouseOver /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. @@ -3184,7 +3184,7 @@ private void UpdateContentFromItemIndex(int index) _contentValues!.ShortText = _comboBox.GetItemText(Items[index]); _contentValues.LongText = null; _contentValues.Image = null; - _contentValues.ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _contentValues.ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; } // Always ensure there is some text that can be measured, if only a single space. The height of diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCommand.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCommand.cs index 5d9f434aab..d594601f05 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCommand.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCommand.cs @@ -72,7 +72,7 @@ public KryptonCommand() _textLine2 = string.Empty; _imageSmall = null; _imageLarge = null; - _imageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _imageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; _commandType = KryptonCommandType.General; _assignedButtonSpec = null; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs index ec7d0c3d3b..cf714b7521 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonCustomPaletteBase.cs @@ -536,7 +536,7 @@ public override PaletteGraphicsHint GetBackGraphicsHint(PaletteBackStyle style, /// Color value. public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) => // Find the correct destination in the palette and pass on request - GetPaletteBack(style, state)?.GetBackColor1(state) ?? GlobalStaticValues.EMPTY_COLOR; + GetPaletteBack(style, state)?.GetBackColor1(state) ?? GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second back color. @@ -546,7 +546,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) /// Color value. public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) => // Find the correct destination in the palette and pass on request - GetPaletteBack(style, state)?.GetBackColor2(state) ?? GlobalStaticValues.EMPTY_COLOR; + GetPaletteBack(style, state)?.GetBackColor2(state) ?? GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color background drawing style. @@ -2317,7 +2317,7 @@ private void PerformUpgrade(Stream stream) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -3112,10 +3112,10 @@ private void ImportFromXmlDocument([DisallowNull] XmlDocument doc) // Grab the version number of the format being loaded var version = int.Parse(root.GetAttribute(nameof(Version))); - if (version < GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION) + if (version < GlobalStaticConstants.CURRENT_SUPPORTED_PALETTE_VERSION) { throw new ArgumentException( - $"Version '{version}' number is incompatible, only version {GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION} or above can be imported.\nUse the PaletteUpgradeTool from the Application tab of the KryptonExplorer to upgrade."); + $"Version '{version}' number is incompatible, only version {GlobalStaticConstants.CURRENT_SUPPORTED_PALETTE_VERSION} or above can be imported.\nUse the PaletteUpgradeTool from the Application tab of the KryptonExplorer to upgrade."); } // Restore bundled palette name so external themes display correctly (e.g. in KryptonManager) @@ -3148,7 +3148,7 @@ private void ImportFromXmlDocument([DisallowNull] XmlDocument doc) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } finally { @@ -3266,7 +3266,7 @@ private XmlDocument ExportToXmlDocument(bool ignoreDefaults) // Create a root node with version and the date information, by // having a version number the loading of older version is easier var root = doc.CreateElement("KryptonPalette"); - root.SetAttribute(nameof(Version), GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION.ToString()); + root.SetAttribute(nameof(Version), GlobalStaticConstants.CURRENT_SUPPORTED_PALETTE_VERSION.ToString()); root.SetAttribute("Generated", $"{DateTime.Now.ToLongDateString()}, @{DateTime.Now.ToShortTimeString()}"); @@ -3295,7 +3295,7 @@ private XmlDocument ExportToXmlDocument(bool ignoreDefaults) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); return new XmlDocument(); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridView.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridView.cs index b7c7dac19f..ab0d090459 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridView.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridView.cs @@ -60,7 +60,7 @@ private class ToolTipContent : IContentValues /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -86,7 +86,7 @@ private class ToolTipContent : IContentValues /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. @@ -1761,7 +1761,7 @@ protected override void OnCellPainting(DataGridViewCellPaintingEventArgs e) focusCellBounds.X++; } - ControlPaint.DrawFocusRectangle(e.Graphics!, focusCellBounds, GlobalStaticValues.EMPTY_COLOR, paletteContent!.GetContentShortTextColor1(state)); + ControlPaint.DrawFocusRectangle(e.Graphics!, focusCellBounds, GlobalStaticVariables.EMPTY_COLOR, paletteContent!.GetContentShortTextColor1(state)); } } } @@ -2271,12 +2271,12 @@ private void SyncBackColorCellStylesWithPalette() { PaletteState state = Enabled ? PaletteState.Normal : PaletteState.Disabled; - if ((ColumnHeadersDefaultCellStyle.BackColor == GlobalStaticValues.EMPTY_COLOR) || + if ((ColumnHeadersDefaultCellStyle.BackColor == GlobalStaticVariables.EMPTY_COLOR) || (ColumnHeadersDefaultCellStyle.BackColor == _columnBackColor)) { _columnBackColor = StateNormal.HeaderColumn.Back.Color1; - if (_columnBackColor == GlobalStaticValues.EMPTY_COLOR) + if (_columnBackColor == GlobalStaticVariables.EMPTY_COLOR) { _columnBackColor = StateNormal.HeaderColumn.Back.GetBackColor1(state); } @@ -2284,12 +2284,12 @@ private void SyncBackColorCellStylesWithPalette() ColumnHeadersDefaultCellStyle.BackColor = _columnBackColor; } - if ((RowHeadersDefaultCellStyle.BackColor == GlobalStaticValues.EMPTY_COLOR) || + if ((RowHeadersDefaultCellStyle.BackColor == GlobalStaticVariables.EMPTY_COLOR) || (RowHeadersDefaultCellStyle.BackColor == _rowBackColor)) { _rowBackColor = StateNormal.HeaderRow.Back.Color1; - if (_rowBackColor == GlobalStaticValues.EMPTY_COLOR) + if (_rowBackColor == GlobalStaticVariables.EMPTY_COLOR) { _rowBackColor = StateNormal.HeaderRow.Back.GetBackColor1(state); } @@ -2297,12 +2297,12 @@ private void SyncBackColorCellStylesWithPalette() RowHeadersDefaultCellStyle.BackColor = _rowBackColor; } - if ((DefaultCellStyle.BackColor == GlobalStaticValues.EMPTY_COLOR) || + if ((DefaultCellStyle.BackColor == GlobalStaticVariables.EMPTY_COLOR) || (DefaultCellStyle.BackColor == _dataCellBackColor)) { _dataCellBackColor = StateNormal.DataCell.Back.Color1; - if (_dataCellBackColor == GlobalStaticValues.EMPTY_COLOR) + if (_dataCellBackColor == GlobalStaticVariables.EMPTY_COLOR) { _dataCellBackColor = StateNormal.DataCell.Back.GetBackColor1(state); } @@ -2315,12 +2315,12 @@ private void SyncSelBackColorCellStylesWithPalette() { PaletteState state = Enabled ? PaletteState.CheckedNormal : PaletteState.Disabled; - if ((ColumnHeadersDefaultCellStyle.SelectionBackColor == GlobalStaticValues.EMPTY_COLOR) || + if ((ColumnHeadersDefaultCellStyle.SelectionBackColor == GlobalStaticVariables.EMPTY_COLOR) || (ColumnHeadersDefaultCellStyle.SelectionBackColor == _columnSelBackColor)) { _columnSelBackColor = StateSelected.HeaderColumn.Back.Color1; - if (_columnSelBackColor == GlobalStaticValues.EMPTY_COLOR) + if (_columnSelBackColor == GlobalStaticVariables.EMPTY_COLOR) { _columnSelBackColor = StateSelected.HeaderColumn.Back.GetBackColor1(state); } @@ -2328,12 +2328,12 @@ private void SyncSelBackColorCellStylesWithPalette() ColumnHeadersDefaultCellStyle.SelectionBackColor = _columnSelBackColor; } - if ((RowHeadersDefaultCellStyle.SelectionBackColor == GlobalStaticValues.EMPTY_COLOR) || + if ((RowHeadersDefaultCellStyle.SelectionBackColor == GlobalStaticVariables.EMPTY_COLOR) || (RowHeadersDefaultCellStyle.SelectionBackColor == _rowSelBackColor)) { _rowSelBackColor = StateSelected.HeaderRow.Back.Color1; - if (_rowSelBackColor == GlobalStaticValues.EMPTY_COLOR) + if (_rowSelBackColor == GlobalStaticVariables.EMPTY_COLOR) { _rowSelBackColor = StateSelected.HeaderRow.Back.GetBackColor1(state); } @@ -2341,12 +2341,12 @@ private void SyncSelBackColorCellStylesWithPalette() RowHeadersDefaultCellStyle.SelectionBackColor = _rowSelBackColor; } - if ((DefaultCellStyle.SelectionBackColor == GlobalStaticValues.EMPTY_COLOR) || + if ((DefaultCellStyle.SelectionBackColor == GlobalStaticVariables.EMPTY_COLOR) || (DefaultCellStyle.SelectionBackColor == _dataCellSelBackColor)) { _dataCellSelBackColor = StateSelected.DataCell.Back.Color1; - if (_dataCellSelBackColor == GlobalStaticValues.EMPTY_COLOR) + if (_dataCellSelBackColor == GlobalStaticVariables.EMPTY_COLOR) { _dataCellSelBackColor = StateSelected.DataCell.Back.GetBackColor1(state); } @@ -2359,12 +2359,12 @@ private void SyncForeColorCellStylesWithPalette() { PaletteState state = Enabled ? PaletteState.Normal : PaletteState.Disabled; - if ((ColumnHeadersDefaultCellStyle.ForeColor == GlobalStaticValues.EMPTY_COLOR) || + if ((ColumnHeadersDefaultCellStyle.ForeColor == GlobalStaticVariables.EMPTY_COLOR) || (ColumnHeadersDefaultCellStyle.ForeColor == _columnForeColor)) { _columnForeColor = StateNormal.HeaderColumn.Content.Color1; - if (_columnForeColor == GlobalStaticValues.EMPTY_COLOR) + if (_columnForeColor == GlobalStaticVariables.EMPTY_COLOR) { _columnForeColor = StateNormal.HeaderColumn.Content.GetContentShortTextColor1(state); } @@ -2372,12 +2372,12 @@ private void SyncForeColorCellStylesWithPalette() ColumnHeadersDefaultCellStyle.ForeColor = _columnForeColor; } - if ((RowHeadersDefaultCellStyle.ForeColor == GlobalStaticValues.EMPTY_COLOR) || + if ((RowHeadersDefaultCellStyle.ForeColor == GlobalStaticVariables.EMPTY_COLOR) || (RowHeadersDefaultCellStyle.ForeColor == _rowForeColor)) { _rowForeColor = StateNormal.HeaderRow.Content.Color1; - if (_rowForeColor == GlobalStaticValues.EMPTY_COLOR) + if (_rowForeColor == GlobalStaticVariables.EMPTY_COLOR) { _rowForeColor = StateNormal.HeaderRow.Content.GetContentShortTextColor1(state); } @@ -2385,12 +2385,12 @@ private void SyncForeColorCellStylesWithPalette() RowHeadersDefaultCellStyle.ForeColor = _rowForeColor; } - if ((DefaultCellStyle.ForeColor == GlobalStaticValues.EMPTY_COLOR) || + if ((DefaultCellStyle.ForeColor == GlobalStaticVariables.EMPTY_COLOR) || (DefaultCellStyle.ForeColor == _dataCellForeColor)) { _dataCellForeColor = StateNormal.DataCell.Content.Color1; - if (_dataCellForeColor == GlobalStaticValues.EMPTY_COLOR) + if (_dataCellForeColor == GlobalStaticVariables.EMPTY_COLOR) { _dataCellForeColor = StateNormal.DataCell.Content.GetContentShortTextColor1(state); } @@ -2403,12 +2403,12 @@ private void SyncSelForeColorCellStylesWithPalette() { PaletteState state = Enabled ? PaletteState.CheckedNormal : PaletteState.Disabled; - if ((ColumnHeadersDefaultCellStyle.SelectionForeColor == GlobalStaticValues.EMPTY_COLOR) || + if ((ColumnHeadersDefaultCellStyle.SelectionForeColor == GlobalStaticVariables.EMPTY_COLOR) || (ColumnHeadersDefaultCellStyle.SelectionForeColor == _columnSelForeColor)) { _columnSelForeColor = StateSelected.HeaderColumn.Content.Color1; - if (_columnSelForeColor == GlobalStaticValues.EMPTY_COLOR) + if (_columnSelForeColor == GlobalStaticVariables.EMPTY_COLOR) { _columnSelForeColor = StateSelected.HeaderColumn.Content.GetContentShortTextColor1(state); } @@ -2416,12 +2416,12 @@ private void SyncSelForeColorCellStylesWithPalette() ColumnHeadersDefaultCellStyle.SelectionForeColor = _columnSelForeColor; } - if ((RowHeadersDefaultCellStyle.SelectionForeColor == GlobalStaticValues.EMPTY_COLOR) || + if ((RowHeadersDefaultCellStyle.SelectionForeColor == GlobalStaticVariables.EMPTY_COLOR) || (RowHeadersDefaultCellStyle.SelectionForeColor == _rowSelForeColor)) { _rowSelForeColor = StateSelected.HeaderRow.Content.Color1; - if (_rowSelForeColor == GlobalStaticValues.EMPTY_COLOR) + if (_rowSelForeColor == GlobalStaticVariables.EMPTY_COLOR) { _rowSelForeColor = StateSelected.HeaderRow.Content.GetContentShortTextColor1(state); } @@ -2429,12 +2429,12 @@ private void SyncSelForeColorCellStylesWithPalette() RowHeadersDefaultCellStyle.SelectionForeColor = _rowSelForeColor; } - if ((DefaultCellStyle.SelectionForeColor == GlobalStaticValues.EMPTY_COLOR) || + if ((DefaultCellStyle.SelectionForeColor == GlobalStaticVariables.EMPTY_COLOR) || (DefaultCellStyle.SelectionForeColor == _dataCellSelForeColor)) { _dataCellSelForeColor = StateSelected.DataCell.Content.Color1; - if (_dataCellSelForeColor == GlobalStaticValues.EMPTY_COLOR) + if (_dataCellSelForeColor == GlobalStaticVariables.EMPTY_COLOR) { _dataCellSelForeColor = StateSelected.DataCell.Content.GetContentShortTextColor1(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonCell.cs index 511ff542cd..d7d73ed051 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonCell.cs @@ -47,7 +47,7 @@ public class KryptonDataGridViewButtonCell : DataGridViewButtonCell /// New object instance. public override object Clone() { - var dataGridViewCell = base.Clone() as KryptonDataGridViewButtonCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("dataGridViewCell")); + var dataGridViewCell = base.Clone() as KryptonDataGridViewButtonCell ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("dataGridViewCell")); dataGridViewCell._styleSet = _styleSet; dataGridViewCell._shortTextValue = _shortTextValue; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonColumn.cs index aebb838210..0e8d1de686 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewButtonColumn.cs @@ -65,7 +65,7 @@ public override string ToString() public override object Clone() { // Create a new instance - var clone = base.Clone() as KryptonDataGridViewButtonColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("clone")); + var clone = base.Clone() as KryptonDataGridViewButtonColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("clone")); clone.Text = Text; return clone; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxCell.cs index 4c3ef14bc7..978ee9b250 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxCell.cs @@ -92,7 +92,7 @@ public override string ToString() => /// public override object Clone() { - var dataGridViewCell = base.Clone() as KryptonDataGridViewComboBoxCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("dataGridViewCell")); + var dataGridViewCell = base.Clone() as KryptonDataGridViewComboBoxCell ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("dataGridViewCell")); dataGridViewCell.DropDownStyle = DropDownStyle; dataGridViewCell.DropDownHeight = DropDownHeight; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs index 5f511532ed..153c653f9e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewComboBoxColumn.cs @@ -62,7 +62,7 @@ public override string ToString() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewComboBoxColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("clone")); + var cloned = base.Clone() as KryptonDataGridViewComboBoxColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("clone")); cloned.Items.AddRange(Items); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerCell.cs index ca6fda6f02..8e25a1bbb8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerCell.cs @@ -95,7 +95,7 @@ public KryptonDataGridViewDateTimePickerCell() /// public override object Clone() { - var dateTimeCell = base.Clone() as KryptonDataGridViewDateTimePickerCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("dateTimeCell")); + var dateTimeCell = base.Clone() as KryptonDataGridViewDateTimePickerCell ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("dateTimeCell")); dateTimeCell.AutoShift = AutoShift; dateTimeCell.Checked = Checked; @@ -839,7 +839,7 @@ protected override Size GetPreferredSize(Graphics graphics, DataGridViewCellStyl #region Private private KryptonDataGridViewDateTimePickerEditingControl EditingDateTimePicker => - DataGridView!.EditingControl as KryptonDataGridViewDateTimePickerEditingControl ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(DataGridView.EditingControl))); + DataGridView!.EditingControl as KryptonDataGridViewDateTimePickerEditingControl ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(DataGridView.EditingControl))); private void OnCommonChange() { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs index d32b165d00..cf849842a1 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDateTimePickerColumn.cs @@ -61,7 +61,7 @@ public override string ToString() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewDateTimePickerColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewDateTimePickerColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); cloned.CalendarAnnuallyBoldedDates = CalendarAnnuallyBoldedDates; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs index fa7eb71ba5..19cc1e770e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs @@ -242,7 +242,7 @@ protected override Size GetPreferredSize(Graphics graphics, DataGridViewCellStyl #region Private private KryptonDataGridViewDomainUpDownEditingControl EditingDomainUpDown => DataGridView!.EditingControl as KryptonDataGridViewDomainUpDownEditingControl - ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(DataGridView.EditingControl))); + ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(DataGridView.EditingControl))); private void OnCommonChange() { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs index 092008a813..c8ee9f58dc 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs @@ -59,7 +59,7 @@ public override string ToString() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewDomainUpDownColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewDomainUpDownColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); // Convert collection of strings to an array var strings = new string[Items.Count]; @@ -151,7 +151,7 @@ protected override void OnButtonSpecClickCore(DataGridViewButtonSpecClickEventAr /// /// Small utility function that returns the template cell as a KryptonDataGridViewDomainUpDownCell /// - private KryptonDataGridViewDomainUpDownCell DomainUpDownCellTemplate => CellTemplate as KryptonDataGridViewDomainUpDownCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(CellTemplate))); + private KryptonDataGridViewDomainUpDownCell DomainUpDownCellTemplate => CellTemplate as KryptonDataGridViewDomainUpDownCell ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(CellTemplate))); #endregion #region Internal diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewIconColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewIconColumn.cs index 88d9e99ee5..8c0cadc2f4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewIconColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewIconColumn.cs @@ -149,7 +149,7 @@ private void OnButtonSpecsCollectionChanged(object? sender, NotifyCollectionChan /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewIconColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewIconColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); foreach (IconSpec sp in IconSpecs) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewImageColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewImageColumn.cs index a1703cfa2f..e6385e9c5f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewImageColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewImageColumn.cs @@ -71,7 +71,7 @@ private void OnIconSpecsCollectionChanged(object? sender, NotifyCollectionChange /// The cloned object. public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewImageColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewImageColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); foreach (IconSpec sp in IconSpecs) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewLinkColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewLinkColumn.cs index 692ffde0a8..a44a8adff7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewLinkColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewLinkColumn.cs @@ -62,7 +62,7 @@ public override string ToString() public override object Clone() { // Create a new instance - var clone = base.Clone() as KryptonDataGridViewLinkColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("clone")); + var clone = base.Clone() as KryptonDataGridViewLinkColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("clone")); clone.Text = Text; clone.LabelStyle = LabelStyle; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxCell.cs index 7314d5ac9f..c796dfd98e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxCell.cs @@ -60,7 +60,7 @@ public KryptonDataGridViewMaskedTextBoxCell() _paintingMaskedTextBox.SetLayoutDisplayPadding(new Padding(0, 0, 1, -1)); _paintingMaskedTextBox.StateCommon.Border.Width = 0; _paintingMaskedTextBox.StateCommon.Border.Draw = InheritBool.False; - _paintingMaskedTextBox.StateCommon.Back.Color1 = GlobalStaticValues.EMPTY_COLOR; + _paintingMaskedTextBox.StateCommon.Back.Color1 = GlobalStaticVariables.EMPTY_COLOR; } // Set the default values of the properties: diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxColumn.cs index 19fcb9b748..b97d32f0a6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewMaskedTextBoxColumn.cs @@ -51,7 +51,7 @@ public override string ToString() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewMaskedTextBoxColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewMaskedTextBoxColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); cloned.SyncEditorOnButtonSpecClick = SyncEditorOnButtonSpecClick; return cloned; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewNumericUpDownColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewNumericUpDownColumn.cs index 5bb3a2dbaa..b50c6a1f15 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewNumericUpDownColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewNumericUpDownColumn.cs @@ -57,7 +57,7 @@ public override string ToString() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewNumericUpDownColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewNumericUpDownColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); cloned.SyncEditorOnButtonSpecClick = SyncEditorOnButtonSpecClick; return cloned; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressCell.cs index 33cdfd23c9..31a079f070 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressCell.cs @@ -128,7 +128,7 @@ protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle } // Custom text color for the progress cell - if (KryptonOwningColumn.ProgressBar.TextColor != GlobalStaticValues.EMPTY_COLOR) + if (KryptonOwningColumn.ProgressBar.TextColor != GlobalStaticVariables.EMPTY_COLOR) { cellStyle.ForeColor = KryptonOwningColumn.ProgressBar.TextColor; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressColumn.cs index b6feff71f6..acf8bbf24f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewProgressColumn.cs @@ -52,8 +52,8 @@ public class ProgressColors #region Identity public ProgressColors() { - _color1 = GlobalStaticValues.EMPTY_COLOR; - _color2 = GlobalStaticValues.EMPTY_COLOR; + _color1 = GlobalStaticVariables.EMPTY_COLOR; + _color2 = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -82,8 +82,8 @@ public Color Color1 } } - private bool ShouldSerializeColor1() => _color1 != GlobalStaticValues.EMPTY_COLOR; - private void ResetColor1() => _color1 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeColor1() => _color1 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetColor1() => _color1 = GlobalStaticVariables.EMPTY_COLOR; [Description("Color 2. Second color for the gradient.")] @@ -102,8 +102,8 @@ public Color Color2 { } } - private bool ShouldSerializeColor2() => _color2 != GlobalStaticValues.EMPTY_COLOR; - private void ResetColor2() => _color2 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeColor2() => _color2 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetColor2() => _color2 = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Public Overrides @@ -145,8 +145,8 @@ public ProgressBarSettings() _showProgressBar = true; _showProgressBarBorder = true; - _borderColor = GlobalStaticValues.EMPTY_COLOR; - _textColor = GlobalStaticValues.EMPTY_COLOR; + _borderColor = GlobalStaticVariables.EMPTY_COLOR; + _textColor = GlobalStaticVariables.EMPTY_COLOR; _linearGradientMode = LinearGradientMode.Vertical; @@ -241,8 +241,8 @@ public Color BorderColor } } } - private bool ShouldSerializeBorderColor() => _borderColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetBorderColor() => _borderColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBorderColor() => _borderColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBorderColor() => _borderColor = GlobalStaticVariables.EMPTY_COLOR; [Category("Appearance")] @@ -262,8 +262,8 @@ public Color TextColor { } } - private bool ShouldSerializeTextColor() => _textColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetTextColor() => _textColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeTextColor() => _textColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetTextColor() => _textColor = GlobalStaticVariables.EMPTY_COLOR; [Category("Appearance")] @@ -334,7 +334,7 @@ public KryptonDataGridViewProgressColumn() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewProgressColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewProgressColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); cloned._progressBarSettings = _progressBarSettings; cloned._dataGridView = _dataGridView; @@ -496,23 +496,23 @@ private void OnPaletteChanged(object? sender, EventArgs e) private void OnInvalidateColumn() { //check colours - CompletedColor1 = ProgressBar.ProgressCompleted.Color1 == GlobalStaticValues.EMPTY_COLOR + CompletedColor1 = ProgressBar.ProgressCompleted.Color1 == GlobalStaticVariables.EMPTY_COLOR ? Palette.GetBackColor1(PaletteBackStyle.GridHeaderColumnList, PaletteState.Normal) : ProgressBar.ProgressCompleted.Color1; - CompletedColor2 = ProgressBar.ProgressCompleted.Color2 == GlobalStaticValues.EMPTY_COLOR + CompletedColor2 = ProgressBar.ProgressCompleted.Color2 == GlobalStaticVariables.EMPTY_COLOR ? Palette.GetBackColor2(PaletteBackStyle.GridHeaderColumnList, PaletteState.Normal) : ProgressBar.ProgressCompleted.Color2; - RemainingColor1 = ProgressBar.ProgressRemaining.Color1 == GlobalStaticValues.EMPTY_COLOR + RemainingColor1 = ProgressBar.ProgressRemaining.Color1 == GlobalStaticVariables.EMPTY_COLOR ? Palette.GetBackColor2(PaletteBackStyle.GridHeaderColumnList, PaletteState.Normal) : ProgressBar.ProgressRemaining.Color1; - RemainingColor2 = ProgressBar.ProgressRemaining.Color2 == GlobalStaticValues.EMPTY_COLOR + RemainingColor2 = ProgressBar.ProgressRemaining.Color2 == GlobalStaticVariables.EMPTY_COLOR ? Palette.GetBackColor1(PaletteBackStyle.GridHeaderColumnList, PaletteState.BoldedOverride) : ProgressBar.ProgressRemaining.Color2; - BorderColor = ProgressBar.BorderColor == GlobalStaticValues.EMPTY_COLOR + BorderColor = ProgressBar.BorderColor == GlobalStaticVariables.EMPTY_COLOR ? Palette.GetBorderColor1(PaletteBorderStyle.GridHeaderColumnList, PaletteState.Normal) : ProgressBar.BorderColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingCell.cs index a82c11ea56..49303ccc77 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingCell.cs @@ -41,7 +41,7 @@ public override object DefaultNewRowValue /// public override object Clone() { - var clone = base.Clone() as KryptonDataGridViewRatingCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("clone")); + var clone = base.Clone() as KryptonDataGridViewRatingCell ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("clone")); return clone; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingColumn.cs index 635d1050ce..149919581e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewRatingColumn.cs @@ -148,7 +148,7 @@ public Image? ImageDisabled /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewRatingColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("cloned")); + var cloned = base.Clone() as KryptonDataGridViewRatingColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("cloned")); CloneImageDictionary(_images, cloned._images); CloneImageDictionary(_imagesDisabled, cloned._imagesDisabled); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewTextBoxColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewTextBoxColumn.cs index 79d3a6d9a0..c6df252ff9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewTextBoxColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewTextBoxColumn.cs @@ -55,7 +55,7 @@ public override string ToString() /// public override object Clone() { - var cloned = base.Clone() as KryptonDataGridViewTextBoxColumn ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("coned")); + var cloned = base.Clone() as KryptonDataGridViewTextBoxColumn ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("coned")); cloned.Multiline = Multiline; cloned.MultilineStringEditor = MultilineStringEditor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs index 158d4a40cf..33285fff45 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDateTimePicker.cs @@ -1386,7 +1386,7 @@ public void SelectLastFragment() /// /// Tab state. /// Transparent Color. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the short text used as the main ribbon title. @@ -1412,7 +1412,7 @@ public void SelectLastFragment() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDomainUpDown.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDomainUpDown.cs index 7da04d1cb0..56b3ce2a76 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDomainUpDown.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDomainUpDown.cs @@ -499,7 +499,7 @@ public void Dispose() /// /// The state for which the image is needed. /// Color value. - public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content long text. @@ -519,7 +519,7 @@ public void Dispose() /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs index c1b2215318..fe8d3ff962 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonForm.cs @@ -334,7 +334,7 @@ public KryptonForm() #pragma warning disable CS0618 _useDropShadow = false; #pragma warning restore CS0618 - TransparencyKey = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; // Bug #1749 + TransparencyKey = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; // Bug #1749 // #1979 Temporary fix base.PaletteChanged += (s, e) => _internalKryptonPanel.PaletteMode = PaletteMode; @@ -470,13 +470,13 @@ private Color GetGripDotColor() { var palette = GetResolvedPalette() ?? KryptonManager.CurrentGlobalPalette; Color back = palette.GetBackColor1(PaletteBackStyle.FormMain, PaletteState.Normal); - if (back == GlobalStaticValues.EMPTY_COLOR || back.IsEmpty) + if (back == GlobalStaticVariables.EMPTY_COLOR || back.IsEmpty) { back = BackColor; } Color candidate = palette.GetBorderColor1(PaletteBorderStyle.FormMain, PaletteState.Normal); - if (candidate == GlobalStaticValues.EMPTY_COLOR || candidate.IsEmpty) + if (candidate == GlobalStaticVariables.EMPTY_COLOR || candidate.IsEmpty) { candidate = StateActive.Border.Color1; } @@ -488,7 +488,7 @@ private Color GetGripDotColor() // Try a typical text color from the palette which tends to be contrast-safe Color text = palette.GetContentShortTextColor1(PaletteContentStyle.LabelNormalPanel, PaletteState.Normal); - if (!(text == GlobalStaticValues.EMPTY_COLOR || text.IsEmpty) && HasSufficientContrast(text, back)) + if (!(text == GlobalStaticVariables.EMPTY_COLOR || text.IsEmpty) && HasSufficientContrast(text, back)) { return text; } @@ -1492,7 +1492,7 @@ public override RightToLeft RightToLeft /// Transparent Color. public Color GetImageTransparentColor(PaletteState state) => // We never mark any color as transparent - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the short text used as the main caption title. @@ -1530,7 +1530,7 @@ public string GetShortText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. @@ -2706,7 +2706,7 @@ private void PerformViewPaint(Graphics g, Rectangle rect) : StateInactive.Border.Color1); g.FillRectangle(backBrush, rect); // Bug #???? } - else if (TransparencyKey == GlobalStaticValues.TRANSPARENCY_KEY_COLOR) + else if (TransparencyKey == GlobalStaticVariables.TRANSPARENCY_KEY_COLOR) { g.FillRectangle(Brushes.Magenta, rect); // Bug #1749 } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonInformationBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonInformationBox.cs index 02f38f6bec..40c172d643 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonInformationBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonInformationBox.cs @@ -14,6 +14,6 @@ public class KryptonInformationBox { public KryptonInformationBox() { - DebugTools.NotImplemented(GlobalStaticValues.DEFAULT_NOT_IMPLEMENTED_YET_MESSAGE); + DebugTools.NotImplemented(GlobalStaticVariables.DEFAULT_NOT_IMPLEMENTED_YET_MESSAGE); } } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonIntegratedToolBarManager.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonIntegratedToolBarManager.cs index 416fab5ea2..550cb372f4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonIntegratedToolBarManager.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonIntegratedToolBarManager.cs @@ -378,7 +378,7 @@ public void ShowIntegrateToolBar(bool showIntegratedToolBar, KryptonForm parentF } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -404,7 +404,7 @@ public void AttachIntegratedToolBarToParent(KryptonForm? parentForm) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -431,7 +431,7 @@ public void DetachIntegratedToolBarFromParent(KryptonForm? parentForm) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -489,7 +489,7 @@ public void UpdateButtonOrientation(PaletteButtonOrientation buttonOrientation) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -529,7 +529,7 @@ public void UpdateButtonAlignment(PaletteRelativeEdgeAlign buttonAlignment) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonLinkWrapLabel.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonLinkWrapLabel.cs index 009dd24e6b..6b4669a535 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonLinkWrapLabel.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonLinkWrapLabel.cs @@ -464,10 +464,10 @@ public void UpdateFont() font ??= StateCommon.Font ?? _redirector.GetContentShortTextFont(_labelContentStyle, ps); // Recover text color from state common or as last resort the inherited palette - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = StateCommon.TextColor; - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = _redirector.GetContentShortTextColor1(_labelContentStyle, ps); } @@ -565,10 +565,10 @@ protected override void OnPaint(PaintEventArgs e) font ??= StateCommon.Font ?? _redirector.GetContentShortTextFont(_labelContentStyle, ps); // Recover text color from state common or as last resort the inherited palette - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = StateCommon.TextColor; - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = _redirector.GetContentShortTextColor1(_labelContentStyle, ps); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListBox.cs index ac6ffbb8f0..c1d1c6b1c2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListBox.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListBox.cs @@ -1801,7 +1801,7 @@ private void UpdateContentFromItemIndex(int index) _contentValues!.ShortText = _listBox.GetItemText(Items[index]); _contentValues.LongText = null; _contentValues.Image = null; - _contentValues.ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _contentValues.ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListItem.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListItem.cs index ecef01fcd1..6837a9deb3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListItem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonListItem.cs @@ -42,7 +42,7 @@ public class KryptonListItem : Component, /// Initialize a new instance of the KryptonListItem class. /// public KryptonListItem() - : this("ListItem", null, null, GlobalStaticValues.EMPTY_COLOR) + : this("ListItem", null, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -51,7 +51,7 @@ public KryptonListItem() /// /// Initial short text value. public KryptonListItem(string shortText) - : this(shortText, null, null, GlobalStaticValues.EMPTY_COLOR) + : this(shortText, null, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -61,7 +61,7 @@ public KryptonListItem(string shortText) /// Initial short text value. /// Initial long text value. public KryptonListItem(string shortText, string longText) - : this(shortText, longText, null, GlobalStaticValues.EMPTY_COLOR) + : this(shortText, longText, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -74,7 +74,7 @@ public KryptonListItem(string shortText, string longText) public KryptonListItem(string shortText, string longText, Image? image) - : this(shortText, longText, image, GlobalStaticValues.EMPTY_COLOR) + : this(shortText, longText, image, GlobalStaticVariables.EMPTY_COLOR) { } @@ -200,7 +200,7 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => _imageTransparentColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => _imageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -255,7 +255,7 @@ public Color ImageTransparentColor /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonManager.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonManager.cs index 4910396538..ead216ab8b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonManager.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonManager.cs @@ -1560,13 +1560,13 @@ private static void UpdatePaletteImages(PaletteMode paletteMode) { case PaletteMode.Global: case PaletteMode.Custom: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.GenericToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.GenericToolBarImages); break; case PaletteMode.ProfessionalSystem: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.SystemToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.SystemToolBarImages); break; case PaletteMode.ProfessionalOffice2003: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.Office2003ToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.Office2003ToolBarImages); break; case PaletteMode.Office2007Blue: case PaletteMode.Office2007BlueDarkMode: @@ -1578,7 +1578,7 @@ private static void UpdatePaletteImages(PaletteMode paletteMode) case PaletteMode.Office2007Black: case PaletteMode.Office2007BlackDarkMode: case PaletteMode.VisualStudio2010Render2007: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.Office2007ToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.Office2007ToolBarImages); break; case PaletteMode.Office2010Blue: case PaletteMode.Office2010BlueDarkMode: @@ -1599,11 +1599,11 @@ private static void UpdatePaletteImages(PaletteMode paletteMode) case PaletteMode.SparklePurpleDarkMode: case PaletteMode.SparklePurpleLightMode: case PaletteMode.VisualStudio2010Render2010: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.Office2010ToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.Office2010ToolBarImages); break; case PaletteMode.Office2013White: case PaletteMode.VisualStudio2010Render2013: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.Office2013ToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.Office2013ToolBarImages); break; case PaletteMode.Microsoft365Black: case PaletteMode.Microsoft365BlackDarkMode: @@ -1616,14 +1616,14 @@ private static void UpdatePaletteImages(PaletteMode paletteMode) case PaletteMode.Microsoft365SilverLightMode: case PaletteMode.Microsoft365White: case PaletteMode.VisualStudio2010Render365: - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.Microsoft365ToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.Microsoft365ToolBarImages); break; case PaletteMode.MaterialLight: case PaletteMode.MaterialDark: case PaletteMode.MaterialLightRipple: case PaletteMode.MaterialDarkRipple: // TODO create our own Material images - Images.ToolbarImages.SetToolBarImages(GlobalStaticValues.Microsoft365ToolBarImages); + Images.ToolbarImages.SetToolBarImages(GlobalStaticVariables.Microsoft365ToolBarImages); break; default: // Should not happen! diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonNumericUpDown.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonNumericUpDown.cs index bfd9460f36..26faf9a07b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonNumericUpDown.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonNumericUpDown.cs @@ -523,7 +523,7 @@ public void Dispose() /// /// The state for which the image is needed. /// Color value. - public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content long text. @@ -543,7 +543,7 @@ public void Dispose() /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonProgressBar.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonProgressBar.cs index 1f61f889d6..3c9410a807 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonProgressBar.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonProgressBar.cs @@ -1445,7 +1445,7 @@ private void ApplyTaskbarProgress(PI.TBPFLAG flag, bool sendValue) } catch (Exception ex) { - KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonSplitterPanel.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonSplitterPanel.cs index 336004ac11..952d53923b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonSplitterPanel.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonSplitterPanel.cs @@ -82,7 +82,7 @@ public KryptonSplitterPanel([DisallowNull] KryptonSplitContainer container) { Debug.Assert(container is not null); - Owner = container ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(container))); + Owner = container ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(container))); } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToggleSwitch.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToggleSwitch.cs index 036bc3e8c7..7759a10cd6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToggleSwitch.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToggleSwitch.cs @@ -870,7 +870,7 @@ public string GetLongText() /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToolkitPoweredByControl.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToolkitPoweredByControl.cs index 89b66036fb..645c0f6fa6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToolkitPoweredByControl.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonToolkitPoweredByControl.cs @@ -121,26 +121,26 @@ private void klwlblDetails_LinkClicked(object sender, LinkLabelLinkClickedEventA } catch (Exception exception) { - KryptonExceptionHandler.CaptureException(exception, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(exception, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } private void GetVersions() { string dockingLocation = - $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticValues.DEFAULT_DOCKING_FILE}"; + $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticVariables.DEFAULT_DOCKING_FILE}"; string navigatorLocation = - $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticValues.DEFAULT_NAVIGATOR_FILE}"; + $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticVariables.DEFAULT_NAVIGATOR_FILE}"; string ribbonLocation = - $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticValues.DEFAULT_RIBBON_FILE}"; + $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticVariables.DEFAULT_RIBBON_FILE}"; string toolkitLocation = - $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticValues.DEFAULT_TOOLKIT_FILE}"; + $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticVariables.DEFAULT_TOOLKIT_FILE}"; string workspaceLocation = - $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticValues.DEFAULT_WORKSPACE_FILE}"; + $@"{Path.GetDirectoryName(Application.ExecutablePath)}\{GlobalStaticVariables.DEFAULT_WORKSPACE_FILE}"; FileVersionInfo dockingFileVersionInfo = FileVersionInfo.GetVersionInfo(dockingLocation); @@ -158,7 +158,7 @@ private void GetVersions() } else { - kwlblDockingVersion.Text = $@"Cannot find file: '{GlobalStaticValues.DEFAULT_DOCKING_FILE}'"; + kwlblDockingVersion.Text = $@"Cannot find file: '{GlobalStaticVariables.DEFAULT_DOCKING_FILE}'"; } if (File.Exists(navigatorLocation)) @@ -167,7 +167,7 @@ private void GetVersions() } else { - kwlblNavigatorVersion.Text = $@"Cannot find file: '{GlobalStaticValues.DEFAULT_WORKSPACE_FILE}'"; + kwlblNavigatorVersion.Text = $@"Cannot find file: '{GlobalStaticVariables.DEFAULT_WORKSPACE_FILE}'"; } if (File.Exists(ribbonLocation)) @@ -176,7 +176,7 @@ private void GetVersions() } else { - kwlblRibbonVersion.Text = $@"Cannot find file: '{GlobalStaticValues.DEFAULT_RIBBON_FILE}'"; + kwlblRibbonVersion.Text = $@"Cannot find file: '{GlobalStaticVariables.DEFAULT_RIBBON_FILE}'"; } if (File.Exists(toolkitLocation)) @@ -185,7 +185,7 @@ private void GetVersions() } else { - kwlblToolkitVersion.Text = $@"Cannot find file: '{GlobalStaticValues.DEFAULT_TOOLKIT_FILE}'"; + kwlblToolkitVersion.Text = $@"Cannot find file: '{GlobalStaticVariables.DEFAULT_TOOLKIT_FILE}'"; } if (File.Exists(workspaceLocation)) @@ -194,7 +194,7 @@ private void GetVersions() } else { - kwlblWorkspaceVersion.Text = $@"Cannot find file: '{GlobalStaticValues.DEFAULT_WORKSPACE_FILE}'"; + kwlblWorkspaceVersion.Text = $@"Cannot find file: '{GlobalStaticVariables.DEFAULT_WORKSPACE_FILE}'"; } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeNode.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeNode.cs index 232121ddcc..a308b9dbff 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeNode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeNode.cs @@ -92,7 +92,7 @@ public KryptonTreeNode(string text, int imageIndex, int selectedImageIndex, Tree private void Init() { _longText = string.Empty; - _longForeColor = GlobalStaticValues.EMPTY_COLOR; + _longForeColor = GlobalStaticVariables.EMPTY_COLOR; _longNodeFont = null; _isCheckBoxVisible = true; } @@ -143,7 +143,7 @@ public Color LongForeColor } } - private bool ShouldSerializeLongForeColor() => _longForeColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeLongForeColor() => _longForeColor != GlobalStaticVariables.EMPTY_COLOR; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeView.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeView.cs index 1b5d01b8e7..8e45d506f9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeView.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonTreeView.cs @@ -2036,7 +2036,7 @@ private void UpdateContentFromNode(TreeNode? node) _contentValues.ShortText = node.Text; _contentValues.LongText = string.Empty; _contentValues.Image = null; - _contentValues.ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _contentValues.ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; if (node is KryptonTreeNode kryptonNode) { @@ -2050,7 +2050,7 @@ private void UpdateContentFromNode(TreeNode? node) _contentValues.ShortText = @"A"; _contentValues.LongText = string.Empty; _contentValues.Image = null; - _contentValues.ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + _contentValues.ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; } } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonWrapLabel.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonWrapLabel.cs index 7508a28e88..c0812350c9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonWrapLabel.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonWrapLabel.cs @@ -470,10 +470,10 @@ public void UpdateFont() font ??= StateCommon.Font ?? _redirector.GetContentShortTextFont(_labelContentStyle, ps); // Recover text color from state common or as last resort the inherited palette - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = StateCommon.TextColor; - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = _redirector.GetContentShortTextColor1(_labelContentStyle, ps); } @@ -571,10 +571,10 @@ protected override void OnPaint(PaintEventArgs e) font ??= StateCommon.Font ?? _redirector.GetContentShortTextFont(_labelContentStyle, ps); // Recover text color from state common or as last resort the inherited palette - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = StateCommon.TextColor; - if (textColor == GlobalStaticValues.EMPTY_COLOR) + if (textColor == GlobalStaticVariables.EMPTY_COLOR) { textColor = _redirector.GetContentShortTextColor1(_labelContentStyle, ps); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualInputBoxRtlAwareForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualInputBoxRtlAwareForm.cs index c3a0d6e4a7..315f2e3c56 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualInputBoxRtlAwareForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualInputBoxRtlAwareForm.cs @@ -72,7 +72,7 @@ private void UpdateCue() { ktxtUserResponse.CueHint.CueHintText = _inputBoxData.CueText; - if (_inputBoxData.CueColor != null || _inputBoxData.CueColor != Color.Transparent || _inputBoxData.CueColor != GlobalStaticValues.EMPTY_COLOR) + if (_inputBoxData.CueColor != null || _inputBoxData.CueColor != Color.Transparent || _inputBoxData.CueColor != GlobalStaticVariables.EMPTY_COLOR) { ktxtUserResponse.CueHint.Color1 = _inputBoxData.CueColor ?? Color.Gray; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualMessageBoxRtlAwareForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualMessageBoxRtlAwareForm.cs index 496e4eddd3..bb99611138 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualMessageBoxRtlAwareForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualMessageBoxRtlAwareForm.cs @@ -81,7 +81,7 @@ public VisualMessageBoxRtlAwareForm(IWin32Window? showOwner, string? text, strin // #1692 text font colour for input controls does not work correct on KMBees when using dark themes. // Set the text colour to the one a control uses. - krtbMessageText.StateCommon.Content.Color1 = GlobalStaticValues.KryptonMessageBoxRichTextBoxTextColor; + krtbMessageText.StateCommon.Content.Color1 = GlobalStaticVariables.KryptonMessageBoxRichTextBoxTextColor; // Update contents to match requirements UpdateText(); @@ -601,14 +601,14 @@ private Size UpdateButtonsSizing() // Button1 is always visible Size button1Size = _button1.GetPreferredSize(Size.Empty); - var maxButtonSize = button1Size with { Width = button1Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING }; + var maxButtonSize = button1Size with { Width = button1Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING }; // If Button2 is visible if (_button2.Enabled) { numButtons++; Size button2Size = _button2.GetPreferredSize(Size.Empty); - maxButtonSize.Width = Math.Max(maxButtonSize.Width, button2Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING); + maxButtonSize.Width = Math.Max(maxButtonSize.Width, button2Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING); maxButtonSize.Height = Math.Max(maxButtonSize.Height, button2Size.Height); } @@ -617,7 +617,7 @@ private Size UpdateButtonsSizing() { numButtons++; Size button3Size = _button3.GetPreferredSize(Size.Empty); - maxButtonSize.Width = Math.Max(maxButtonSize.Width, button3Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING); + maxButtonSize.Width = Math.Max(maxButtonSize.Width, button3Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING); maxButtonSize.Height = Math.Max(maxButtonSize.Height, button3Size.Height); } // If Button4 is visible @@ -625,48 +625,48 @@ private Size UpdateButtonsSizing() { numButtons++; Size button4Size = _button4.GetPreferredSize(Size.Empty); - maxButtonSize.Width = Math.Max(maxButtonSize.Width, button4Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING); + maxButtonSize.Width = Math.Max(maxButtonSize.Width, button4Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING); maxButtonSize.Height = Math.Max(maxButtonSize.Height, button4Size.Height); } // Start positioning buttons 10 pixels from right edge - var right = _panelButtons.Right - GlobalStaticValues.GLOBAL_BUTTON_PADDING; + var right = _panelButtons.Right - GlobalStaticConstants.GLOBAL_BUTTON_PADDING; //var left = _panelButtons.Left - GlobalStaticValues.GLOBAL_BUTTON_PADDING; // If Button4 is visible if (_button4.Enabled) { - _button4.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button4.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button4.Size = maxButtonSize; - right -= maxButtonSize.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING; + right -= maxButtonSize.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING; } // If Button3 is visible if (_button3.Enabled) { - _button3.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button3.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button3.Size = maxButtonSize; - right -= maxButtonSize.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING; + right -= maxButtonSize.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING; } // If Button2 is visible if (_button2.Enabled) { - _button2.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button2.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button2.Size = maxButtonSize; - right -= maxButtonSize.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING; + right -= maxButtonSize.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING; } // Button1 is always visible - _button1.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button1.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button1.Size = maxButtonSize; // Size the panel for the buttons - _panelButtons.Size = new Size((maxButtonSize.Width * numButtons) + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * 2)); + _panelButtons.Size = new Size((maxButtonSize.Width * numButtons) + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * 2)); // Button area is the number of buttons with gaps between them and 10 pixels around all edges - return new Size((maxButtonSize.Width * numButtons) + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * 2)); + return new Size((maxButtonSize.Width * numButtons) + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * 2)); } private void ShowCloseButton(bool? showCloseButton) => CloseBox = showCloseButton ?? true; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualThemeBrowserFormRtlAware.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualThemeBrowserFormRtlAware.cs index 2a2ec68b3f..e5f93f48dc 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualThemeBrowserFormRtlAware.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/RTL Aware/VisualThemeBrowserFormRtlAware.cs @@ -46,7 +46,7 @@ private void AdjustUI() if (klbThemeList.Items.Count > 0) { - klbThemeList.SelectedIndex = _themeBrowserData.StartIndex ?? GlobalStaticValues.GLOBAL_DEFAULT_THEME_INDEX; + klbThemeList.SelectedIndex = _themeBrowserData.StartIndex ?? GlobalStaticConstants.GLOBAL_DEFAULT_THEME_INDEX; } klblHeader.Text = KryptonManager.Strings.MiscellaneousThemeStrings.ThemeBrowserDescription; diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs index 10c49587e4..f0a30c6e74 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualForm.cs @@ -1995,7 +1995,7 @@ private void OnJumpListChanged() { // Silently fail if jump list API is not available // This can happen on older Windows versions or if COM registration fails - KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -2057,7 +2057,7 @@ private void OnJumpListChanged() } catch (Exception ex) { - KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); return null; } } @@ -2176,7 +2176,7 @@ private void UpdateTaskbarOverlayIcon() { // Silently fail if taskbar API is not available // This can happen on older Windows versions or if COM registration fails - KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -2259,7 +2259,7 @@ private void UpdateTaskbarThumbnailButtons() } catch (Exception ex) { - KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualInputBoxForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualInputBoxForm.cs index 94a7ee5129..97b4e94f5d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualInputBoxForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualInputBoxForm.cs @@ -83,7 +83,7 @@ private void UpdateCue() { _textBoxResponse.CueHint.CueHintText = _inputBoxData.CueText; - if (_inputBoxData.CueColor != null || _inputBoxData.CueColor != Color.Transparent || _inputBoxData.CueColor != GlobalStaticValues.EMPTY_COLOR) + if (_inputBoxData.CueColor != null || _inputBoxData.CueColor != Color.Transparent || _inputBoxData.CueColor != GlobalStaticVariables.EMPTY_COLOR) { _textBoxResponse.CueHint.Color1 = _inputBoxData.CueColor ?? Color.Gray; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualMessageBoxForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualMessageBoxForm.cs index fd149eb3e7..83adb5962a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualMessageBoxForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualMessageBoxForm.cs @@ -88,7 +88,7 @@ internal VisualMessageBoxForm(IWin32Window? showOwner, string? text, string? cap // #1692 text font colour for input controls does not work correct on KMBees when using dark themes. // Set the text colour to the one a control uses. - krtbMessageText.StateCommon.Content.Color1 = GlobalStaticValues.KryptonMessageBoxRichTextBoxTextColor; + krtbMessageText.StateCommon.Content.Color1 = GlobalStaticVariables.KryptonMessageBoxRichTextBoxTextColor; // Update contents to match requirements UpdateText(); @@ -612,14 +612,14 @@ private Size UpdateButtonsSizing() // Button1 is always visible Size button1Size = _button1.GetPreferredSize(Size.Empty); - var maxButtonSize = button1Size with { Width = button1Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING }; + var maxButtonSize = button1Size with { Width = button1Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING }; // If Button2 is visible if (_button2.Enabled) { numButtons++; Size button2Size = _button2.GetPreferredSize(Size.Empty); - maxButtonSize.Width = Math.Max(maxButtonSize.Width, button2Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING); + maxButtonSize.Width = Math.Max(maxButtonSize.Width, button2Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING); maxButtonSize.Height = Math.Max(maxButtonSize.Height, button2Size.Height); } @@ -628,7 +628,7 @@ private Size UpdateButtonsSizing() { numButtons++; Size button3Size = _button3.GetPreferredSize(Size.Empty); - maxButtonSize.Width = Math.Max(maxButtonSize.Width, button3Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING); + maxButtonSize.Width = Math.Max(maxButtonSize.Width, button3Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING); maxButtonSize.Height = Math.Max(maxButtonSize.Height, button3Size.Height); } // If Button4 is visible @@ -636,48 +636,48 @@ private Size UpdateButtonsSizing() { numButtons++; Size button4Size = _button4.GetPreferredSize(Size.Empty); - maxButtonSize.Width = Math.Max(maxButtonSize.Width, button4Size.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING); + maxButtonSize.Width = Math.Max(maxButtonSize.Width, button4Size.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING); maxButtonSize.Height = Math.Max(maxButtonSize.Height, button4Size.Height); } // Start positioning buttons 10 pixels from right edge - var right = _panelButtons.Right - GlobalStaticValues.GLOBAL_BUTTON_PADDING; + var right = _panelButtons.Right - GlobalStaticConstants.GLOBAL_BUTTON_PADDING; //var left = _panelButtons.Left - GlobalStaticValues.GLOBAL_BUTTON_PADDING; // If Button4 is visible if (_button4.Enabled) { - _button4.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button4.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button4.Size = maxButtonSize; - right -= maxButtonSize.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING; + right -= maxButtonSize.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING; } // If Button3 is visible if (_button3.Enabled) { - _button3.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button3.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button3.Size = maxButtonSize; - right -= maxButtonSize.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING; + right -= maxButtonSize.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING; } // If Button2 is visible if (_button2.Enabled) { - _button2.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button2.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button2.Size = maxButtonSize; - right -= maxButtonSize.Width + GlobalStaticValues.GLOBAL_BUTTON_PADDING; + right -= maxButtonSize.Width + GlobalStaticConstants.GLOBAL_BUTTON_PADDING; } // Button1 is always visible - _button1.Location = new Point(right - maxButtonSize.Width, GlobalStaticValues.GLOBAL_BUTTON_PADDING); + _button1.Location = new Point(right - maxButtonSize.Width, GlobalStaticConstants.GLOBAL_BUTTON_PADDING); _button1.Size = maxButtonSize; // Size the panel for the buttons - _panelButtons.Size = new Size((maxButtonSize.Width * numButtons) + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * 2)); + _panelButtons.Size = new Size((maxButtonSize.Width * numButtons) + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * 2)); // Button area is the number of buttons with gaps between them and 10 pixels around all edges - return new Size((maxButtonSize.Width * numButtons) + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticValues.GLOBAL_BUTTON_PADDING * 2)); + return new Size((maxButtonSize.Width * numButtons) + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * (numButtons + 1)), maxButtonSize.Height + (GlobalStaticConstants.GLOBAL_BUTTON_PADDING * 2)); } private void OnFormClosed(object sender, FormClosedEventArgs e) diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopupTooltip.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopupTooltip.cs index 93e90c79bd..f58a31c4f7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopupTooltip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualPopupTooltip.cs @@ -66,7 +66,7 @@ public VisualPopupToolTip([DisallowNull] PaletteRedirect redirector, Debug.Assert(contentValues is not null); // Remember references needed later - _contentValues = contentValues ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(contentValues))); + _contentValues = contentValues ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(contentValues))); // Create the triple redirector needed by view elements _palette = new PaletteTripleMetricRedirect(redirector, backStyle, borderStyle, contentStyle, NeedPaintDelegate); diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualSplashScreenForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualSplashScreenForm.cs index cc0f9671ce..a91f4225b1 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualSplashScreenForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualSplashScreenForm.cs @@ -143,7 +143,7 @@ private void tmrCountdown_Tick(object sender, EventArgs e) { kpbProgress.Increment(1); - kpbProgress.Text = _splashScreenData.ShowProgressBarPercentage ? $@"{kpbProgress.Value}%" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + kpbProgress.Text = _splashScreenData.ShowProgressBarPercentage ? $@"{kpbProgress.Value}%" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; if (kpbProgress.Value == kpbProgress.Maximum) { @@ -166,7 +166,7 @@ private void kbtnClose_MouseHover(object sender, EventArgs e) private void kbtnClose_MouseLeave(object sender, EventArgs e) { - kbtnClose.StateCommon.Content.ShortText.Color1 = GlobalStaticValues.EMPTY_COLOR; + kbtnClose.StateCommon.Content.ShortText.Color1 = GlobalStaticVariables.EMPTY_COLOR; } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualToolkitBinaryInformationForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualToolkitBinaryInformationForm.cs index 4fad9de10f..7e4b958f11 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualToolkitBinaryInformationForm.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/VisualToolkitBinaryInformationForm.cs @@ -19,7 +19,7 @@ internal partial class VisualToolkitBinaryInformationForm : KryptonForm private Dictionary _fileVersionInfos = new Dictionary(); - private static readonly FileVersionInfo[] _fileVersionInfoCache = new FileVersionInfo[GlobalStaticValues.TOOLKIT_DLL_NAMES.Length]; + private static readonly FileVersionInfo[] _fileVersionInfoCache = new FileVersionInfo[GlobalStaticVariables.TOOLKIT_DLL_NAMES.Length]; private readonly ToolkitSupportType _toolkitType; @@ -111,9 +111,9 @@ private void UpdateLabelInformation() private void DisplayFileInformation() { - for (int i = 0; i < GlobalStaticValues.TOOLKIT_DLL_NAMES.Length; i++) + for (int i = 0; i < GlobalStaticVariables.TOOLKIT_DLL_NAMES.Length; i++) { - string path = Path.Combine(_applicationBaseInstallPath, GlobalStaticValues.TOOLKIT_DLL_NAMES[i]); + string path = Path.Combine(_applicationBaseInstallPath, GlobalStaticVariables.TOOLKIT_DLL_NAMES[i]); _fileVersionInfoCache[i] = (GetFileVersionInfo(path) ?? null)!; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCustomPaletteBaseActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCustomPaletteBaseActionList.cs index 4b38db631e..26d45e1a92 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCustomPaletteBaseActionList.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCustomPaletteBaseActionList.cs @@ -135,7 +135,7 @@ private void OnUpgradePalette(object? sender, EventArgs e) } catch (Exception exc) { - KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonCustomPaletteBaseDesigner.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonCustomPaletteBaseDesigner.cs index f8edc2cd48..645166af4f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonCustomPaletteBaseDesigner.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Designers/KryptonCustomPaletteBaseDesigner.cs @@ -113,7 +113,7 @@ private void OnUpgrade(object? sender, EventArgs e) } catch (Exception exc) { - KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs index 941634db56..d2b6eb6016 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Editors/PaletteDrawBordersEditor.cs @@ -38,7 +38,7 @@ public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? conte // base.EditValue needs a valid reference to provider. if (provider is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(provider))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(provider))); } if ((context is not null) && (value is not null)) diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Other/KryptonSplitContainerGlyph.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Other/KryptonSplitContainerGlyph.cs index ee73b28902..951e8f527b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Designers/Other/KryptonSplitContainerGlyph.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Other/KryptonSplitContainerGlyph.cs @@ -41,14 +41,14 @@ public KryptonSplitContainerGlyph([DisallowNull] ISelectionService? selectionSer Debug.Assert(relatedDesigner is not null); // Remember incoming references - _selectionService = selectionService ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(selectionService))); - _behaviorService = behaviorService ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(behaviorService))); - _adorner = adorner ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(adorner))); + _selectionService = selectionService ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(selectionService))); + _behaviorService = behaviorService ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(behaviorService))); + _adorner = adorner ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(adorner))); // Find the related control if ( relatedDesigner is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(relatedDesigner))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(relatedDesigner))); } _splitContainer = relatedDesigner.Component as KryptonSplitContainer; diff --git a/Source/Krypton Components/Krypton.Toolkit/EventArgs/ButtonSpecEventArgs.cs b/Source/Krypton Components/Krypton.Toolkit/EventArgs/ButtonSpecEventArgs.cs index 30874946ce..f9902b5e0b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/EventArgs/ButtonSpecEventArgs.cs +++ b/Source/Krypton Components/Krypton.Toolkit/EventArgs/ButtonSpecEventArgs.cs @@ -29,7 +29,7 @@ public ButtonSpecEventArgs([DisallowNull] ButtonSpec spec, int index) Debug.Assert(index >= 0); // Remember parameter details - ButtonSpec = spec ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(spec))); + ButtonSpec = spec ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(spec))); Index = index; } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/General/CommonHelper.cs b/Source/Krypton Components/Krypton.Toolkit/General/CommonHelper.cs index 802e0b49e4..c76504369a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/CommonHelper.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/CommonHelper.cs @@ -1087,7 +1087,7 @@ public static Color BlackenColor(Color color1, public static Color MergeColors(Color color1, float percent1, Color color2, float percent2) => // Use existing three color merge - MergeColors(color1, percent1, color2, percent2, GlobalStaticValues.EMPTY_COLOR, 0f); + MergeColors(color1, percent1, color2, percent2, GlobalStaticVariables.EMPTY_COLOR, 0f); /// /// Merge three colors together using relative percentages. diff --git a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticConstants.cs b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticConstants.cs new file mode 100644 index 0000000000..3fa596a2b9 --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticConstants.cs @@ -0,0 +1,68 @@ +#region BSD License +/* + * + * 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, tobitege, KamaniAR, Lesandro Gotardo (aka lesandrog), Jorge A. Avilés (aka mcpbcs) et al. 2026 - 2026. All rights reserved. + * + */ +#endregion + +namespace Krypton.Toolkit; + +public class GlobalStaticConstants +{ + /// The default date and time value + public static DateTime DEFAULT_DATE_TIME_VALUE = DateTime.Now; + + /// The default UAC shield icon custom size + public static Size DEFAULT_UAC_SHIELD_ICON_CUSTOM_SIZE = new Size(16, 16); + + internal const bool DEFAULT_USE_STACK_TRACE = true; + internal const bool DEFAULT_USE_EXCEPTION_MESSAGE = true; + internal const bool DEFAULT_USE_INNER_EXCEPTION = true; + internal const int DEFAULT_TOGGLE_SWITCH_ANIMATION_SPEED = 10; + + /// Used for 'Material' themes + public const float DEFAULT_MATERIAL_THEME_CORNER_ROUNDING_VALUE = -1f; + + /// Used for the default control corners + public const float DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE = -1f; + + /// The standard UAC shield icon ID in imageres.dll + public const int UAC_SHIELD_ICON_ID = (int)ImageresIconID.Shield; + + /// The alternative UAC shield icon ID in imageres.dll + public const int UAC_SHIELD_ICON_ID_ALT = (int)ImageresIconID.ShieldAlt; + + /// The global button padding + public const int GLOBAL_BUTTON_PADDING = 10; + + /// The default countdown interval + internal const int DEFAULT_COUNTDOWN_INTERVAL = 1000; + + /// The default countdown value + internal const int DEFAULT_COUNTDOWN_VALUE = 60; + + internal const int DEFAULT_PADDING = 10; + + /// The global default theme index + public const int GLOBAL_DEFAULT_THEME_INDEX = (int)PaletteMode.Microsoft365Blue; + + /// The global default theme + public const PaletteMode GLOBAL_DEFAULT_PALETTE_MODE = PaletteMode.Microsoft365Blue; + + /// The current supported palette version + public const int CURRENT_SUPPORTED_PALETTE_VERSION = 21; + + /// The default rafting ribbon tab background gradient + public const float DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT = 90F; + + /// Windows convention for positioning windows off-screen (e.g. to hide them). Used when placing windows so they are not visible. + public const int OFF_SCREEN_POSITION = -32000; + + /// The latest emoji list URL + public const string DEFAULT_LATEST_EMOJI_LIST_URL = @"https://unicode.org/Public/emoji/latest/emoji-test.txt"; + + /// The public emoji list URL + public const string DEFAULT_PUBLIC_EMOJI_LIST_URL = @"https://unicode.org/Public/draft/emoji/emoji-test.txt"; +} \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticFunctions.cs b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticFunctions.cs new file mode 100644 index 0000000000..acc2d1f95e --- /dev/null +++ b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticFunctions.cs @@ -0,0 +1,36 @@ +#region BSD License +/* + * + * 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, tobitege, KamaniAR, Lesandro Gotardo (aka lesandrog), Jorge A. Avilés (aka mcpbcs) et al. 2026 - 2026. All rights reserved. + * + */ +#endregion + +namespace Krypton.Toolkit; + +public class GlobalStaticFunctions +{ + #region Methods + /// + /// Helper method that returns a generic message when a variable is null. + /// + /// Name of the variable to be inserted into the text. + /// The message. + public static string VariableCannotBeNull(string variableName) => $"Variable {variableName} cannot be null."; + + /// + /// Helper method that returns a generic message when a property is null. + /// + /// Name of the property to be inserted into the text. + /// The message. + public static string PropertyCannotBeNull(string propertyName) => $"Property {propertyName} cannot be null."; + + /// + /// Helper method that returns a generic message when a parameter is null. + /// + /// Name of the parameter to be inserted into the text. + /// The message. + public static string ParameterCannotBeNull(string parameterName) => $"Parameter {parameterName} cannot be null."; + #endregion +} \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticVariables.cs similarity index 81% rename from Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs rename to Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticVariables.cs index d0973d3fc5..ce5fddb5c8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/GlobalStaticVariables.cs @@ -1,11 +1,8 @@ #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, tobitege, KamaniAR, Lesandro Gotardo (aka lesandrog), Jorge A. Avilés (aka mcpbcs) et al. 2017 - 2026. All rights reserved. + * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac, Ahmed Abdelhameed, tobitege, KamaniAR, Lesandro Gotardo (aka lesandrog), Jorge A. Avilés (aka mcpbcs) et al. 2026 - 2026. All rights reserved. * */ #endregion @@ -14,57 +11,11 @@ namespace Krypton.Toolkit; /// Provides a collection of static values, used within the toolkit. -public class GlobalStaticValues +public class GlobalStaticVariables { - internal const bool DEFAULT_USE_STACK_TRACE = true; - - internal const bool DEFAULT_USE_EXCEPTION_MESSAGE = true; - - internal const bool DEFAULT_USE_INNER_EXCEPTION = true; - - internal const int DEFAULT_TOGGLE_SWITCH_ANIMATION_SPEED = 10; - - /// The default date and time value - public static DateTime DEFAULT_DATE_TIME_VALUE = DateTime.Now; - - /// Used for 'Material' themes - public const float DEFAULT_MATERIAL_THEME_CORNER_ROUNDING_VALUE = -1f; - - /// Used for the default control corners - public const float DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE = -1f; - /// The default UAC shield icon size public static IconSize DEFAULT_UAC_SHIELD_ICON_SIZE = IconSize.ExtraSmall; - /// The default UAC shield icon custom size - public static Size DEFAULT_UAC_SHIELD_ICON_CUSTOM_SIZE = new Size(16, 16); - - /// The standard UAC shield icon ID in imageres.dll - public const int UAC_SHIELD_ICON_ID = (int)ImageresIconID.Shield; - - /// The alternative UAC shield icon ID in imageres.dll - public const int UAC_SHIELD_ICON_ID_ALT = (int)ImageresIconID.ShieldAlt; - - /// The global button padding - public const int GLOBAL_BUTTON_PADDING = 10; - - /// The default countdown interval - internal const int DEFAULT_COUNTDOWN_INTERVAL = 1000; - - /// The default countdown value - internal const int DEFAULT_COUNTDOWN_VALUE = 60; - - internal const int DEFAULT_PADDING = 10; - - /// The global default theme index - public const int GLOBAL_DEFAULT_THEME_INDEX = (int)PaletteMode.Microsoft365Blue; - - /// The global default theme - public const PaletteMode GLOBAL_DEFAULT_PALETTE_MODE = PaletteMode.Microsoft365Blue; - - /// The current supported palette version - public const int CURRENT_SUPPORTED_PALETTE_VERSION = 21; - /// The default highlight debugging color public static Color DEFAULT_HIGHLIGHT_DEBUGGING_COLOR = Color.Red; @@ -83,18 +34,12 @@ public class GlobalStaticValues /// The OS major version public static readonly int OS_MAJOR_VERSION = Environment.OSVersion.Version.Major; - /// The default rafting ribbon tab background gradient - public const float DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT = 90F; - /// The empty color public static readonly Color EMPTY_COLOR = Color.Empty; /// The transparency key color public static readonly Color TRANSPARENCY_KEY_COLOR = Color.Magenta; - /// Windows convention for positioning windows off-screen (e.g. to hide them). Used when placing windows so they are not visible. - public const int OFF_SCREEN_POSITION = -32000; - /// The tab row gradient first color public static readonly Color TAB_ROW_GRADIENT_FIRST_COLOR = Color.Transparent; @@ -107,12 +52,6 @@ public class GlobalStaticValues /// The default ribbon application button text color public static readonly Color DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR = Color.White; - /// The latest emoji list URL - public const string DEFAULT_LATEST_EMOJI_LIST_URL = @"https://unicode.org/Public/emoji/latest/emoji-test.txt"; - - /// The public emoji list URL - public const string DEFAULT_PUBLIC_EMOJI_LIST_URL = @"https://unicode.org/Public/draft/emoji/emoji-test.txt"; - #region Arrays #region Images @@ -397,16 +336,22 @@ public class GlobalStaticValues // For when we need some text to test with public static readonly string DEFAULT_SHORT_SEED_TEXT = $"Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE)\r\n\u00a9 Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.\r\n\r\nNew BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)\r\nModifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac, Ahmed Abdelhameed, tobitege, KamaniAR, Lesandro Gotardo (aka lesandrog), Jorge A. Avilés (aka mcpbcs) et al. 2017 - {DateTime.Now.Year}. All rights reserved."; + /// + /// The default long seed text + /// public static readonly string DEFAULT_LONG_SEED_TEXT = $"BSD 3-Clause License\r\n\r\nCopyright (c) 2017 - {DateTime.Now.Year}, Krypton Suite\r\n\r\nAll rights reserved.\r\n\r\nRedistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions are met:\r\n\r\n1. Redistributions of source code must retain the above copyright notice, this\r\n list of conditions and the following disclaimer.\r\n\r\n2. Redistributions in binary form must reproduce the above copyright notice,\r\n this list of conditions and the following disclaimer in the documentation\r\n and/or other materials provided with the distribution.\r\n\r\n3. Neither the name of the copyright holder nor the names of its\r\n contributors may be used to endorse or promote products derived from\r\n this software without specific prior written permission.\r\n\r\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\r\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\r\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\r\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\r\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\r\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; - public static readonly string[] TOOLKIT_DLL_NAMES = new string[] - { + /// + /// The toolkit DLL names, used for version reporting and other internal uses. The order of the names in this array should be the same as the order of the versions in the GlobalStaticFunctions.GetToolkitVersion method. + /// + public static readonly string[] TOOLKIT_DLL_NAMES = + [ "Krypton.Docking.dll", "Krypton.Navigator.dll", "Krypton.Ribbon.dll", "Krypton.Toolkit.dll", "Krypton.Workspace.dll" - }; + ]; #region Properties /// @@ -420,26 +365,4 @@ public static Color KryptonMessageBoxRichTextBoxTextColor } #endregion - #region Methods - /// - /// Helper method that returns a generic message when a variable is null. - /// - /// Name of the variable to be inserted into the text. - /// The message. - public static string VariableCannotBeNull(string variableName) => $"Variable {variableName} cannot be null."; - - /// - /// Helper method that returns a generic message when a property is null. - /// - /// Name of the property to be inserted into the text. - /// The message. - public static string PropertyCannotBeNull(string propertyName) => $"Property {propertyName} cannot be null."; - - /// - /// Helper method that returns a generic message when a parameter is null. - /// - /// Name of the parameter to be inserted into the text. - /// The message. - public static string ParameterCannotBeNull(string parameterName) => $"Parameter {parameterName} cannot be null."; - #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/General/IntegratedToolbarManager.cs b/Source/Krypton Components/Krypton.Toolkit/General/IntegratedToolbarManager.cs index a0a19a6986..d0240ee979 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/IntegratedToolbarManager.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/IntegratedToolbarManager.cs @@ -64,7 +64,7 @@ internal void SetupToolBar() } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -79,7 +79,7 @@ internal void ShowToolBar(bool visible) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } diff --git a/Source/Krypton Components/Krypton.Toolkit/General/KryptonDefaultColorAttribute.cs b/Source/Krypton Components/Krypton.Toolkit/General/KryptonDefaultColorAttribute.cs index 9917cf9261..3183a00ca0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/KryptonDefaultColorAttribute.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/KryptonDefaultColorAttribute.cs @@ -22,7 +22,7 @@ public sealed class KryptonDefaultColorAttribute : DefaultValueAttribute /// Initialize a new instance of the KryptonDefaultColorAttribute class. /// public KryptonDefaultColorAttribute() - : base(GlobalStaticValues.EMPTY_COLOR) + : base(GlobalStaticVariables.EMPTY_COLOR) { } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/General/NullContentValues.cs b/Source/Krypton Components/Krypton.Toolkit/General/NullContentValues.cs index e6dd9c4255..ff54678908 100644 --- a/Source/Krypton Components/Krypton.Toolkit/General/NullContentValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/General/NullContentValues.cs @@ -36,7 +36,7 @@ public class NullContentValues : IContentValues /// /// The state for which the image is needed. /// Color value. - public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content long text. @@ -56,7 +56,7 @@ public class NullContentValues : IContentValues /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBack.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBack.cs index fc847c18bd..d0e99f8380 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBack.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBack.cs @@ -40,8 +40,8 @@ public InternalStorage() // Set to default values BackDraw = InheritBool.Inherit; BackGraphicsHint = PaletteGraphicsHint.Inherit; - BackColor1 = GlobalStaticValues.EMPTY_COLOR; - BackColor2 = GlobalStaticValues.EMPTY_COLOR; + BackColor1 = GlobalStaticVariables.EMPTY_COLOR; + BackColor2 = GlobalStaticVariables.EMPTY_COLOR; BackColorStyle = PaletteColorStyle.Inherit; BackColorAlign = PaletteRectangleAlign.Inherit; BackColorAngle = -1; @@ -54,8 +54,8 @@ public InternalStorage() /// public bool IsDefault => (BackDraw == InheritBool.Inherit) && (BackGraphicsHint == PaletteGraphicsHint.Inherit) && - (BackColor1 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor2 == GlobalStaticValues.EMPTY_COLOR) && + (BackColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor2 == GlobalStaticVariables.EMPTY_COLOR) && (BackColorStyle == PaletteColorStyle.Inherit) && (BackColorAlign == PaletteRectangleAlign.Inherit) && (BackColorAngle == -1) && @@ -240,7 +240,7 @@ public PaletteGraphicsHint GetBackGraphicsHint(PaletteState state) => [RefreshProperties(RefreshProperties.All)] public Color Color1 { - get => _storage?.BackColor1 ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.BackColor1 ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -255,7 +255,7 @@ public Color Color1 } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { @@ -273,7 +273,7 @@ public Color Color1 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetBackColor1(PaletteState state) => Color1 != GlobalStaticValues.EMPTY_COLOR ? Color1 : _inherit!.GetBackColor1(state); + public Color GetBackColor1(PaletteState state) => Color1 != GlobalStaticVariables.EMPTY_COLOR ? Color1 : _inherit!.GetBackColor1(state); #endregion #region Color2 @@ -287,7 +287,7 @@ public Color Color1 [RefreshProperties(RefreshProperties.All)] public Color Color2 { - get => _storage?.BackColor2 ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.BackColor2 ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -302,7 +302,7 @@ public Color Color2 } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { @@ -320,7 +320,7 @@ public Color Color2 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetBackColor2(PaletteState state) => Color2 != GlobalStaticValues.EMPTY_COLOR ? Color2 : _inherit!.GetBackColor2(state); + public Color GetBackColor2(PaletteState state) => Color2 != GlobalStaticVariables.EMPTY_COLOR ? Color2 : _inherit!.GetBackColor2(state); #endregion #region ColorStyle diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritOverride.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritOverride.cs index 2a76ebc11d..f3c6fe4cb5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritOverride.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritOverride.cs @@ -36,8 +36,8 @@ public PaletteBackInheritOverride([DisallowNull] IPaletteBack primary, Debug.Assert(backup != null); // Store incoming alternatives - _primary = primary ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(primary))); - _backup = backup ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(backup))); + _primary = primary ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(primary))); + _backup = backup ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(backup))); // Default other state Apply = true; @@ -145,7 +145,7 @@ public override Color GetBackColor1(PaletteState state) { Color ret = _primary.GetBackColor1(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetBackColor1(state); } @@ -169,7 +169,7 @@ public override Color GetBackColor2(PaletteState state) { Color ret = _primary.GetBackColor2(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetBackColor2(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritRedirect.cs index a1a607178a..3d80a893a4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBack/PaletteBackInheritRedirect.cs @@ -50,7 +50,7 @@ public PaletteBackInheritRedirect(PaletteRedirect? redirect, /// Gets the redirector instance. /// /// Return the currently used redirector. - public PaletteRedirect GetRedirector() => _redirect ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public PaletteRedirect GetRedirector() => _redirect ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); #endregion @@ -76,49 +76,49 @@ public PaletteBackInheritRedirect(PaletteRedirect? redirect, /// /// Palette value should be applicable to this state. /// InheritBool value. - public override InheritBool GetBackDraw(PaletteState state) => _redirect?.GetBackDraw(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override InheritBool GetBackDraw(PaletteState state) => _redirect?.GetBackDraw(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the graphics drawing hint. /// /// Palette value should be applicable to this state. /// PaletteGraphicsHint value. - public override PaletteGraphicsHint GetBackGraphicsHint(PaletteState state) => _redirect?.GetBackGraphicsHint(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteGraphicsHint GetBackGraphicsHint(PaletteState state) => _redirect?.GetBackGraphicsHint(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the first background color from the redirector. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBackColor1(PaletteState state) => _redirect?.GetBackColor1(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override Color GetBackColor1(PaletteState state) => _redirect?.GetBackColor1(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the second back color from the redirector. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBackColor2(PaletteState state) => _redirect?.GetBackColor2(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override Color GetBackColor2(PaletteState state) => _redirect?.GetBackColor2(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the color drawing style from the redirector. /// /// Palette value should be applicable to this state. /// Color drawing style. - public override PaletteColorStyle GetBackColorStyle(PaletteState state) => _redirect?.GetBackColorStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteColorStyle GetBackColorStyle(PaletteState state) => _redirect?.GetBackColorStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the color alignment style from the redirector. /// /// Palette value should be applicable to this state. /// Color alignment style. - public override PaletteRectangleAlign GetBackColorAlign(PaletteState state) => _redirect?.GetBackColorAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteRectangleAlign GetBackColorAlign(PaletteState state) => _redirect?.GetBackColorAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the color background angle from the redirector. /// /// Palette value should be applicable to this state. /// Angle used for color drawing. - public override float GetBackColorAngle(PaletteState state) => _redirect?.GetBackColorAngle(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override float GetBackColorAngle(PaletteState state) => _redirect?.GetBackColorAngle(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets a background image from the redirector. @@ -132,14 +132,14 @@ public PaletteBackInheritRedirect(PaletteRedirect? redirect, /// /// Palette value should be applicable to this state. /// Image style value. - public override PaletteImageStyle GetBackImageStyle(PaletteState state) => _redirect?.GetBackImageStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteImageStyle GetBackImageStyle(PaletteState state) => _redirect?.GetBackImageStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the image alignment style from the redirector. /// /// Palette value should be applicable to this state. /// Image alignment style. - public override PaletteRectangleAlign GetBackImageAlign(PaletteState state) => _redirect?.GetBackImageAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteRectangleAlign GetBackImageAlign(PaletteState state) => _redirect?.GetBackImageAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs index 4f3fd9ccc5..318830567a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorder.cs @@ -44,8 +44,8 @@ public InternalStorage() BorderDraw = InheritBool.Inherit; BorderDrawBorders = PaletteDrawBorders.Inherit; BorderGraphicsHint = PaletteGraphicsHint.Inherit; - BorderColor1 = GlobalStaticValues.EMPTY_COLOR; - BorderColor2 = GlobalStaticValues.EMPTY_COLOR; + BorderColor1 = GlobalStaticVariables.EMPTY_COLOR; + BorderColor2 = GlobalStaticVariables.EMPTY_COLOR; BorderColorStyle = PaletteColorStyle.Inherit; BorderColorAlign = PaletteRectangleAlign.Inherit; BorderColorAngle = -1; @@ -61,8 +61,8 @@ public InternalStorage() public bool IsDefault => (BorderDraw == InheritBool.Inherit) && (BorderDrawBorders == PaletteDrawBorders.Inherit) && (BorderGraphicsHint == PaletteGraphicsHint.Inherit) && - (BorderColor1 == GlobalStaticValues.EMPTY_COLOR) && - (BorderColor2 == GlobalStaticValues.EMPTY_COLOR) && + (BorderColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (BorderColor2 == GlobalStaticVariables.EMPTY_COLOR) && (BorderColorStyle == PaletteColorStyle.Inherit) && (BorderColorAlign == PaletteRectangleAlign.Inherit) && (BorderColorAngle == -1) && @@ -100,7 +100,7 @@ public PaletteBorder([DisallowNull] IPaletteBorder inherit, Debug.Assert(inherit != null); // Remember inheritance - _inherit = inherit ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(inherit))); + _inherit = inherit ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(inherit))); // Store the provided paint notification delegate NeedPaint = needPaint; @@ -320,7 +320,7 @@ public Color Color1 } else { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } } @@ -337,7 +337,7 @@ public Color Color1 } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { @@ -355,7 +355,7 @@ public Color Color1 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetBorderColor1(PaletteState state) => Color1 != GlobalStaticValues.EMPTY_COLOR ? Color1 : _inherit.GetBorderColor1(state); + public Color GetBorderColor1(PaletteState state) => Color1 != GlobalStaticVariables.EMPTY_COLOR ? Color1 : _inherit.GetBorderColor1(state); #endregion @@ -370,7 +370,7 @@ public Color Color1 [RefreshProperties(RefreshProperties.All)] public Color Color2 { - get => _storage?.BorderColor2 ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.BorderColor2 ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -385,7 +385,7 @@ public Color Color2 } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { @@ -403,7 +403,7 @@ public Color Color2 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetBorderColor2(PaletteState state) => Color2 != GlobalStaticValues.EMPTY_COLOR ? Color2 : _inherit.GetBorderColor2(state); + public Color GetBorderColor2(PaletteState state) => Color2 != GlobalStaticVariables.EMPTY_COLOR ? Color2 : _inherit.GetBorderColor2(state); #endregion #region ColorStyle @@ -604,7 +604,7 @@ public virtual int Width [KryptonPersist(false)] [Category(@"Visuals")] [Description(@"How much to round the border corners.")] - [DefaultValue(GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE)] + [DefaultValue(GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE)] [RefreshProperties(RefreshProperties.All)] public float Rounding { @@ -618,7 +618,7 @@ public float Rounding return _storage.BorderRounding; } - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } set @@ -634,7 +634,7 @@ public float Rounding } else { - if (value != GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE) + if (value != GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE) { _storage = new InternalStorage { @@ -647,8 +647,8 @@ public float Rounding } } - private void ResetRounding() => Rounding = GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; - private bool ShouldSerializeRounding() => Rounding != GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + private void ResetRounding() => Rounding = GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + private bool ShouldSerializeRounding() => Rounding != GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; /// /// Gets the border rounding. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs index fc0434e0e3..c5866c0d6f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritForced.cs @@ -142,14 +142,14 @@ public override PaletteGraphicsHint GetBorderGraphicsHint(PaletteState state) => /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBorderColor1(PaletteState state) => _inherit?.GetBorderColor1(state) ?? GlobalStaticValues.EMPTY_COLOR; + public override Color GetBorderColor1(PaletteState state) => _inherit?.GetBorderColor1(state) ?? GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second border color. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBorderColor2(PaletteState state) => _inherit?.GetBorderColor2(state) ?? GlobalStaticValues.EMPTY_COLOR; + public override Color GetBorderColor2(PaletteState state) => _inherit?.GetBorderColor2(state) ?? GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color drawing style. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs index 341ac920b7..6578a9ba68 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritOverride.cs @@ -36,8 +36,8 @@ public PaletteBorderInheritOverride([DisallowNull] IPaletteBorder primary, Debug.Assert(backup != null); // Store incoming alternatives - _primary = primary ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(primary))); - _backup = backup ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(backup))); + _primary = primary ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(primary))); + _backup = backup ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(backup))); // Default other state Apply = true; @@ -169,7 +169,7 @@ public override Color GetBorderColor1(PaletteState state) { Color ret = _primary.GetBorderColor1(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetBorderColor1(state); } @@ -193,7 +193,7 @@ public override Color GetBorderColor2(PaletteState state) { Color ret = _primary.GetBorderColor2(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetBorderColor2(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs index 757522088b..ca1230b938 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteBorder/PaletteBorderInheritRedirect.cs @@ -58,7 +58,7 @@ public PaletteBorderInheritRedirect(PaletteRedirect? redirect, /// Gets the redirector instance. /// /// Return the currently used redirector. - public PaletteRedirect GetRedirector() => _redirect ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public PaletteRedirect GetRedirector() => _redirect ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); #endregion @@ -86,70 +86,70 @@ public PaletteBorderInheritRedirect(PaletteRedirect? redirect, /// InheritBool value. public override InheritBool GetBorderDraw(PaletteState state) => OverrideBorderToFalse ? InheritBool.False - : _redirect?.GetBorderDraw(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + : _redirect?.GetBorderDraw(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets a value indicating which borders to draw. /// /// Palette value should be applicable to this state. /// PaletteDrawBorders value. - public override PaletteDrawBorders GetBorderDrawBorders(PaletteState state) => _redirect?.GetBorderDrawBorders(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteDrawBorders GetBorderDrawBorders(PaletteState state) => _redirect?.GetBorderDrawBorders(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the graphics drawing hint. /// /// Palette value should be applicable to this state. /// PaletteGraphicsHint value. - public override PaletteGraphicsHint GetBorderGraphicsHint(PaletteState state) => _redirect?.GetBorderGraphicsHint(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteGraphicsHint GetBorderGraphicsHint(PaletteState state) => _redirect?.GetBorderGraphicsHint(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the first border color from the redirector. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBorderColor1(PaletteState state) => _redirect?.GetBorderColor1(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override Color GetBorderColor1(PaletteState state) => _redirect?.GetBorderColor1(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the second border color from the redirector. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBorderColor2(PaletteState state) => _redirect?.GetBorderColor2(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override Color GetBorderColor2(PaletteState state) => _redirect?.GetBorderColor2(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the color drawing style from the redirector. /// /// Palette value should be applicable to this state. /// Color drawing style. - public override PaletteColorStyle GetBorderColorStyle(PaletteState state) => _redirect?.GetBorderColorStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteColorStyle GetBorderColorStyle(PaletteState state) => _redirect?.GetBorderColorStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the color alignment style from the redirector. /// /// Palette value should be applicable to this state. /// Color alignment style. - public override PaletteRectangleAlign GetBorderColorAlign(PaletteState state) => _redirect?.GetBorderColorAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteRectangleAlign GetBorderColorAlign(PaletteState state) => _redirect?.GetBorderColorAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the color border angle from the redirector. /// /// Palette value should be applicable to this state. /// Angle used for color drawing. - public override float GetBorderColorAngle(PaletteState state) => _redirect?.GetBorderColorAngle(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override float GetBorderColorAngle(PaletteState state) => _redirect?.GetBorderColorAngle(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the border width from the redirector. /// /// Palette value should be applicable to this state. /// Border width. - public override int GetBorderWidth(PaletteState state) => _redirect?.GetBorderWidth(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override int GetBorderWidth(PaletteState state) => _redirect?.GetBorderWidth(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the border rounding from the redirector. /// /// Palette value should be applicable to this state. /// Border rounding. - public override float GetBorderRounding(PaletteState state) => _redirect?.GetBorderRounding(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override float GetBorderRounding(PaletteState state) => _redirect?.GetBorderRounding(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets a border image from the redirector. @@ -163,13 +163,13 @@ public override InheritBool GetBorderDraw(PaletteState state) => OverrideBorderT /// /// Palette value should be applicable to this state. /// Image style value. - public override PaletteImageStyle GetBorderImageStyle(PaletteState state) => _redirect?.GetBorderImageStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteImageStyle GetBorderImageStyle(PaletteState state) => _redirect?.GetBorderImageStyle(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); /// /// Gets the image alignment style from the redirector. /// /// Palette value should be applicable to this state. /// Image alignment style. - public override PaletteRectangleAlign GetBorderImageAlign(PaletteState state) => _redirect?.GetBorderImageAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_redirect))); + public override PaletteRectangleAlign GetBorderImageAlign(PaletteState state) => _redirect?.GetBorderImageAlign(Style, state) ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_redirect))); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContent.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContent.cs index 6d811eaf00..3806c86bc3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContent.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContent.cs @@ -307,7 +307,7 @@ public PaletteImageEffect GetContentImageEffect(PaletteState state) => /// /// Palette value should be applicable to this state. /// Color value. - public Color GetContentImageColorMap(PaletteState state) => _image.ImageColorMap != GlobalStaticValues.EMPTY_COLOR + public Color GetContentImageColorMap(PaletteState state) => _image.ImageColorMap != GlobalStaticVariables.EMPTY_COLOR ? _image.ImageColorMap : _inherit.GetContentImageColorMap(state); @@ -316,7 +316,7 @@ public Color GetContentImageColorMap(PaletteState state) => _image.ImageColorMap /// /// Palette value should be applicable to this state. /// Color value. - public Color GetContentImageColorTo(PaletteState state) => _image.ImageColorTo != GlobalStaticValues.EMPTY_COLOR + public Color GetContentImageColorTo(PaletteState state) => _image.ImageColorTo != GlobalStaticVariables.EMPTY_COLOR ? _image.ImageColorTo : _inherit.GetContentImageColorTo(state); @@ -419,7 +419,7 @@ public InheritBool GetContentShortTextMultiLine(PaletteState state) => /// Palette value should be applicable to this state. /// Color value. public Color GetContentShortTextColor1(PaletteState state) => - ShortText.Color1 != GlobalStaticValues.EMPTY_COLOR + ShortText.Color1 != GlobalStaticVariables.EMPTY_COLOR ? ShortText.Color1 : _inherit.GetContentShortTextColor1(state); @@ -428,7 +428,7 @@ public Color GetContentShortTextColor1(PaletteState state) => /// /// Palette value should be applicable to this state. /// Color value. - public Color GetContentShortTextColor2(PaletteState state) => ShortText.Color2 != GlobalStaticValues.EMPTY_COLOR + public Color GetContentShortTextColor2(PaletteState state) => ShortText.Color2 != GlobalStaticVariables.EMPTY_COLOR ? ShortText.Color2 : _inherit.GetContentShortTextColor2(state); @@ -588,7 +588,7 @@ public InheritBool GetContentLongTextMultiLine(PaletteState state) => /// Palette value should be applicable to this state. /// Color value. public Color GetContentLongTextColor1(PaletteState state) => - LongText.Color1 != GlobalStaticValues.EMPTY_COLOR + LongText.Color1 != GlobalStaticVariables.EMPTY_COLOR ? LongText.Color1 : _inherit.GetContentLongTextColor1(state); @@ -598,7 +598,7 @@ public Color GetContentLongTextColor1(PaletteState state) => /// Palette value should be applicable to this state. /// Color value. public Color GetContentLongTextColor2(PaletteState state) => - LongText.Color2 != GlobalStaticValues.EMPTY_COLOR + LongText.Color2 != GlobalStaticVariables.EMPTY_COLOR ? LongText.Color2 : _inherit.GetContentLongTextColor2(state); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentImage.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentImage.cs index 4085ab6ef1..e77b9cfa71 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentImage.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentImage.cs @@ -35,8 +35,8 @@ public InternalStorage() ContentImageH = PaletteRelativeAlign.Inherit; ContentImageV = PaletteRelativeAlign.Inherit; ContentEffect = PaletteImageEffect.Inherit; - ContentImageColorMap = GlobalStaticValues.EMPTY_COLOR; - ContentImageColorTo = GlobalStaticValues.EMPTY_COLOR; + ContentImageColorMap = GlobalStaticVariables.EMPTY_COLOR; + ContentImageColorTo = GlobalStaticVariables.EMPTY_COLOR; } /// @@ -45,8 +45,8 @@ public InternalStorage() public bool IsDefault => (ContentImageH == PaletteRelativeAlign.Inherit) && (ContentImageV == PaletteRelativeAlign.Inherit) && (ContentEffect == PaletteImageEffect.Inherit) && - (ContentImageColorMap == GlobalStaticValues.EMPTY_COLOR) && - (ContentImageColorTo == GlobalStaticValues.EMPTY_COLOR); + (ContentImageColorMap == GlobalStaticVariables.EMPTY_COLOR) && + (ContentImageColorTo == GlobalStaticVariables.EMPTY_COLOR); } #endregion @@ -215,7 +215,7 @@ public PaletteImageEffect Effect [RefreshProperties(RefreshProperties.All)] public Color ImageColorMap { - get => _storage?.ContentImageColorMap ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.ContentImageColorMap ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -230,7 +230,7 @@ public Color ImageColorMap } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { @@ -255,7 +255,7 @@ public Color ImageColorMap [RefreshProperties(RefreshProperties.All)] public Color ImageColorTo { - get => _storage?.ContentImageColorTo ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.ContentImageColorTo ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -270,7 +270,7 @@ public Color ImageColorTo } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritForced.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritForced.cs index 17101cc085..2a1fa96912 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritForced.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritForced.cs @@ -44,7 +44,7 @@ public PaletteContentInheritForced(IPaletteContent inherit) public void SetInherit([DisallowNull] IPaletteContent paletteContent) { Debug.Assert(paletteContent != null); - _inherit = paletteContent ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(paletteContent))); + _inherit = paletteContent ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(paletteContent))); } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritOverride.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritOverride.cs index a5386efa26..eb6390aec2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritOverride.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentInheritOverride.cs @@ -51,8 +51,8 @@ public PaletteContentInheritOverride([DisallowNull] IPaletteContent primary, Debug.Assert(backup != null); // Store incoming values - _primary = primary ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(primary))); - _backup = backup ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(backup))); + _primary = primary ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(primary))); + _backup = backup ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(backup))); Apply = apply; OverrideState = overrideState; @@ -232,7 +232,7 @@ public override Color GetContentImageColorMap(PaletteState state) { Color ret = _primary.GetContentImageColorMap(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetContentImageColorMap(state); } @@ -256,7 +256,7 @@ public override Color GetContentImageColorTo(PaletteState state) { Color ret = _primary.GetContentImageColorTo(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetContentImageColorTo(state); } @@ -486,7 +486,7 @@ public override Color GetContentShortTextColor1(PaletteState state) { Color ret = _primary.GetContentShortTextColor1(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetContentShortTextColor1(state); } @@ -510,7 +510,7 @@ public override Color GetContentShortTextColor2(PaletteState state) { Color ret = _primary.GetContentShortTextColor2(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetContentShortTextColor2(state); } @@ -879,7 +879,7 @@ public override Color GetContentLongTextColor1(PaletteState state) { Color ret = _primary.GetContentLongTextColor1(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetContentLongTextColor1(state); } @@ -903,7 +903,7 @@ public override Color GetContentLongTextColor2(PaletteState state) { Color ret = _primary.GetContentLongTextColor2(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetContentLongTextColor2(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentText.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentText.cs index 96ba64a7db..5accc6a523 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentText.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteContent/PaletteContentText.cs @@ -48,8 +48,8 @@ public InternalStorage() ContentTextV = PaletteRelativeAlign.Inherit; ContentTextMultiLineH = PaletteRelativeAlign.Inherit; ContentTextMultiLine = InheritBool.Inherit; - ContentTextColor1 = GlobalStaticValues.EMPTY_COLOR; - ContentTextColor2 = GlobalStaticValues.EMPTY_COLOR; + ContentTextColor1 = GlobalStaticVariables.EMPTY_COLOR; + ContentTextColor2 = GlobalStaticVariables.EMPTY_COLOR; ContentTextColorStyle = PaletteColorStyle.Inherit; ContentTextColorAlign = PaletteRectangleAlign.Inherit; ContentTextColorAngle = -1; @@ -68,8 +68,8 @@ public InternalStorage() (ContentTextV == PaletteRelativeAlign.Inherit) && (ContentTextMultiLineH == PaletteRelativeAlign.Inherit) && (ContentTextMultiLine == InheritBool.Inherit) && - (ContentTextColor1 == GlobalStaticValues.EMPTY_COLOR) && - (ContentTextColor2 == GlobalStaticValues.EMPTY_COLOR) && + (ContentTextColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (ContentTextColor2 == GlobalStaticVariables.EMPTY_COLOR) && (ContentTextColorStyle == PaletteColorStyle.Inherit) && (ContentTextColorAlign == PaletteRectangleAlign.Inherit) && (ContentTextColorAngle == -1) && @@ -444,7 +444,7 @@ public virtual InheritBool MultiLine [RefreshProperties(RefreshProperties.All)] public virtual Color Color1 { - get => _storage?.ContentTextColor1 ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.ContentTextColor1 ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -459,7 +459,7 @@ public virtual Color Color1 } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { @@ -484,7 +484,7 @@ public virtual Color Color1 [RefreshProperties(RefreshProperties.All)] public virtual Color Color2 { - get => _storage?.ContentTextColor2 ?? GlobalStaticValues.EMPTY_COLOR; + get => _storage?.ContentTextColor2 ?? GlobalStaticVariables.EMPTY_COLOR; set { @@ -499,7 +499,7 @@ public virtual Color Color2 } else { - if (value != GlobalStaticValues.EMPTY_COLOR) + if (value != GlobalStaticVariables.EMPTY_COLOR) { _storage = new InternalStorage { diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDouble/PaletteDoubleMetric.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDouble/PaletteDoubleMetric.cs index e912b52079..2fc11e0c31 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDouble/PaletteDoubleMetric.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDouble/PaletteDoubleMetric.cs @@ -44,7 +44,7 @@ public PaletteDoubleMetric([DisallowNull] PaletteDoubleMetricRedirect inherit, Debug.Assert(inherit != null); // Remember inheritance for metric values - _inherit = inherit ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(inherit))); + _inherit = inherit ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(inherit))); } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDragDrop/PaletteDragDrop.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDragDrop/PaletteDragDrop.cs index 5eef67347b..15e1bd4534 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDragDrop/PaletteDragDrop.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDragDrop/PaletteDragDrop.cs @@ -47,13 +47,13 @@ public PaletteDragDrop(PaletteBase inherit, // Set default values _feedback = PaletteDragFeedback.Inherit; - _solidBack = GlobalStaticValues.EMPTY_COLOR; - _solidBorder = GlobalStaticValues.EMPTY_COLOR; + _solidBack = GlobalStaticVariables.EMPTY_COLOR; + _solidBorder = GlobalStaticVariables.EMPTY_COLOR; _solidOpacity = -1.0f; - _dropDockBack = GlobalStaticValues.EMPTY_COLOR; - _dropDockBorder = GlobalStaticValues.EMPTY_COLOR; - _dropDockActive = GlobalStaticValues.EMPTY_COLOR; - _dropDockInactive = GlobalStaticValues.EMPTY_COLOR; + _dropDockBack = GlobalStaticVariables.EMPTY_COLOR; + _dropDockBorder = GlobalStaticVariables.EMPTY_COLOR; + _dropDockActive = GlobalStaticVariables.EMPTY_COLOR; + _dropDockInactive = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -64,13 +64,13 @@ public PaletteDragDrop(PaletteBase inherit, [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => (Feedback == PaletteDragFeedback.Inherit) && - (SolidBack == GlobalStaticValues.EMPTY_COLOR) && - (SolidBorder == GlobalStaticValues.EMPTY_COLOR) && + (SolidBack == GlobalStaticVariables.EMPTY_COLOR) && + (SolidBorder == GlobalStaticVariables.EMPTY_COLOR) && (SolidOpacity == -1.0f) && - (DropDockBack == GlobalStaticValues.EMPTY_COLOR) && - (DropDockBorder == GlobalStaticValues.EMPTY_COLOR) && - (DropDockActive == GlobalStaticValues.EMPTY_COLOR) && - (DropDockInactive == GlobalStaticValues.EMPTY_COLOR); + (DropDockBack == GlobalStaticVariables.EMPTY_COLOR) && + (DropDockBorder == GlobalStaticVariables.EMPTY_COLOR) && + (DropDockActive == GlobalStaticVariables.EMPTY_COLOR) && + (DropDockInactive == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -162,13 +162,13 @@ public Color SolidBack /// /// Resets the SolidBack property to its default value. /// - public void ResetSolidBack() => SolidBack = GlobalStaticValues.EMPTY_COLOR; + public void ResetSolidBack() => SolidBack = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the background color for a solid drag drop area. /// /// Color value. - public Color GetDragDropSolidBack() => SolidBack != GlobalStaticValues.EMPTY_COLOR + public Color GetDragDropSolidBack() => SolidBack != GlobalStaticVariables.EMPTY_COLOR ? SolidBack : _inherit?.GetDragDropSolidBack() ?? SystemColors.ActiveCaption; @@ -200,13 +200,13 @@ public Color SolidBorder /// /// Resets the SolidBorder property to its default value. /// - public void ResetSolidBorder() => SolidBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetSolidBorder() => SolidBorder = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the border color for a solid drag drop area. /// /// Color value. - public Color GetDragDropSolidBorder() => SolidBorder != GlobalStaticValues.EMPTY_COLOR + public Color GetDragDropSolidBorder() => SolidBorder != GlobalStaticVariables.EMPTY_COLOR ? SolidBorder : _inherit?.GetDragDropSolidBorder() ?? SystemColors.Control; @@ -276,14 +276,14 @@ public Color DropDockBack /// /// Resets the DropDockBack property to its default value. /// - public void ResetDropDockBack() => DropDockBack = GlobalStaticValues.EMPTY_COLOR; + public void ResetDropDockBack() => DropDockBack = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the background color for the docking indicators area. /// /// Color value. - public Color GetDragDropDockBack() => DropDockBack != GlobalStaticValues.EMPTY_COLOR + public Color GetDragDropDockBack() => DropDockBack != GlobalStaticVariables.EMPTY_COLOR ? DropDockBack : _inherit?.GetDragDropDockBack() ?? Color.FromArgb(228, 228, 228); @@ -315,13 +315,13 @@ public Color DropDockBorder /// /// Resets the DropDockBorder property to its default value. /// - public void ResetDropDockBorder() => DropDockBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetDropDockBorder() => DropDockBorder = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the border color for the docking indicators area. /// /// Color value. - public Color GetDragDropDockBorder() => DropDockBorder != GlobalStaticValues.EMPTY_COLOR + public Color GetDragDropDockBorder() => DropDockBorder != GlobalStaticVariables.EMPTY_COLOR ? DropDockBorder : _inherit?.GetDragDropDockBorder() ?? Color.FromArgb(181, 181, 181); @@ -353,13 +353,13 @@ public Color DropDockActive /// /// Resets the DropDockActive property to its default value. /// - public void ResetDropDockActive() => DropDockActive = GlobalStaticValues.EMPTY_COLOR; + public void ResetDropDockActive() => DropDockActive = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the active color for docking indicators. /// /// Color value. - public Color GetDragDropDockActive() => DropDockActive != GlobalStaticValues.EMPTY_COLOR + public Color GetDragDropDockActive() => DropDockActive != GlobalStaticVariables.EMPTY_COLOR ? DropDockActive : _inherit?.GetDragDropDockActive() ?? SystemColors.ActiveCaption; @@ -391,13 +391,13 @@ public Color DropDockInactive /// /// Resets the DropDockInactive property to its default value. /// - public void ResetDropDockInactive() => DropDockInactive = GlobalStaticValues.EMPTY_COLOR; + public void ResetDropDockInactive() => DropDockInactive = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the inactive color for docking indicators. /// /// Color value. - public Color GetDragDropDockInactive() => DropDockInactive != GlobalStaticValues.EMPTY_COLOR + public Color GetDragDropDockInactive() => DropDockInactive != GlobalStaticVariables.EMPTY_COLOR ? DropDockInactive : _inherit?.GetDragDropDockInactive() ?? SystemColors.InactiveCaption; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColor.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColor.cs index 4ba29760a8..7a5c5bda54 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColor.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColor.cs @@ -43,11 +43,11 @@ public PaletteElementColor(IPaletteElementColor? inheritElementColor, NeedPaint = needPaint; // Define default values - _color1 = GlobalStaticValues.EMPTY_COLOR; - _color2 = GlobalStaticValues.EMPTY_COLOR; - _color3 = GlobalStaticValues.EMPTY_COLOR; - _color4 = GlobalStaticValues.EMPTY_COLOR; - _color5 = GlobalStaticValues.EMPTY_COLOR; + _color1 = GlobalStaticVariables.EMPTY_COLOR; + _color2 = GlobalStaticVariables.EMPTY_COLOR; + _color3 = GlobalStaticVariables.EMPTY_COLOR; + _color4 = GlobalStaticVariables.EMPTY_COLOR; + _color5 = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -57,11 +57,11 @@ public PaletteElementColor(IPaletteElementColor? inheritElementColor, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (Color1 == GlobalStaticValues.EMPTY_COLOR) && - (Color2 == GlobalStaticValues.EMPTY_COLOR) && - (Color3 == GlobalStaticValues.EMPTY_COLOR) && - (Color4 == GlobalStaticValues.EMPTY_COLOR) && - (Color5 == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (Color1 == GlobalStaticVariables.EMPTY_COLOR) && + (Color2 == GlobalStaticVariables.EMPTY_COLOR) && + (Color3 == GlobalStaticVariables.EMPTY_COLOR) && + (Color4 == GlobalStaticVariables.EMPTY_COLOR) && + (Color5 == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -113,7 +113,7 @@ public virtual Color Color1 /// /// Reset the Color1 to the default value. /// - public void ResetColor1() => Color1 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor1() => Color1 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the first element color. @@ -121,7 +121,7 @@ public virtual Color Color1 /// Palette value should be applicable to this state. /// Color value. public Color GetElementColor1(PaletteState state) => - Color1 != GlobalStaticValues.EMPTY_COLOR ? Color1 : _inheritElementColor!.GetElementColor1(state); + Color1 != GlobalStaticVariables.EMPTY_COLOR ? Color1 : _inheritElementColor!.GetElementColor1(state); #endregion @@ -151,7 +151,7 @@ public virtual Color Color2 /// /// Reset the Color2 to the default value. /// - public void ResetColor2() => Color2 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor2() => Color2 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second element color. @@ -159,7 +159,7 @@ public virtual Color Color2 /// Palette value should be applicable to this state. /// Color value. public Color GetElementColor2(PaletteState state) => - Color2 != GlobalStaticValues.EMPTY_COLOR ? Color2 : _inheritElementColor!.GetElementColor2(state); + Color2 != GlobalStaticVariables.EMPTY_COLOR ? Color2 : _inheritElementColor!.GetElementColor2(state); #endregion @@ -189,7 +189,7 @@ public virtual Color Color3 /// /// Reset the Color3 to the default value. /// - public void ResetColor3() => Color3 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor3() => Color3 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the third element color. @@ -197,7 +197,7 @@ public virtual Color Color3 /// Palette value should be applicable to this state. /// Color value. public Color GetElementColor3(PaletteState state) => - Color3 != GlobalStaticValues.EMPTY_COLOR ? Color3 : _inheritElementColor!.GetElementColor3(state); + Color3 != GlobalStaticVariables.EMPTY_COLOR ? Color3 : _inheritElementColor!.GetElementColor3(state); #endregion @@ -227,7 +227,7 @@ public virtual Color Color4 /// /// Reset the Color4 to the default value. /// - public void ResetColor4() => Color4 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor4() => Color4 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fourth element color. @@ -235,7 +235,7 @@ public virtual Color Color4 /// Palette value should be applicable to this state. /// Color value. public Color GetElementColor4(PaletteState state) => - Color4 != GlobalStaticValues.EMPTY_COLOR ? Color4 : _inheritElementColor!.GetElementColor4(state); + Color4 != GlobalStaticVariables.EMPTY_COLOR ? Color4 : _inheritElementColor!.GetElementColor4(state); #endregion @@ -265,7 +265,7 @@ public virtual Color Color5 /// /// Reset the Color5 to the default value. /// - public void ResetColor5() => Color5 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor5() => Color5 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fifth element color. @@ -273,7 +273,7 @@ public virtual Color Color5 /// Palette value should be applicable to this state. /// Color value. public Color GetElementColor5(PaletteState state) => - Color5 != GlobalStaticValues.EMPTY_COLOR ? Color5 : _inheritElementColor!.GetElementColor5(state); + Color5 != GlobalStaticVariables.EMPTY_COLOR ? Color5 : _inheritElementColor!.GetElementColor5(state); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColorInheritOverride.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColorInheritOverride.cs index 5607fed3ac..487e953462 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColorInheritOverride.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteElementColor/PaletteElementColorInheritOverride.cs @@ -97,7 +97,7 @@ public override Color GetElementColor1(PaletteState state) { Color ret = _primary.GetElementColor1(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetElementColor1(state); } @@ -121,7 +121,7 @@ public override Color GetElementColor2(PaletteState state) { Color ret = _primary.GetElementColor2(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetElementColor2(state); } @@ -145,7 +145,7 @@ public override Color GetElementColor3(PaletteState state) { Color ret = _primary.GetElementColor3(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetElementColor3(state); } @@ -169,7 +169,7 @@ public override Color GetElementColor4(PaletteState state) { Color ret = _primary.GetElementColor4(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetElementColor4(state); } @@ -193,7 +193,7 @@ public override Color GetElementColor5(PaletteState state) { Color ret = _primary.GetElementColor5(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backup.GetElementColor5(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs index 58f9940558..009a6bd07f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRedirect/PaletteRedirectBorderEdge.cs @@ -119,7 +119,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta { PaletteBorderEdge? inherit = GetInherit(state); - return inherit?.GetBackColor1(state) ?? Target?.GetBorderColor1(style, state) ?? GlobalStaticValues.EMPTY_COLOR; + return inherit?.GetBackColor1(state) ?? Target?.GetBorderColor1(style, state) ?? GlobalStaticVariables.EMPTY_COLOR; } /// @@ -132,7 +132,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta { PaletteBorderEdge? inherit = GetInherit(state); - return inherit?.GetBackColor2(state) ?? Target?.GetBorderColor2(style, state) ?? GlobalStaticValues.EMPTY_COLOR; + return inherit?.GetBackColor2(state) ?? Target?.GetBorderColor2(style, state) ?? GlobalStaticVariables.EMPTY_COLOR; } /// diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBack.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBack.cs index c36e41f9f5..50461084a2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBack.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBack.cs @@ -46,11 +46,11 @@ public PaletteRibbonBack([DisallowNull] IPaletteRibbonBack inheritBack, NeedPaint = needPaint; // Define default values - _backColor1 = GlobalStaticValues.EMPTY_COLOR; - _backColor2 = GlobalStaticValues.EMPTY_COLOR; - _backColor3 = GlobalStaticValues.EMPTY_COLOR; - _backColor4 = GlobalStaticValues.EMPTY_COLOR; - _backColor5 = GlobalStaticValues.EMPTY_COLOR; + _backColor1 = GlobalStaticVariables.EMPTY_COLOR; + _backColor2 = GlobalStaticVariables.EMPTY_COLOR; + _backColor3 = GlobalStaticVariables.EMPTY_COLOR; + _backColor4 = GlobalStaticVariables.EMPTY_COLOR; + _backColor5 = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -60,11 +60,11 @@ public PaletteRibbonBack([DisallowNull] IPaletteRibbonBack inheritBack, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (BackColor1 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor2 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor3 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor4 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor5 == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (BackColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor2 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor3 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor4 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor5 == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -124,8 +124,8 @@ public virtual Color BackColor1 } } - private bool ShouldSerializeBackColor1() => _backColor1 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor1() => _backColor1 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor1() => _backColor1 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor1() => _backColor1 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the first background color for the ribbon item. @@ -133,7 +133,7 @@ public virtual Color BackColor1 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor1(PaletteState state) => - BackColor1 != GlobalStaticValues.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); + BackColor1 != GlobalStaticVariables.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); #endregion @@ -160,8 +160,8 @@ public virtual Color BackColor2 } } - private bool ShouldSerializeBackColor2() => _backColor2 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor2() => BackColor2 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor2() => _backColor2 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor2() => BackColor2 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second background color for the ribbon item. @@ -169,7 +169,7 @@ public virtual Color BackColor2 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor2(PaletteState state) => - BackColor2 != GlobalStaticValues.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); + BackColor2 != GlobalStaticVariables.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); #endregion @@ -196,8 +196,8 @@ public virtual Color BackColor3 } } - private bool ShouldSerializeBackColor3() => _backColor3 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor3() => BackColor3 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor3() => _backColor3 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor3() => BackColor3 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the third background color for the ribbon item. @@ -205,7 +205,7 @@ public virtual Color BackColor3 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor3(PaletteState state) => - BackColor3 != GlobalStaticValues.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); + BackColor3 != GlobalStaticVariables.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); #endregion @@ -232,8 +232,8 @@ public virtual Color BackColor4 } } - private bool ShouldSerializeBackColor4() => _backColor4 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor4() => BackColor4 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor4() => _backColor4 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor4() => BackColor4 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fourth background color for the ribbon item. @@ -241,7 +241,7 @@ public virtual Color BackColor4 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor4(PaletteState state) => - BackColor4 != GlobalStaticValues.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); + BackColor4 != GlobalStaticVariables.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); #endregion @@ -268,8 +268,8 @@ public virtual Color BackColor5 } } - private bool ShouldSerializeBackColor5() => _backColor5 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor5() => BackColor5 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor5() => _backColor5 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor5() => BackColor5 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fifth background color for the ribbon item. @@ -277,7 +277,7 @@ public virtual Color BackColor5 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor5(PaletteState state) => - BackColor5 != GlobalStaticValues.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); + BackColor5 != GlobalStaticVariables.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBackRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBackRedirect.cs index 2c14e616e2..76f79e283a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBackRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonBackRedirect.cs @@ -49,11 +49,11 @@ public PaletteRibbonBackRedirect(PaletteRedirect redirect, _inheritBack = new PaletteRibbonBackInheritRedirect(redirect!, backStyle); // Define default values - _backColor1 = GlobalStaticValues.EMPTY_COLOR; - _backColor2 = GlobalStaticValues.EMPTY_COLOR; - _backColor3 = GlobalStaticValues.EMPTY_COLOR; - _backColor4 = GlobalStaticValues.EMPTY_COLOR; - _backColor5 = GlobalStaticValues.EMPTY_COLOR; + _backColor1 = GlobalStaticVariables.EMPTY_COLOR; + _backColor2 = GlobalStaticVariables.EMPTY_COLOR; + _backColor3 = GlobalStaticVariables.EMPTY_COLOR; + _backColor4 = GlobalStaticVariables.EMPTY_COLOR; + _backColor5 = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -72,11 +72,11 @@ public PaletteRibbonBackRedirect(PaletteRedirect redirect, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (BackColor1 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor2 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor3 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor4 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor5 == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (BackColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor2 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor3 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor4 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor5 == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -113,8 +113,8 @@ public Color BackColor1 } } - private bool ShouldSerializeBackColor1() => BackColor1 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor1() => BackColor1 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor1() => BackColor1 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor1() => BackColor1 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the first background color for the ribbon item. @@ -122,7 +122,7 @@ public Color BackColor1 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor1(PaletteState state) => - BackColor1 != GlobalStaticValues.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); + BackColor1 != GlobalStaticVariables.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); #endregion @@ -149,8 +149,8 @@ public Color BackColor2 } } - private bool ShouldSerializeBackColor2() => BackColor2 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor2() => BackColor2 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor2() => BackColor2 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor2() => BackColor2 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second background color for the ribbon item. @@ -158,7 +158,7 @@ public Color BackColor2 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor2(PaletteState state) => - BackColor2 != GlobalStaticValues.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); + BackColor2 != GlobalStaticVariables.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); #endregion @@ -185,8 +185,8 @@ public Color BackColor3 } } - private bool ShouldSerializeBackColor3() => BackColor3 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor3() => BackColor3 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor3() => BackColor3 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor3() => BackColor3 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the third background color for the ribbon item. @@ -194,7 +194,7 @@ public Color BackColor3 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor3(PaletteState state) => - BackColor3 != GlobalStaticValues.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); + BackColor3 != GlobalStaticVariables.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); #endregion @@ -221,8 +221,8 @@ public Color BackColor4 } } - private bool ShouldSerializeBackColor4() => BackColor4 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor4() => BackColor4 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor4() => BackColor4 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor4() => BackColor4 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fourth background color for the ribbon item. @@ -230,7 +230,7 @@ public Color BackColor4 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor4(PaletteState state) => - BackColor4 != GlobalStaticValues.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); + BackColor4 != GlobalStaticVariables.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); #endregion @@ -257,8 +257,8 @@ public Color BackColor5 } } - private bool ShouldSerializeBackColor5() => BackColor5 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor5() => BackColor5 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor5() => BackColor5 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor5() => BackColor5 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fifth background color for the ribbon item. @@ -266,7 +266,7 @@ public Color BackColor5 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor5(PaletteState state) => - BackColor5 != GlobalStaticValues.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); + BackColor5 != GlobalStaticVariables.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDouble.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDouble.cs index 6bf64cd949..6691054124 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDouble.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDouble.cs @@ -52,12 +52,12 @@ public PaletteRibbonDouble([DisallowNull] IPaletteRibbonBack inheritBack, NeedPaint = needPaint; // Define default values - _backColor1 = GlobalStaticValues.EMPTY_COLOR; - _backColor2 = GlobalStaticValues.EMPTY_COLOR; - _backColor3 = GlobalStaticValues.EMPTY_COLOR; - _backColor4 = GlobalStaticValues.EMPTY_COLOR; - _backColor5 = GlobalStaticValues.EMPTY_COLOR; - _textColor = GlobalStaticValues.EMPTY_COLOR; + _backColor1 = GlobalStaticVariables.EMPTY_COLOR; + _backColor2 = GlobalStaticVariables.EMPTY_COLOR; + _backColor3 = GlobalStaticVariables.EMPTY_COLOR; + _backColor4 = GlobalStaticVariables.EMPTY_COLOR; + _backColor5 = GlobalStaticVariables.EMPTY_COLOR; + _textColor = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -67,12 +67,12 @@ public PaletteRibbonDouble([DisallowNull] IPaletteRibbonBack inheritBack, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (BackColor1 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor2 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor3 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor4 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor5 == GlobalStaticValues.EMPTY_COLOR) && - (TextColor == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (BackColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor2 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor3 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor4 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor5 == GlobalStaticVariables.EMPTY_COLOR) && + (TextColor == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -137,8 +137,8 @@ public Color BackColor1 } } - private bool ShouldSerializeBackColor1() => BackColor1 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor1() => BackColor1 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor1() => BackColor1 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor1() => BackColor1 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the first background color for the ribbon item. @@ -146,7 +146,7 @@ public Color BackColor1 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor1(PaletteState state) => - BackColor1 != GlobalStaticValues.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); + BackColor1 != GlobalStaticVariables.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); #endregion @@ -173,8 +173,8 @@ public Color BackColor2 } } - private bool ShouldSerializeBackColor2() => BackColor2 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor2() => BackColor2 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor2() => BackColor2 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor2() => BackColor2 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second background color for the ribbon item. @@ -182,7 +182,7 @@ public Color BackColor2 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor2(PaletteState state) => - BackColor2 != GlobalStaticValues.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); + BackColor2 != GlobalStaticVariables.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); #endregion @@ -209,8 +209,8 @@ public Color BackColor3 } } - private bool ShouldSerializeBackColor3() => BackColor3 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor3() => BackColor3 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor3() => BackColor3 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor3() => BackColor3 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the third background color for the ribbon item. @@ -218,7 +218,7 @@ public Color BackColor3 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor3(PaletteState state) => - BackColor3 != GlobalStaticValues.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); + BackColor3 != GlobalStaticVariables.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); #endregion @@ -245,8 +245,8 @@ public Color BackColor4 } } - private bool ShouldSerializeBackColor4() => BackColor4 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor4() => BackColor4 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor4() => BackColor4 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor4() => BackColor4 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fourth background color for the ribbon item. @@ -254,7 +254,7 @@ public Color BackColor4 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor4(PaletteState state) => - BackColor4 != GlobalStaticValues.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); + BackColor4 != GlobalStaticVariables.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); #endregion @@ -281,8 +281,8 @@ public Color BackColor5 } } - private bool ShouldSerializeBackColor5() => BackColor5 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor5() => BackColor5 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor5() => BackColor5 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor5() => BackColor5 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fifth background color for the ribbon item. @@ -290,7 +290,7 @@ public Color BackColor5 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor5(PaletteState state) => - BackColor5 != GlobalStaticValues.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); + BackColor5 != GlobalStaticVariables.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); #endregion @@ -317,8 +317,8 @@ public Color TextColor } } - private bool ShouldSerializeTextColor() => TextColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetTextColor() => TextColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeTextColor() => TextColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetTextColor() => TextColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the tab color for the item text. @@ -326,7 +326,7 @@ public Color TextColor /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonTextColor(PaletteState state) => - TextColor != GlobalStaticValues.EMPTY_COLOR ? TextColor : _inheritText.GetRibbonTextColor(state); + TextColor != GlobalStaticVariables.EMPTY_COLOR ? TextColor : _inheritText.GetRibbonTextColor(state); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleInheritOverride.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleInheritOverride.cs index fa339eca33..c555551aee 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleInheritOverride.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleInheritOverride.cs @@ -118,7 +118,7 @@ public override Color GetRibbonBackColor1(PaletteState state) { Color ret = _primaryBack.GetRibbonBackColor1(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backupBack.GetRibbonBackColor1(state); } @@ -142,7 +142,7 @@ public override Color GetRibbonBackColor2(PaletteState state) { Color ret = _primaryBack.GetRibbonBackColor2(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backupBack.GetRibbonBackColor2(state); } @@ -166,7 +166,7 @@ public override Color GetRibbonBackColor3(PaletteState state) { Color ret = _primaryBack.GetRibbonBackColor3(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backupBack.GetRibbonBackColor3(state); } @@ -190,7 +190,7 @@ public override Color GetRibbonBackColor4(PaletteState state) { Color ret = _primaryBack.GetRibbonBackColor4(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backupBack.GetRibbonBackColor4(state); } @@ -214,7 +214,7 @@ public override Color GetRibbonBackColor5(PaletteState state) { Color ret = _primaryBack.GetRibbonBackColor5(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backupBack.GetRibbonBackColor5(state); } @@ -240,7 +240,7 @@ public override Color GetRibbonTextColor(PaletteState state) { Color ret = _primaryText.GetRibbonTextColor(Override ? OverrideState : state); - if (ret == GlobalStaticValues.EMPTY_COLOR) + if (ret == GlobalStaticVariables.EMPTY_COLOR) { ret = _backupText.GetRibbonTextColor(state); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleRedirect.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleRedirect.cs index b052339802..e419de8a07 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleRedirect.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonDoubleRedirect.cs @@ -55,12 +55,12 @@ public PaletteRibbonDoubleRedirect(PaletteRedirect redirect, _inheritText = new PaletteRibbonTextInheritRedirect(redirect!, textStyle); // Define default values - _backColor1 = GlobalStaticValues.EMPTY_COLOR; - _backColor2 = GlobalStaticValues.EMPTY_COLOR; - _backColor3 = GlobalStaticValues.EMPTY_COLOR; - _backColor4 = GlobalStaticValues.EMPTY_COLOR; - _backColor5 = GlobalStaticValues.EMPTY_COLOR; - _textColor = GlobalStaticValues.EMPTY_COLOR; + _backColor1 = GlobalStaticVariables.EMPTY_COLOR; + _backColor2 = GlobalStaticVariables.EMPTY_COLOR; + _backColor3 = GlobalStaticVariables.EMPTY_COLOR; + _backColor4 = GlobalStaticVariables.EMPTY_COLOR; + _backColor5 = GlobalStaticVariables.EMPTY_COLOR; + _textColor = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -82,12 +82,12 @@ public void SetRedirector(PaletteRedirect redirect) /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (BackColor1 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor2 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor3 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor4 == GlobalStaticValues.EMPTY_COLOR) && - (BackColor5 == GlobalStaticValues.EMPTY_COLOR) && - (TextColor == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (BackColor1 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor2 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor3 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor4 == GlobalStaticVariables.EMPTY_COLOR) && + (BackColor5 == GlobalStaticVariables.EMPTY_COLOR) && + (TextColor == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -123,8 +123,8 @@ public Color BackColor1 } } - private bool ShouldSerializeBackColor1() => BackColor1 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor1() => BackColor1 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor1() => BackColor1 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor1() => BackColor1 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the first background color for the ribbon item. @@ -132,7 +132,7 @@ public Color BackColor1 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor1(PaletteState state) => - BackColor1 != GlobalStaticValues.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); + BackColor1 != GlobalStaticVariables.EMPTY_COLOR ? BackColor1 : _inheritBack.GetRibbonBackColor1(state); #endregion @@ -159,8 +159,8 @@ public Color BackColor2 } } - private bool ShouldSerializeBackColor2() => BackColor2 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor2() => BackColor2 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor2() => BackColor2 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor2() => BackColor2 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the second background color for the ribbon item. @@ -168,7 +168,7 @@ public Color BackColor2 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor2(PaletteState state) => - BackColor2 != GlobalStaticValues.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); + BackColor2 != GlobalStaticVariables.EMPTY_COLOR ? BackColor2 : _inheritBack.GetRibbonBackColor2(state); #endregion @@ -195,8 +195,8 @@ public Color BackColor3 } } - private bool ShouldSerializeBackColor3() => BackColor3 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor3() => BackColor3 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor3() => BackColor3 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor3() => BackColor3 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the third background color for the ribbon item. @@ -204,7 +204,7 @@ public Color BackColor3 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor3(PaletteState state) => - BackColor3 != GlobalStaticValues.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); + BackColor3 != GlobalStaticVariables.EMPTY_COLOR ? BackColor3 : _inheritBack.GetRibbonBackColor3(state); #endregion @@ -231,8 +231,8 @@ public Color BackColor4 } } - private bool ShouldSerializeBackColor4() => BackColor4 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor4() => BackColor4 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor4() => BackColor4 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor4() => BackColor4 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fourth background color for the ribbon item. @@ -240,7 +240,7 @@ public Color BackColor4 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor4(PaletteState state) => - BackColor4 != GlobalStaticValues.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); + BackColor4 != GlobalStaticVariables.EMPTY_COLOR ? BackColor4 : _inheritBack.GetRibbonBackColor4(state); #endregion @@ -267,8 +267,8 @@ public Color BackColor5 } } - private bool ShouldSerializeBackColor5() => BackColor5 != GlobalStaticValues.EMPTY_COLOR; - private void ResetBackColor5() => BackColor5 = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeBackColor5() => BackColor5 != GlobalStaticVariables.EMPTY_COLOR; + private void ResetBackColor5() => BackColor5 = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the fifth background color for the ribbon item. @@ -276,7 +276,7 @@ public Color BackColor5 /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonBackColor5(PaletteState state) => - BackColor5 != GlobalStaticValues.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); + BackColor5 != GlobalStaticVariables.EMPTY_COLOR ? BackColor5 : _inheritBack.GetRibbonBackColor5(state); #endregion @@ -303,8 +303,8 @@ public Color TextColor } } - private bool ShouldSerializeTextColor() => TextColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetTextColor() => TextColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeTextColor() => TextColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetTextColor() => TextColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the tab color for the item text. @@ -312,7 +312,7 @@ public Color TextColor /// Palette value should be applicable to this state. /// Color value. public Color GetRibbonTextColor(PaletteState state) => - TextColor != GlobalStaticValues.EMPTY_COLOR ? TextColor : _inheritText.GetRibbonTextColor(state); + TextColor != GlobalStaticVariables.EMPTY_COLOR ? TextColor : _inheritText.GetRibbonTextColor(state); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonFileAppTab.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonFileAppTab.cs index 9cdf18f227..858e49a6eb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonFileAppTab.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonFileAppTab.cs @@ -38,9 +38,9 @@ public PaletteRibbonFileAppTab([DisallowNull] IPaletteRibbonFileAppTab inherit, NeedPaint = needPaint; // Set default values - _ribbonFileAppTabBottomColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - _ribbonFileAppTabTopColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - _ribbonFileAppTabTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + _ribbonFileAppTabBottomColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + _ribbonFileAppTabTopColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + _ribbonFileAppTabTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; } #endregion @@ -98,8 +98,8 @@ public Color RibbonFileAppTabBottomColor } } } - private void ResetRibbonFileAppTabBottomColor() => RibbonFileAppTabBottomColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private bool ShouldSerializeRibbonFileAppTabBottomColor() => RibbonFileAppTabBottomColor != GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private void ResetRibbonFileAppTabBottomColor() => RibbonFileAppTabBottomColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private bool ShouldSerializeRibbonFileAppTabBottomColor() => RibbonFileAppTabBottomColor != GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; /// public Color GetRibbonFileAppTabBottomColor(PaletteState state) => ShouldSerializeRibbonFileAppTabBottomColor() @@ -129,8 +129,8 @@ public Color RibbonFileAppTabTopColor } } } - private void ResetRibbonFileAppTabTopColor() => RibbonFileAppTabTopColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private bool ShouldSerializeRibbonFileAppTabTopColor() => RibbonFileAppTabTopColor != GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private void ResetRibbonFileAppTabTopColor() => RibbonFileAppTabTopColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private bool ShouldSerializeRibbonFileAppTabTopColor() => RibbonFileAppTabTopColor != GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; /// public Color GetRibbonFileAppTabTopColor(PaletteState state) => ShouldSerializeRibbonFileAppTabTopColor() @@ -162,8 +162,8 @@ public Color RibbonFileAppTabTextColor } } } - private void ResetRibbonFileAppTabTextColor() => RibbonFileAppTabTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; - private bool ShouldSerializeRibbonFileAppTabTextColor() => RibbonFileAppTabTextColor != GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private void ResetRibbonFileAppTabTextColor() => RibbonFileAppTabTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private bool ShouldSerializeRibbonFileAppTabTextColor() => RibbonFileAppTabTextColor != GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; /// public Color GetRibbonFileAppTabTextColor(PaletteState state) => ShouldSerializeRibbonFileAppTabTextColor() diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonGeneral.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonGeneral.cs index f7081d825d..aed636b421 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonGeneral.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonGeneral.cs @@ -64,30 +64,30 @@ public PaletteRibbonGeneral([DisallowNull] IPaletteRibbonGeneral inherit, // Set default values _contextTextAlign = PaletteRelativeAlign.Inherit; - _contextTextColor = GlobalStaticValues.EMPTY_COLOR; + _contextTextColor = GlobalStaticVariables.EMPTY_COLOR; _contextTextFont = null; - _disabledDarkColor = GlobalStaticValues.EMPTY_COLOR; - _disabledLightColor = GlobalStaticValues.EMPTY_COLOR; - _dialogDarkColor = GlobalStaticValues.EMPTY_COLOR; - _dialogLightColor = GlobalStaticValues.EMPTY_COLOR; - _dropArrowLightColor = GlobalStaticValues.EMPTY_COLOR; - _dropArrowDarkColor = GlobalStaticValues.EMPTY_COLOR; - _groupSeparatorDark = GlobalStaticValues.EMPTY_COLOR; - _groupSeparatorLight = GlobalStaticValues.EMPTY_COLOR; - _minimizeBarDarkColor = GlobalStaticValues.EMPTY_COLOR; - _minimizeBarLightColor = GlobalStaticValues.EMPTY_COLOR; - _tabBackgroundGradientRaftingDarkColor = GlobalStaticValues.EMPTY_COLOR; - _tabBackgroundGradientRaftingLightColor = GlobalStaticValues.EMPTY_COLOR; - _tabRowBackgroundSolidColor = GlobalStaticValues.EMPTY_COLOR; - _tabRowBackgroundGradientFirstColor = GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; - _ribbonTabRowGradientRaftingAngle = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + _disabledDarkColor = GlobalStaticVariables.EMPTY_COLOR; + _disabledLightColor = GlobalStaticVariables.EMPTY_COLOR; + _dialogDarkColor = GlobalStaticVariables.EMPTY_COLOR; + _dialogLightColor = GlobalStaticVariables.EMPTY_COLOR; + _dropArrowLightColor = GlobalStaticVariables.EMPTY_COLOR; + _dropArrowDarkColor = GlobalStaticVariables.EMPTY_COLOR; + _groupSeparatorDark = GlobalStaticVariables.EMPTY_COLOR; + _groupSeparatorLight = GlobalStaticVariables.EMPTY_COLOR; + _minimizeBarDarkColor = GlobalStaticVariables.EMPTY_COLOR; + _minimizeBarLightColor = GlobalStaticVariables.EMPTY_COLOR; + _tabBackgroundGradientRaftingDarkColor = GlobalStaticVariables.EMPTY_COLOR; + _tabBackgroundGradientRaftingLightColor = GlobalStaticVariables.EMPTY_COLOR; + _tabRowBackgroundSolidColor = GlobalStaticVariables.EMPTY_COLOR; + _tabRowBackgroundGradientFirstColor = GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; + _ribbonTabRowGradientRaftingAngle = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; _ribbonShape = PaletteRibbonShape.Inherit; - _tabSeparatorColor = GlobalStaticValues.EMPTY_COLOR; - _tabSeparatorContextColor = GlobalStaticValues.EMPTY_COLOR; + _tabSeparatorColor = GlobalStaticVariables.EMPTY_COLOR; + _tabSeparatorContextColor = GlobalStaticVariables.EMPTY_COLOR; _textFont = null; _textHint = PaletteTextHint.Inherit; - _qatButtonDarkColor = GlobalStaticValues.EMPTY_COLOR; - _qatButtonLightColor = GlobalStaticValues.EMPTY_COLOR; + _qatButtonDarkColor = GlobalStaticVariables.EMPTY_COLOR; + _qatButtonLightColor = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -259,8 +259,8 @@ public Color ContextTextColor } } } - private void ResetContextTextColor() => ContextTextColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeContextTextColor() => ContextTextColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetContextTextColor() => ContextTextColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeContextTextColor() => ContextTextColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color of the ribbon caption text. @@ -295,8 +295,8 @@ public Color DisabledDark } } } - private void ResetDisabledDark() => DisabledDark = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeDisabledDark() => DisabledDark != GlobalStaticValues.EMPTY_COLOR; + private void ResetDisabledDark() => DisabledDark = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeDisabledDark() => DisabledDark != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the dark disabled color used for ribbon glyphs. @@ -330,8 +330,8 @@ public Color DisabledLight } } } - private void ResetDisabledLight() => DisabledLight = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeDisabledLight() => DisabledLight != GlobalStaticValues.EMPTY_COLOR; + private void ResetDisabledLight() => DisabledLight = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeDisabledLight() => DisabledLight != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the light disabled color used for ribbon glyphs. @@ -365,8 +365,8 @@ public Color GroupDialogDark } } } - private void ResetGroupDialogDark() => GroupDialogDark = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeGroupDialogDark() => GroupDialogDark != GlobalStaticValues.EMPTY_COLOR; + private void ResetGroupDialogDark() => GroupDialogDark = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeGroupDialogDark() => GroupDialogDark != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the dialog launcher dark. @@ -401,8 +401,8 @@ public Color GroupDialogLight } } } - private void ResetGroupDialogLight() => GroupDialogLight = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeGroupDialogLight() => GroupDialogLight != GlobalStaticValues.EMPTY_COLOR; + private void ResetGroupDialogLight() => GroupDialogLight = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeGroupDialogLight() => GroupDialogLight != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the dialog launcher light. @@ -437,8 +437,8 @@ public Color DropArrowDark } } } - private void ResetDropArrowDark() => DropArrowDark = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeDropArrowDark() => DropArrowDark != GlobalStaticValues.EMPTY_COLOR; + private void ResetDropArrowDark() => DropArrowDark = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeDropArrowDark() => DropArrowDark != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the drop arrow dark color. @@ -472,8 +472,8 @@ public Color DropArrowLight } } } - private void ResetDropArrowLight() => DropArrowLight = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeDropArrowLight() => DropArrowLight != GlobalStaticValues.EMPTY_COLOR; + private void ResetDropArrowLight() => DropArrowLight = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeDropArrowLight() => DropArrowLight != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the drop arrow light. @@ -508,8 +508,8 @@ public Color GroupSeparatorDark } } } - private void ResetGroupSeparatorDark() => GroupSeparatorDark = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeGroupSeparatorDark() => GroupSeparatorDark != GlobalStaticValues.EMPTY_COLOR; + private void ResetGroupSeparatorDark() => GroupSeparatorDark = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeGroupSeparatorDark() => GroupSeparatorDark != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the dialog launcher dark. @@ -544,8 +544,8 @@ public Color GroupSeparatorLight } } } - private void ResetGroupSeparatorLight() => GroupSeparatorLight = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeGroupSeparatorLight() => GroupSeparatorLight != GlobalStaticValues.EMPTY_COLOR; + private void ResetGroupSeparatorLight() => GroupSeparatorLight = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeGroupSeparatorLight() => GroupSeparatorLight != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the dialog launcher light. @@ -580,8 +580,8 @@ public Color MinimizeBarDarkColor } } } - private void ResetMinimizeBarDarkColor() => MinimizeBarDarkColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeMinimizeBarDarkColor() => MinimizeBarDarkColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetMinimizeBarDarkColor() => MinimizeBarDarkColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeMinimizeBarDarkColor() => MinimizeBarDarkColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the ribbon minimize bar dark. @@ -616,8 +616,8 @@ public Color MinimizeBarLightColor } } } - private void ResetMinimizeBarLightColor() => MinimizeBarLightColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeMinimizeBarLightColor() => MinimizeBarLightColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetMinimizeBarLightColor() => MinimizeBarLightColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeMinimizeBarLightColor() => MinimizeBarLightColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the ribbon minimize bar light. @@ -653,8 +653,8 @@ public Color TabRowBackgroundSolidColor } } } - private void ResetTabRowBackgroundSolidColor() => TabRowBackgroundSolidColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeTabRowBackgroundSolidColor() => TabRowBackgroundSolidColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetTabRowBackgroundSolidColor() => TabRowBackgroundSolidColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeTabRowBackgroundSolidColor() => TabRowBackgroundSolidColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the solid color for the ribbon tab row. @@ -690,8 +690,8 @@ public Color TabRowBackgroundGradientRaftingDarkColor } } } - private void ResetTabRowBackgroundGradientRaftingDarkColor() => TabRowBackgroundGradientRaftingDarkColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeTabRowBackgroundGradientRaftingDarkColor() => TabRowBackgroundGradientRaftingDarkColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetTabRowBackgroundGradientRaftingDarkColor() => TabRowBackgroundGradientRaftingDarkColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeTabRowBackgroundGradientRaftingDarkColor() => TabRowBackgroundGradientRaftingDarkColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the dark Gradient rafting color for the ribbon tab row. @@ -727,8 +727,8 @@ public Color TabRowBackgroundGradientRaftingLightColor } } } - private void ResetTabRowBackgroundGradientRaftingLightColor() => TabRowBackgroundGradientRaftingLightColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeTabRowBackgroundGradientRaftingLightColor() => TabRowBackgroundGradientRaftingLightColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetTabRowBackgroundGradientRaftingLightColor() => TabRowBackgroundGradientRaftingLightColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeTabRowBackgroundGradientRaftingLightColor() => TabRowBackgroundGradientRaftingLightColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the light rafting color for the ribbon tab row. @@ -764,8 +764,8 @@ public Color TabRowBackgroundGradientFirstColor } } } - private void ResetTabRowBackgroundGradientFirstColor() => TabRowBackgroundGradientFirstColor = GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; - private bool ShouldSerializeTabRowBackgroundGradientFirstColor() => TabRowBackgroundGradientFirstColor != GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + private void ResetTabRowBackgroundGradientFirstColor() => TabRowBackgroundGradientFirstColor = GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; + private bool ShouldSerializeTabRowBackgroundGradientFirstColor() => TabRowBackgroundGradientFirstColor != GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public Color GetRibbonTabRowGradientColor1(PaletteState state) => ShouldSerializeTabRowBackgroundGradientFirstColor() @@ -782,7 +782,7 @@ public Color GetRibbonTabRowGradientColor1(PaletteState state) => ShouldSerializ [KryptonPersist(false)] [Category(@"Visuals")] [Description(@"Ribbon tab row background gradient rafting angle.")] - [DefaultValue(GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT)] + [DefaultValue(GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT)] [RefreshProperties(RefreshProperties.All)] public float RibbonTabRowGradientRaftingAngle { @@ -798,9 +798,9 @@ public float RibbonTabRowGradientRaftingAngle } } private void ResetRibbonTabRowGradientRaftingAngle() => RibbonTabRowGradientRaftingAngle = - GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; private bool ShouldSerializeRibbonTabRowGradientRaftingAngle() => RibbonTabRowGradientRaftingAngle != - GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; /// /// Gets the rafting angle for the ribbon tab row. @@ -868,8 +868,8 @@ public Color TabSeparatorColor } } } - private void ResetTabSeparatorColor() => TabSeparatorColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeTabSeparatorColor() => TabSeparatorColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetTabSeparatorColor() => TabSeparatorColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeTabSeparatorColor() => TabSeparatorColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the tab separator. @@ -904,8 +904,8 @@ public Color TabSeparatorContextColor } } } - private void ResetTabSeparatorContextColor() => TabSeparatorContextColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeTabSeparatorContextColor() => TabSeparatorContextColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetTabSeparatorContextColor() => TabSeparatorContextColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeTabSeparatorContextColor() => TabSeparatorContextColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the tab context separator. @@ -1010,8 +1010,8 @@ public Color QATButtonDarkColor } } } - private void ResetQATButtonDarkColor() => QATButtonDarkColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeQATButtonDarkColor() => QATButtonDarkColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetQATButtonDarkColor() => QATButtonDarkColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeQATButtonDarkColor() => QATButtonDarkColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the extra QAT button dark content color. @@ -1046,8 +1046,8 @@ public Color QATButtonLightColor } } } - private void ResetQATButtonLightColor() => QATButtonLightColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeQATButtonLightColor() => QATButtonLightColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetQATButtonLightColor() => QATButtonLightColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeQATButtonLightColor() => QATButtonLightColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the color for the extra QAT button light content color. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonText.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonText.cs index dd17b2a0d5..c48f35ace0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonText.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteRibbon/PaletteRibbonText.cs @@ -46,7 +46,7 @@ public PaletteRibbonText(IPaletteRibbonText? inheritText, NeedPaint = needPaint; // Define default values - _textColor = GlobalStaticValues.EMPTY_COLOR; + _textColor = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -56,7 +56,7 @@ public PaletteRibbonText(IPaletteRibbonText? inheritText, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => TextColor == GlobalStaticValues.EMPTY_COLOR; + public override bool IsDefault => TextColor == GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -105,17 +105,17 @@ public Color TextColor } } - private bool ShouldSerializeTextColor() => TextColor != GlobalStaticValues.EMPTY_COLOR; - private void ResetTextColor() => TextColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeTextColor() => TextColor != GlobalStaticVariables.EMPTY_COLOR; + private void ResetTextColor() => TextColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the tab color for the item text. /// /// Palette value should be applicable to this state. /// Color value. - public Color GetRibbonTextColor(PaletteState state) => TextColor != GlobalStaticValues.EMPTY_COLOR + public Color GetRibbonTextColor(PaletteState state) => TextColor != GlobalStaticVariables.EMPTY_COLOR ? TextColor - : (_inheritText?.GetRibbonTextColor(state) ?? GlobalStaticValues.EMPTY_COLOR); + : (_inheritText?.GetRibbonTextColor(state) ?? GlobalStaticVariables.EMPTY_COLOR); #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs index d7d2f217f3..9d4893c04e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteTab/PaletteTabBorder.cs @@ -38,8 +38,8 @@ public PaletteTabBorder(IPaletteBorder inherit, [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => (Draw == InheritBool.Inherit) && (GraphicsHint == PaletteGraphicsHint.Inherit) && - (Color1 == GlobalStaticValues.EMPTY_COLOR) && - (Color2 == GlobalStaticValues.EMPTY_COLOR) && + (Color1 == GlobalStaticVariables.EMPTY_COLOR) && + (Color2 == GlobalStaticVariables.EMPTY_COLOR) && (ColorStyle == PaletteColorStyle.Inherit) && (ColorAlign == PaletteRectangleAlign.Inherit) && (ColorAngle == -1) && 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 530264583e..d757807ba7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/PaletteBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/PaletteBase.cs @@ -888,7 +888,7 @@ public virtual Color GetButtonSpecImageTransparentColor(PaletteButtonSpecStyle s switch (style) { case PaletteButtonSpecStyle.Generic: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteButtonSpecStyle.Close: case PaletteButtonSpecStyle.Context: case PaletteButtonSpecStyle.Next: @@ -912,7 +912,7 @@ public virtual Color GetButtonSpecImageTransparentColor(PaletteButtonSpecStyle s case PaletteButtonSpecStyle.WorkspaceRestore: case PaletteButtonSpecStyle.RibbonMinimize: case PaletteButtonSpecStyle.RibbonExpand: - return GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + return GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; case PaletteButtonSpecStyle.New: case PaletteButtonSpecStyle.Open: case PaletteButtonSpecStyle.SaveAll: @@ -927,12 +927,12 @@ public virtual Color GetButtonSpecImageTransparentColor(PaletteButtonSpecStyle s case PaletteButtonSpecStyle.PrintPreview: case PaletteButtonSpecStyle.Print: case PaletteButtonSpecStyle.QuickPrint: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); DebugTools.NotImplemented(style.ToString()); - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } } @@ -1142,7 +1142,7 @@ public virtual Color GetButtonSpecColorMap(PaletteButtonSpecStyle style) case PaletteButtonSpecStyle.PrintPreview: case PaletteButtonSpecStyle.Print: case PaletteButtonSpecStyle.QuickPrint: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteButtonSpecStyle.Close: case PaletteButtonSpecStyle.Context: case PaletteButtonSpecStyle.Next: @@ -1163,7 +1163,7 @@ public virtual Color GetButtonSpecColorMap(PaletteButtonSpecStyle style) // Should never happen! Debug.Assert(false); DebugTools.NotImplemented(style.ToString()); - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } } @@ -1191,7 +1191,7 @@ public virtual Color GetButtonSpecColorTransparent(PaletteButtonSpecStyle style) case PaletteButtonSpecStyle.PrintPreview: case PaletteButtonSpecStyle.Print: case PaletteButtonSpecStyle.QuickPrint: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteButtonSpecStyle.Close: case PaletteButtonSpecStyle.Context: case PaletteButtonSpecStyle.Next: @@ -1215,12 +1215,12 @@ public virtual Color GetButtonSpecColorTransparent(PaletteButtonSpecStyle style) case PaletteButtonSpecStyle.WorkspaceRestore: case PaletteButtonSpecStyle.RibbonMinimize: case PaletteButtonSpecStyle.RibbonExpand: - return GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + return GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; default: // Should never happen! Debug.Assert(false); DebugTools.NotImplemented(style.ToString()); - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } } @@ -2355,7 +2355,7 @@ public virtual Color GetSchemeExtraColor(SchemeExtraColors colorIndex) lock (_colorLock) { var idx = (int)colorIndex; - return idx >= 0 && idx < _extraColors.Length ? _extraColors[idx] : GlobalStaticValues.EMPTY_COLOR; + return idx >= 0 && idx < _extraColors.Length ? _extraColors[idx] : GlobalStaticVariables.EMPTY_COLOR; } } @@ -2414,7 +2414,7 @@ protected static Color GetRibbonGroupTextColor(PaletteState state, Color trackin if (state is PaletteState.Tracking or PaletteState.CheckedTracking) { - return trackingColor != GlobalStaticValues.EMPTY_COLOR && !trackingColor.IsEmpty + return trackingColor != GlobalStaticVariables.EMPTY_COLOR && !trackingColor.IsEmpty ? trackingColor : defaultColor; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/Schemes/EmptySchemeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/Schemes/EmptySchemeBase.cs index ebbbf7df7a..a35977befb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/Schemes/EmptySchemeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Base/Schemes/EmptySchemeBase.cs @@ -11,245 +11,245 @@ namespace Krypton.Toolkit; public sealed class EmptySchemeBase : KryptonColorSchemeBase { - public override Color TextLabelControl { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TextButtonNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TextButtonChecked { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalDefaultBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalDefaultBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalDefaultBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalNavigatorBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNormalNavigatorBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color PanelClient { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color PanelAlternative { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ControlBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color SeparatorHighBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color SeparatorHighBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderPrimaryBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderPrimaryBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderSecondaryBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderSecondaryBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color StatusStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color SeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color SeparatorDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GripLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GripDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ToolStripBack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color StatusStripLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color StatusStripDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ImageMargin { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ToolStripBegin { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ToolStripMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ToolStripEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color OverflowBegin { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color OverflowMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color OverflowEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ToolStripBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderActive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderInactive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderActiveLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderActiveDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderInactiveLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderInactiveDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderHeaderActive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderHeaderInactive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderHeaderActive1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderHeaderActive2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderHeaderInactive1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormBorderHeaderInactive2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormHeaderShortActive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormHeaderShortInactive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormHeaderLongActive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormHeaderLongInactive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBorderTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack1Track { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack2Track { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBorderPressed { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack1Pressed { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack2Pressed { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TextButtonFormNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TextButtonFormTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TextButtonFormPressed { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color LinkNotVisitedOverrideControl { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color LinkVisitedOverrideControl { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color LinkPressedOverrideControl { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color LinkNotVisitedOverridePanel { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color LinkVisitedOverridePanel { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color LinkPressedOverridePanel { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TextLabelPanel { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTextNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTextChecked { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabSelected1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabSelected2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabSelected3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabSelected4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabSelected5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabHighlight1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabHighlight2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabHighlight3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabHighlight4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabHighlight5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabSeparatorColor { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupsArea1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupsArea2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupsArea3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupsArea4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupsArea5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupDialogDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupDialogLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonMinimizeBarDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonMinimizeBarLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AlternatePressedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AlternatePressedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AlternatePressedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AlternatePressedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack1Checked { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack2Checked { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBorderCheck { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack1CheckTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color FormButtonBack2CheckTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini1I { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini2I { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini3I { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini4I { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATMini5I { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATFullbar1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATFullbar2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATFullbar3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATButtonDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATButtonLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATOverflow1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonQATOverflow2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupSeparatorDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonClusterButtonBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonClusterButtonBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonClusterButtonBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonClusterButtonBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color NavigatorMiniBackColor { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridListNormal1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridListNormal2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridListPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridListPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridListSelected { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetColNormal1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetColNormal2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetColPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetColPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetColSelected1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetColSelected2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetRowNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetRowPressed { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridSheetRowSelected { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridDataCellBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color GridDataCellSelected { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlTextNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlTextDisabled { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlBorderNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlBorderDisabled { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlBackNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlBackDisabled { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputControlBackInactive { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputDropDownNormal1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputDropDownNormal2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputDropDownDisabled1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color InputDropDownDisabled2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ContextMenuHeadingBack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ContextMenuHeadingText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ContextMenuImageColumn { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonOuter1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonOuter2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonOuter3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonInner2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonMenuDocsBack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color AppButtonMenuDocsText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color SeparatorHighInternalBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color SeparatorHighInternalBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGalleryBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGalleryBackNormal { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGalleryBackTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGalleryBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGalleryBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color TextLabelControl { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TextButtonNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TextButtonChecked { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalDefaultBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalDefaultBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalDefaultBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalNavigatorBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNormalNavigatorBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color PanelClient { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color PanelAlternative { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ControlBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color SeparatorHighBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color SeparatorHighBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderPrimaryBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderPrimaryBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderSecondaryBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderSecondaryBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color StatusStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color SeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color SeparatorDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GripLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GripDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ToolStripBack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color StatusStripLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color StatusStripDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ImageMargin { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ToolStripBegin { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ToolStripMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ToolStripEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color OverflowBegin { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color OverflowMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color OverflowEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ToolStripBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderActive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderInactive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderActiveLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderActiveDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderInactiveLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderInactiveDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderHeaderActive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderHeaderInactive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderHeaderActive1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderHeaderActive2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderHeaderInactive1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormBorderHeaderInactive2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormHeaderShortActive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormHeaderShortInactive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormHeaderLongActive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormHeaderLongInactive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBorderTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack1Track { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack2Track { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBorderPressed { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack1Pressed { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack2Pressed { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TextButtonFormNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TextButtonFormTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TextButtonFormPressed { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color LinkNotVisitedOverrideControl { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color LinkVisitedOverrideControl { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color LinkPressedOverrideControl { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color LinkNotVisitedOverridePanel { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color LinkVisitedOverridePanel { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color LinkPressedOverridePanel { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TextLabelPanel { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTextNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTextChecked { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabSelected1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabSelected2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabSelected3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabSelected4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabSelected5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabHighlight1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabHighlight2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabHighlight3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabHighlight4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabHighlight5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabSeparatorColor { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupsArea1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupsArea2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupsArea3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupsArea4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupsArea5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupDialogDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupDialogLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonMinimizeBarDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonMinimizeBarLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AlternatePressedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AlternatePressedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AlternatePressedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AlternatePressedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack1Checked { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack2Checked { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBorderCheck { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack1CheckTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color FormButtonBack2CheckTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini1I { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini2I { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini3I { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini4I { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATMini5I { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATFullbar1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATFullbar2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATFullbar3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATButtonDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATButtonLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATOverflow1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonQATOverflow2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupSeparatorDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonClusterButtonBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonClusterButtonBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonClusterButtonBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonClusterButtonBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color NavigatorMiniBackColor { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridListNormal1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridListNormal2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridListPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridListPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridListSelected { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetColNormal1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetColNormal2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetColPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetColPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetColSelected1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetColSelected2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetRowNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetRowPressed { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridSheetRowSelected { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridDataCellBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color GridDataCellSelected { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlTextNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlTextDisabled { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlBorderNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlBorderDisabled { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlBackNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlBackDisabled { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputControlBackInactive { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputDropDownNormal1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputDropDownNormal2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputDropDownDisabled1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color InputDropDownDisabled2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ContextMenuHeadingBack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ContextMenuHeadingText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ContextMenuImageColumn { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonOuter1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonOuter2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonOuter3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonInner2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonMenuDocsBack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color AppButtonMenuDocsText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color SeparatorHighInternalBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color SeparatorHighInternalBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGalleryBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGalleryBackNormal { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGalleryBackTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGalleryBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGalleryBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Bases/PaletteMaterialBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Bases/PaletteMaterialBase.cs index c51568aada..dba9758d64 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Bases/PaletteMaterialBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Bases/PaletteMaterialBase.cs @@ -551,7 +551,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } if (style == PaletteBorderStyle.FormMain || style == PaletteBorderStyle.HeaderForm) diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialDark.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialDark.cs index 88f067f0ce..ccdee185e5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialDark.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialDark.cs @@ -41,7 +41,7 @@ static PaletteMaterialDark() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialLight.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialLight.cs index c69fd157bb..be053850d2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialLight.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/PaletteMaterialLight.cs @@ -41,7 +41,7 @@ static PaletteMaterialLight() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialDark_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialDark_BaseScheme.cs index da0cbd3c7c..8d62b4bf23 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialDark_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialDark_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteMaterialDark_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 218, 223); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(222, 225, 230); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -221,11 +221,11 @@ public sealed class PaletteMaterialDark_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(247, 247, 247); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(225, 225, 225); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(103, 103, 103); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialLight_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialLight_BaseScheme.cs index fb1440dec8..eea00d4562 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialLight_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Material/Schemes/PaletteMaterialLight_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteMaterialLight_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -221,14 +221,14 @@ public sealed class PaletteMaterialLight_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(236, 243, 251); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(193, 213, 241); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(215, 233, 251); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(0, 21, 110); - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color HeaderDockInactiveBack1 { get; set; } = Color.FromArgb(208, 226, 248); public override Color HeaderDockInactiveBack2 { get; set; } = Color.FromArgb(178, 196, 218); public override Color ButtonNavigatorBorder { get; set; } = Color.FromArgb(133, 158, 191); 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 98905f9096..2306ee80e7 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 @@ -402,7 +402,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -457,17 +457,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -609,7 +609,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -619,7 +619,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -683,7 +683,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -737,9 +737,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -865,7 +865,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -875,7 +875,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -902,7 +902,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] @@ -1209,15 +1209,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1265,7 +1265,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1273,7 +1273,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1286,7 +1286,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1337,15 +1337,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1393,7 +1393,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1401,7 +1401,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1619,7 +1619,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1819,12 +1819,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1840,12 +1840,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1861,12 +1861,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2179,7 +2179,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2189,9 +2189,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2274,7 +2274,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2679,7 +2679,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2755,7 +2755,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3748,7 +3748,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3784,7 +3784,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3802,7 +3802,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3916,7 +3916,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3928,7 +3928,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3970,7 +3970,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4005,7 +4005,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4052,7 +4052,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4087,7 +4087,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4126,7 +4126,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -4169,7 +4169,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4255,7 +4255,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4267,7 +4267,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4290,7 +4290,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4328,7 +4328,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4372,21 +4372,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4420,21 +4420,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeAlternateBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeAlternateBase.cs index a73de60951..adf43d86ed 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeAlternateBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeAlternateBase.cs @@ -355,7 +355,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -410,17 +410,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -598,7 +598,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack1Checked, PaletteState.Tracking => BaseColors.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack1CheckTrack, @@ -608,7 +608,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -672,7 +672,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -726,9 +726,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -890,7 +890,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack2Checked, PaletteState.Tracking => BaseColors.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack2CheckTrack, @@ -900,7 +900,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -927,7 +927,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors.ButtonNormalBack2 @@ -1260,15 +1260,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1316,7 +1316,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1324,7 +1324,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1337,7 +1337,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1388,15 +1388,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1444,7 +1444,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1452,7 +1452,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1612,7 +1612,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1812,12 +1812,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1833,12 +1833,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1854,12 +1854,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2083,16 +2083,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2181,7 +2181,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2588,7 +2588,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2669,7 +2669,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3664,7 +3664,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3700,7 +3700,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3718,7 +3718,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3832,7 +3832,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3844,7 +3844,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3886,7 +3886,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3921,7 +3921,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3968,7 +3968,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4003,7 +4003,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4042,7 +4042,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors.RibbonGroupBorder5; @@ -4085,7 +4085,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4169,7 +4169,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4181,7 +4181,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4204,7 +4204,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4242,7 +4242,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4286,21 +4286,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch { @@ -4334,21 +4334,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeBase.cs index 816a254200..3093462f03 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeBase.cs @@ -358,7 +358,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -413,17 +413,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -601,7 +601,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack1Checked, PaletteState.Tracking => BaseColors.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack1CheckTrack, @@ -611,7 +611,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -675,7 +675,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -729,9 +729,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -893,7 +893,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack2Checked, PaletteState.Tracking => BaseColors.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack2CheckTrack, @@ -903,7 +903,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -930,7 +930,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors.ButtonNormalBack2 @@ -1281,17 +1281,17 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking - or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, @@ -1341,7 +1341,7 @@ or PaletteState.CheckedPressed : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1349,7 +1349,7 @@ or PaletteState.CheckedPressed }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1367,7 +1367,7 @@ or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1419,17 +1419,17 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking - or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, @@ -1479,7 +1479,7 @@ or PaletteState.CheckedPressed : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1487,7 +1487,7 @@ or PaletteState.CheckedPressed }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1649,7 +1649,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1848,12 +1848,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1869,12 +1869,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1890,12 +1890,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2121,16 +2121,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2237,7 +2237,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2648,7 +2648,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2735,7 +2735,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3733,7 +3733,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3769,7 +3769,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3787,7 +3787,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3901,7 +3901,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3913,7 +3913,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3955,7 +3955,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3990,7 +3990,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4037,7 +4037,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4072,7 +4072,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4111,7 +4111,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors.RibbonGroupBorder5; @@ -4154,7 +4154,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4240,7 +4240,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4252,7 +4252,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4275,7 +4275,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4313,7 +4313,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4357,21 +4357,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch { @@ -4405,21 +4405,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueDarkModeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueDarkModeBase.cs index e870803d7e..a91da1d3db 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueDarkModeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueDarkModeBase.cs @@ -358,7 +358,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -416,17 +416,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -584,7 +584,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -594,7 +594,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -659,7 +659,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -713,9 +713,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -854,7 +854,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -864,7 +864,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -891,7 +891,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 @@ -1226,15 +1226,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1282,7 +1282,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1290,7 +1290,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1303,7 +1303,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1355,15 +1355,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1411,7 +1411,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1419,7 +1419,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1579,7 +1579,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1779,12 +1779,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1800,12 +1800,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1821,12 +1821,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2050,16 +2050,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2149,7 +2149,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2561,7 +2561,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2637,7 +2637,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3627,7 +3627,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3663,7 +3663,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3681,7 +3681,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3795,7 +3795,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3807,7 +3807,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3849,7 +3849,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3884,7 +3884,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3931,7 +3931,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3966,7 +3966,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4005,7 +4005,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4048,7 +4048,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4134,7 +4134,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4146,7 +4146,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4169,7 +4169,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4207,7 +4207,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4251,21 +4251,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4299,21 +4299,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueLightModeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueLightModeBase.cs index cdd89d8956..cd1d6b93b5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueLightModeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueLightModeBase.cs @@ -358,7 +358,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -413,17 +413,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.PanelAlternative; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.PanelAlternative; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -601,7 +601,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack1Checked, PaletteState.Tracking => BaseColors.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack1CheckTrack, @@ -611,7 +611,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -675,7 +675,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -729,9 +729,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.PanelAlternative, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.PanelAlternative, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -893,7 +893,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack2Checked, PaletteState.Tracking => BaseColors.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack2CheckTrack, @@ -903,7 +903,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -930,7 +930,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors.ButtonNormalBack2 @@ -1262,15 +1262,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1318,7 +1318,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1326,7 +1326,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1339,7 +1339,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1390,15 +1390,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1446,7 +1446,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1454,7 +1454,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1614,7 +1614,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1813,12 +1813,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1834,12 +1834,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1855,12 +1855,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2084,16 +2084,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2183,7 +2183,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2595,7 +2595,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2676,7 +2676,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3673,7 +3673,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3711,7 +3711,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3729,7 +3729,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3845,7 +3845,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3857,7 +3857,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3899,7 +3899,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3936,7 +3936,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3984,7 +3984,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) @@ -4022,7 +4022,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4062,7 +4062,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors.RibbonGroupBorder5; @@ -4106,7 +4106,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4190,7 +4190,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4202,7 +4202,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4225,7 +4225,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4263,7 +4263,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4307,21 +4307,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4355,21 +4355,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverDarkModeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverDarkModeBase.cs index 4ac1465f38..c5e88c238c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverDarkModeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverDarkModeBase.cs @@ -400,7 +400,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -456,17 +456,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -684,7 +684,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -738,9 +738,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -877,7 +877,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack2Checked, PaletteState.Tracking => BaseColors.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack2CheckTrack, @@ -887,7 +887,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -914,7 +914,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors.ButtonNormalBack2 @@ -1247,15 +1247,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1303,7 +1303,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1311,7 +1311,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1324,7 +1324,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1375,15 +1375,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1431,7 +1431,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1439,7 +1439,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1599,7 +1599,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1798,12 +1798,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1819,12 +1819,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1840,12 +1840,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2069,16 +2069,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2168,7 +2168,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2580,7 +2580,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2661,7 +2661,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3656,7 +3656,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3694,7 +3694,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3712,7 +3712,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3830,7 +3830,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3842,7 +3842,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! @@ -3885,7 +3885,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3921,7 +3921,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3969,7 +3969,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4005,7 +4005,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4045,7 +4045,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors.RibbonGroupBorder5; @@ -4089,7 +4089,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4174,7 +4174,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4186,7 +4186,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4209,7 +4209,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4247,7 +4247,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4291,21 +4291,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4339,21 +4339,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverLightModeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverLightModeBase.cs index 13c7ad995c..b7837e3fca 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverLightModeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365SilverLightModeBase.cs @@ -357,7 +357,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -413,17 +413,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -601,7 +601,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack1Checked, PaletteState.Tracking => BaseColors.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack1CheckTrack, @@ -611,7 +611,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -675,7 +675,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -729,9 +729,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -893,7 +893,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBack2Checked, PaletteState.Tracking => BaseColors.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors.FormButtonBack2CheckTrack, @@ -903,7 +903,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -930,7 +930,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors.ButtonNormalBack2 @@ -1263,15 +1263,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1319,7 +1319,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1327,7 +1327,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1340,7 +1340,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1391,15 +1391,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1447,7 +1447,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors.FormButtonBorderPressed, @@ -1455,7 +1455,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1615,7 +1615,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1814,12 +1814,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1835,12 +1835,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1856,12 +1856,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2085,16 +2085,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2184,7 +2184,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2596,7 +2596,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2677,7 +2677,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3672,7 +3672,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3709,7 +3709,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3727,7 +3727,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3845,7 +3845,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3858,7 +3858,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3900,7 +3900,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3936,7 +3936,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3984,7 +3984,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4020,7 +4020,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4060,7 +4060,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors.RibbonGroupBorder5; @@ -4103,7 +4103,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4188,7 +4188,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4200,7 +4200,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4223,7 +4223,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4261,7 +4261,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4305,21 +4305,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4354,21 +4354,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 6e5800d1ae..98b6bc43a5 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 @@ -147,7 +147,7 @@ static PaletteMicrosoft365BlackDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -334,15 +334,15 @@ public PaletteMicrosoft365BlackDarkMode() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 6e9395c699..39007af1ab 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 @@ -149,7 +149,7 @@ static PaletteMicrosoft365BlackDarkModeAlternate() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -335,15 +335,15 @@ public PaletteMicrosoft365BlackDarkModeAlternate() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 89d9c74957..acfa8071bd 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 @@ -144,7 +144,7 @@ static PaletteMicrosoft365BlueDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -325,15 +325,15 @@ public PaletteMicrosoft365BlueDarkMode() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 93e4432680..17fec3d3cb 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 @@ -150,7 +150,7 @@ static PaletteMicrosoft365BlueLightMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -331,15 +331,15 @@ public PaletteMicrosoft365BlueLightMode() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 a346346df4..d80c966e9f 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 @@ -146,7 +146,7 @@ static PaletteMicrosoft365SilverDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -326,15 +326,15 @@ public PaletteMicrosoft365SilverDarkMode() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 1faf8fdd41..ed6559aca7 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 @@ -149,7 +149,7 @@ static PaletteMicrosoft365SilverLightMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -329,15 +329,15 @@ public PaletteMicrosoft365SilverLightMode() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme.cs index c09d3f0a9d..d8af5a66b3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme.cs @@ -101,8 +101,8 @@ public sealed class PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme : Krypt public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(77, 77, 77); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(235, 235, 235); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(215, 219, 224); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitle1 { get; set; } = Color.FromArgb(182, 184, 184); public override Color RibbonGroupTitle2 { get; set; } = Color.FromArgb(159, 160, 160); public override Color RibbonGroupBorderContext1 { get; set; } = Color.FromArgb(183, 183, 183); @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme : Krypt public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 218, 223); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(222, 225, 230); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonTextTracking { get; set; } = Color.Black; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme : Krypt public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(118, 128, 142); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(55, 60, 67); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(210, 217, 219); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(214, 222, 223); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(179, 188, 191); @@ -222,10 +222,10 @@ public sealed class PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme : Krypt public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); public override Color RibbonTabTracking3 { get; set; } = Color.FromArgb(129, 129, 129); - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(190, 190, 190); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(103, 103, 103); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(235, 235, 235); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365BlackDarkModeAlternate_BaseScheme : Krypt public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(91, 91, 91); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(73, 73, 73); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 201, 201); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(17, 17, 17); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkMode_BaseScheme.cs index 45e68aeef0..e92f6d1648 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlackDarkMode_BaseScheme.cs @@ -101,8 +101,8 @@ public sealed class PaletteMicrosoft365BlackDarkMode_BaseScheme : KryptonColorSc public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(65, 65, 65); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(235, 235, 235); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(215, 219, 224); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitle1 { get; set; } = Color.FromArgb(182, 184, 184); public override Color RibbonGroupTitle2 { get; set; } = Color.FromArgb(159, 160, 160); public override Color RibbonGroupBorderContext1 { get; set; } = Color.FromArgb(183, 183, 183); @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365BlackDarkMode_BaseScheme : KryptonColorSc public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 218, 223); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(222, 225, 230); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonTextTracking { get; set; } = Color.Black; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365BlackDarkMode_BaseScheme : KryptonColorSc public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(118, 128, 142); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(55, 60, 67); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(210, 217, 219); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(214, 222, 223); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(179, 188, 191); @@ -222,10 +222,10 @@ public sealed class PaletteMicrosoft365BlackDarkMode_BaseScheme : KryptonColorSc public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); public override Color RibbonTabTracking3 { get; set; } = Color.FromArgb(129, 129, 129); - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(190, 190, 190); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(42, 43, 43); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(235, 235, 235); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365BlackDarkMode_BaseScheme : KryptonColorSc public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(91, 91, 91); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(73, 73, 73); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 201, 201); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(17, 17, 17); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueDarkMode_BaseScheme.cs index d39de82b2c..f33dbbaa54 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueDarkMode_BaseScheme.cs @@ -101,8 +101,8 @@ public sealed class PaletteMicrosoft365BlueDarkMode_BaseScheme : KryptonColorSch public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(201, 217, 237); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(231, 242, 255); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(219, 230, 244); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitle1 { get; set; } = Color.FromArgb(193, 216, 242); public override Color RibbonGroupTitle2 { get; set; } = Color.FromArgb(193, 216, 242); public override Color RibbonGroupBorderContext1 { get; set; } = Color.FromArgb(202, 202, 202); @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365BlueDarkMode_BaseScheme : KryptonColorSch public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365BlueDarkMode_BaseScheme : KryptonColorSch public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(192, 220, 255); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(55, 100, 160); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(63, 122, 197); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(192, 212, 241); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(200, 219, 238); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(155, 183, 224); @@ -221,11 +221,11 @@ public sealed class PaletteMicrosoft365BlueDarkMode_BaseScheme : KryptonColorSch public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(236, 243, 251); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(193, 213, 241); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(215, 233, 251); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(63, 122, 197); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(63, 122, 197); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(21, 66, 139); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(63, 122, 197); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(21, 66, 139); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365BlueDarkMode_BaseScheme : KryptonColorSch public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueLightMode_BaseScheme.cs index 576e833bf9..40d29c6b45 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365BlueLightMode_BaseScheme.cs @@ -101,8 +101,8 @@ public sealed class PaletteMicrosoft365BlueLightMode_BaseScheme : KryptonColorSc public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(186, 209, 240); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(231, 242, 255); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(219, 230, 244); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitle1 { get; set; } = Color.FromArgb(193, 216, 242); public override Color RibbonGroupTitle2 { get; set; } = Color.FromArgb(193, 216, 242); public override Color RibbonGroupBorderContext1 { get; set; } = Color.FromArgb(202, 202, 202); @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365BlueLightMode_BaseScheme : KryptonColorSc public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365BlueLightMode_BaseScheme : KryptonColorSc public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(192, 220, 255); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(55, 100, 160); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(141, 178, 227); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(192, 212, 241); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(200, 219, 238); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(155, 183, 224); @@ -221,11 +221,11 @@ public sealed class PaletteMicrosoft365BlueLightMode_BaseScheme : KryptonColorSc public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(236, 243, 251); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(193, 213, 241); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(215, 233, 251); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(141, 178, 227); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(141, 178, 227); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(21, 66, 139); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(101, 147, 207); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(21, 66, 139); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365BlueLightMode_BaseScheme : KryptonColorSc public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverDarkMode_BaseScheme.cs index 8afa5d9543..7fb893b39f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverDarkMode_BaseScheme.cs @@ -101,8 +101,8 @@ public sealed class PaletteMicrosoft365SilverDarkMode_BaseScheme : KryptonColorS public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(153, 159, 200); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(249, 249, 249); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(243, 245, 249); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitle1 { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonGroupTitle2 { get; set; } = Color.FromArgb(52, 52, 52); public override Color RibbonGroupBorderContext1 { get; set; } = Color.FromArgb(183, 183, 183); @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365SilverDarkMode_BaseScheme : KryptonColorS public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365SilverDarkMode_BaseScheme : KryptonColorS public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(219, 218, 228); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(55, 100, 160); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(231, 234, 238); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(241, 243, 243); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(197, 198, 199); @@ -222,10 +222,10 @@ public sealed class PaletteMicrosoft365SilverDarkMode_BaseScheme : KryptonColorS public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); public override Color RibbonTabTracking3 { get; set; } = Color.FromArgb(106, 123, 164); - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(190, 190, 190); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(222, 226, 236); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(255, 255, 255); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365SilverDarkMode_BaseScheme : KryptonColorS public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverLightMode_BaseScheme.cs index 7318b74cfc..6403693eb4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Schemes/PaletteMicrosoft365SilverLightMode_BaseScheme.cs @@ -101,8 +101,8 @@ public sealed class PaletteMicrosoft365SilverLightMode_BaseScheme : KryptonColor public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(195, 198, 209); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(249, 249, 249); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(243, 245, 249); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitle1 { get; set; } = Color.FromArgb(223, 227, 239); public override Color RibbonGroupTitle2 { get; set; } = Color.FromArgb(195, 199, 209); public override Color RibbonGroupBorderContext1 { get; set; } = Color.FromArgb(183, 183, 183); @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365SilverLightMode_BaseScheme : KryptonColor public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(76, 83, 92); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365SilverLightMode_BaseScheme : KryptonColor public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(219, 218, 228); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(55, 100, 160); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(231, 234, 238); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(241, 243, 243); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(197, 198, 199); @@ -222,10 +222,10 @@ public sealed class PaletteMicrosoft365SilverLightMode_BaseScheme : KryptonColor public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); public override Color RibbonTabTracking3 { get; set; } = Color.FromArgb(194, 197, 204); - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(190, 190, 190); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(190, 190, 190); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(76, 83, 92); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(173, 177, 181); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(76, 83, 92); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365SilverLightMode_BaseScheme : KryptonColor public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 19d9c435d5..19803ce970 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 @@ -24,11 +24,11 @@ public class PaletteMicrosoft365Blue : PaletteMicrosoft365Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion @@ -149,7 +149,7 @@ static PaletteMicrosoft365Blue() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -329,15 +329,15 @@ public PaletteMicrosoft365Blue() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/Schemes/PaletteMicrosoft365Blue_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/Schemes/PaletteMicrosoft365Blue_BaseScheme.cs index a31f54292b..e683cb57d3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/Schemes/PaletteMicrosoft365Blue_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Non Official Themes/Schemes/PaletteMicrosoft365Blue_BaseScheme.cs @@ -101,45 +101,45 @@ public sealed class PaletteMicrosoft365Blue_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(239, 246, 253); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(221, 234, 247); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(216, 228, 242); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(56, 78, 115); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(221, 234, 247); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 160, 188); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(187, 206, 230); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(189, 203, 218); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(184, 199, 216); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(233, 241, 250); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(222, 233, 246); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(30, 57, 91); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupButtonText { get; set; } = Color.FromArgb(30, 57, 91); public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365Blue_BaseScheme : KryptonColorSchemeBase public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(222, 236, 252); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(123, 139, 156); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(145, 166, 194); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(192, 212, 241); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(200, 219, 238); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(155, 183, 224); @@ -210,7 +210,7 @@ public sealed class PaletteMicrosoft365Blue_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(195, 212, 235); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(114, 142, 173); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -225,7 +225,7 @@ public sealed class PaletteMicrosoft365Blue_BaseScheme : KryptonColorSchemeBase public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(200, 215, 233); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(147, 167, 195); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(147, 167, 195); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(56, 78, 115); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(151, 156, 163); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(39, 49, 60); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365Blue_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); 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 94e7ddd8ca..c50de928e9 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 @@ -27,9 +27,9 @@ public class PaletteMicrosoft365Black : PaletteMicrosoft365Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion Ribbon Specific Colors @@ -129,7 +129,7 @@ static PaletteMicrosoft365Black() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -316,15 +316,15 @@ public PaletteMicrosoft365Black() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 19e8741948..b3ef4a5a46 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 @@ -143,7 +143,7 @@ static PaletteMicrosoft365DarkGray() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -319,15 +319,15 @@ public PaletteMicrosoft365DarkGray() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365LightGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365LightGray.cs index 87d6822298..5b583623ce 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365LightGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365LightGray.cs @@ -16,15 +16,15 @@ public class PaletteMicrosoft365LightGray : PaletteMicrosoft365Base { #region Instance Fields - private readonly Color _tabRowBackgroundColor = GlobalStaticValues.EMPTY_COLOR; + private readonly Color _tabRowBackgroundColor = GlobalStaticVariables.EMPTY_COLOR; #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.EMPTY_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.EMPTY_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.EMPTY_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.EMPTY_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.EMPTY_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -54,15 +54,15 @@ public PaletteMicrosoft365LightGray( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 17163717eb..6256cc51c5 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 @@ -24,11 +24,11 @@ public class PaletteMicrosoft365Silver : PaletteMicrosoft365Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion @@ -149,7 +149,7 @@ static PaletteMicrosoft365Silver() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -329,15 +329,15 @@ public PaletteMicrosoft365Silver() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 9ebc4e1213..2fda940d6f 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 @@ -21,11 +21,11 @@ public class PaletteMicrosoft365White : PaletteMicrosoft365Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion @@ -146,7 +146,7 @@ static PaletteMicrosoft365White() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); @@ -333,15 +333,15 @@ public PaletteMicrosoft365White() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => Color.White; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Black_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Black_BaseScheme.cs index 8d0c915e8b..9c904a4b56 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Black_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Black_BaseScheme.cs @@ -101,46 +101,46 @@ public sealed class PaletteMicrosoft365Black_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(54, 54, 54); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(33, 33, 33); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(33, 33, 33); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(237, 237, 237); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(123, 125, 125); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(61, 61, 61); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(99, 99, 99); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(147, 147, 147); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(139, 139, 139); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(187, 187, 188); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(167, 167, 168); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365Black_BaseScheme : KryptonColorSchemeBase public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(161, 161, 161); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(68, 68, 68); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(32, 32, 32); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(210, 217, 219); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(214, 222, 223); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(179, 188, 191); @@ -210,7 +210,7 @@ public sealed class PaletteMicrosoft365Black_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(70, 70, 70); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(70, 70, 70); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(70, 70, 70); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(50, 50, 50); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -222,10 +222,10 @@ public sealed class PaletteMicrosoft365Black_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(176, 176, 176); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonTabTracking3 { get; set; } = Color.FromArgb(251, 248, 224); - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(32, 32, 32); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(32, 32, 32); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.White; public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(157, 157, 160); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(237, 237, 237); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365Black_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(91, 91, 91); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(73, 73, 73); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 201, 201); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(17, 17, 17); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365DarkGray_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365DarkGray_BaseScheme.cs index 7ba9fe6f52..4fb44f7c27 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365DarkGray_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365DarkGray_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteMicrosoft365DarkGray_BaseScheme : KryptonColorSchemeB public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(139, 136, 134); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,14 +221,14 @@ public sealed class PaletteMicrosoft365DarkGray_BaseScheme : KryptonColorSchemeB public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color HeaderDockInactiveBack1 { get; set; } = Color.FromArgb(237, 242, 248); public override Color HeaderDockInactiveBack2 { get; set; } = Color.FromArgb(207, 213, 220); public override Color ButtonNavigatorBorder { get; set; } = Color.FromArgb(161, 169, 179); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365DarkGray_BaseScheme : KryptonColorSchemeB public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Silver_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Silver_BaseScheme.cs index 9f1b2e23af..f99833c412 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Silver_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365Silver_BaseScheme.cs @@ -101,33 +101,33 @@ public sealed class PaletteMicrosoft365Silver_BaseScheme : KryptonColorSchemeBas public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(229, 233, 238); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(76, 83, 92); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(227, 230, 232); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 144, 151); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(227, 230, 232); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedBackT2 { get; set; } = Color.FromArgb(242, 244, 247); public override Color RibbonGroupCollapsedBackT3 { get; set; } = Color.FromArgb(238, 241, 245); public override Color RibbonGroupCollapsedBackT4 { get; set; } = Color.FromArgb(234, 235, 235); @@ -135,12 +135,12 @@ public sealed class PaletteMicrosoft365Silver_BaseScheme : KryptonColorSchemeBas public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(208, 212, 217); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(254, 254, 254); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(254, 254, 254); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(59, 59, 59); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365Silver_BaseScheme : KryptonColorSchemeBas public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(233, 237, 241); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(138, 144, 150); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(182, 186, 191); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(231, 234, 238); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(241, 243, 243); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(197, 198, 199); @@ -210,7 +210,7 @@ public sealed class PaletteMicrosoft365Silver_BaseScheme : KryptonColorSchemeBas public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(224, 227, 231); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(135, 140, 146); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -225,7 +225,7 @@ public sealed class PaletteMicrosoft365Silver_BaseScheme : KryptonColorSchemeBas public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(231, 233, 235); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(182, 186, 191); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(182, 186, 191); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(59, 59, 59); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(151, 156, 163); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(39, 49, 60); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365Silver_BaseScheme : KryptonColorSchemeBas public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365White_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365White_BaseScheme.cs index 0b936ef36f..e1ebf83c92 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365White_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/Schemes/PaletteMicrosoft365White_BaseScheme.cs @@ -101,33 +101,33 @@ public sealed class PaletteMicrosoft365White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea3 { get; set; } = Color.FromArgb(223, 223, 223); public override Color RibbonGroupsArea4 { get; set; } = Color.White; public override Color RibbonGroupsArea5 { get; set; } = Color.White; - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(102, 109, 124); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(240, 240, 240); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(207, 212, 218); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedBackT2 { get; set; } = Color.FromArgb(242, 244, 247); public override Color RibbonGroupCollapsedBackT3 { get; set; } = Color.FromArgb(238, 241, 245); public override Color RibbonGroupCollapsedBackT4 { get; set; } = Color.FromArgb(234, 235, 235); @@ -135,12 +135,12 @@ public sealed class PaletteMicrosoft365White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(208, 212, 217); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(254, 254, 254); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(254, 254, 254); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(59, 59, 59); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -168,7 +168,7 @@ public sealed class PaletteMicrosoft365White_BaseScheme : KryptonColorSchemeBase public override Color RibbonQATOverflow1 { get; set; } = Color.FromArgb(233, 237, 241); public override Color RibbonQATOverflow2 { get; set; } = Color.FromArgb(138, 144, 150); public override Color RibbonGroupSeparatorDark { get; set; } = Color.FromArgb(176, 182, 188); - public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupSeparatorLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color ButtonClusterButtonBack1 { get; set; } = Color.FromArgb(231, 234, 238); public override Color ButtonClusterButtonBack2 { get; set; } = Color.FromArgb(241, 243, 243); public override Color ButtonClusterButtonBorder1 { get; set; } = Color.FromArgb(197, 198, 199); @@ -210,7 +210,7 @@ public sealed class PaletteMicrosoft365White_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(224, 227, 231); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(135, 140, 146); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -225,7 +225,7 @@ public sealed class PaletteMicrosoft365White_BaseScheme : KryptonColorSchemeBase public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(231, 233, 235); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(176, 182, 188); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(176, 182, 188); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(90, 90, 90); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(151, 156, 163); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(99, 59, 59); @@ -240,12 +240,12 @@ public sealed class PaletteMicrosoft365White_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.Red; public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 9155970d1f..26f3a6a483 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 @@ -468,7 +468,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -523,16 +523,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -679,7 +679,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -742,7 +742,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -796,9 +796,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -927,7 +927,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -966,7 +966,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) }, PaletteState.NormalDefaultOverride => style switch { - PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticVariables.EMPTY_COLOR, _ => _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2] }, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] : GetArrayColor(ButtonBackColor.Color8), @@ -1836,15 +1836,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1892,7 +1892,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1913,7 +1913,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta ? _ribbonColors[(int)SchemeBaseColors.ButtonClusterButtonBorder1] : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1958,15 +1958,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2014,7 +2014,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -2179,7 +2179,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2386,12 +2386,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2408,12 +2408,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2430,12 +2430,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2671,7 +2671,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2681,9 +2681,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2760,7 +2760,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3172,7 +3172,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3246,7 +3246,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4378,7 +4378,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4541,9 +4541,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _focusTabFill; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4555,7 +4555,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4608,7 +4608,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside3] }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4620,7 +4620,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupCollapsedBackT3]; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4637,7 +4637,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4656,7 +4656,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea3]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea3]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4674,7 +4674,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4731,7 +4731,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside4] }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4743,7 +4743,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupCollapsedBackT4]; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4762,7 +4762,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4799,7 +4799,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4841,7 +4841,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini5] @@ -4885,7 +4885,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4967,7 +4967,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4979,7 +4979,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -5003,7 +5003,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5043,7 +5043,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5088,21 +5088,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -5137,21 +5137,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 029f68b351..b769e07f06 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 @@ -68,7 +68,7 @@ static PaletteOffice2007BlackDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -358,18 +358,18 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -379,13 +379,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } @@ -835,7 +835,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -890,16 +890,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -1082,7 +1082,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -1150,7 +1150,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1204,9 +1204,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1371,7 +1371,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1415,7 +1415,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) }, PaletteState.NormalDefaultOverride => style switch { - PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.ButtonNormalDefaultBack2 }, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), @@ -2284,15 +2284,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2340,7 +2340,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2361,7 +2361,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta ? BaseColors!.ButtonClusterButtonBorder1 : BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -2406,15 +2406,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2462,7 +2462,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2627,7 +2627,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2832,12 +2832,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2854,12 +2854,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2876,12 +2876,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -3114,16 +3114,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -3205,7 +3205,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3622,7 +3622,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3701,7 +3701,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4833,7 +4833,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4996,9 +4996,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _focusTabFill; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5010,7 +5010,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5063,7 +5063,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside3 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -5075,7 +5075,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT3; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5092,7 +5092,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -5111,7 +5111,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -5129,7 +5129,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5186,7 +5186,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside4 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -5198,7 +5198,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT4; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5217,7 +5217,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -5254,7 +5254,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5296,7 +5296,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -5340,7 +5340,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5418,7 +5418,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5430,7 +5430,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -5454,7 +5454,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5494,7 +5494,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5539,21 +5539,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -5588,21 +5588,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 97e48dbaf6..b9153b4fb3 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 @@ -67,7 +67,7 @@ static PaletteOffice2007BlueDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GalleryBlue); _radioButtonArray = @@ -202,18 +202,18 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -223,13 +223,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } @@ -682,7 +682,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -737,16 +737,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -929,7 +929,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -989,7 +989,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1043,9 +1043,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1210,7 +1210,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1246,7 +1246,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) }, PaletteState.NormalDefaultOverride => style switch { - PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.ButtonNormalDefaultBack2 }, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), @@ -1599,15 +1599,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1655,7 +1655,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1676,7 +1676,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta ? BaseColors!.ButtonClusterButtonBorder1 : BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1721,15 +1721,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1777,7 +1777,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1942,7 +1942,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2147,12 +2147,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2169,12 +2169,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2191,12 +2191,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2429,16 +2429,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2515,7 +2515,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2927,7 +2927,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3001,7 +3001,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4128,7 +4128,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4291,9 +4291,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _focusTabFill; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4305,7 +4305,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4358,7 +4358,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside3 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4370,7 +4370,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT3; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4387,7 +4387,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4406,7 +4406,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4424,7 +4424,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4481,7 +4481,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside4 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4493,7 +4493,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT4; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4512,7 +4512,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4549,7 +4549,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4591,7 +4591,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -4635,7 +4635,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4713,7 +4713,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4725,7 +4725,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4749,7 +4749,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4789,7 +4789,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4834,21 +4834,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4883,21 +4883,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 2f68a8ce52..5d06285fc4 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 @@ -69,7 +69,7 @@ static PaletteOffice2007BlueLightMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GalleryBlue); _radioButtonArray = @@ -204,18 +204,18 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -225,13 +225,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } @@ -651,7 +651,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -706,16 +706,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -898,7 +898,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -958,7 +958,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1012,9 +1012,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1179,7 +1179,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1215,7 +1215,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) }, PaletteState.NormalDefaultOverride => style switch { - PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.ButtonNormalDefaultBack2 }, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), @@ -2084,15 +2084,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2140,7 +2140,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2161,7 +2161,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta ? BaseColors!.ButtonClusterButtonBorder1 : BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -2206,15 +2206,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2262,7 +2262,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2427,7 +2427,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2632,12 +2632,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2654,12 +2654,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2676,12 +2676,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2914,16 +2914,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -3000,7 +3000,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3412,7 +3412,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3486,7 +3486,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4613,7 +4613,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4776,9 +4776,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _focusTabFill; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4790,7 +4790,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4843,7 +4843,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside3 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4855,7 +4855,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT3; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4872,7 +4872,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4891,7 +4891,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4909,7 +4909,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4966,7 +4966,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside4 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4978,7 +4978,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT4; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4997,7 +4997,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -5034,7 +5034,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5076,7 +5076,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -5120,7 +5120,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5198,7 +5198,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5210,7 +5210,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -5234,7 +5234,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5274,7 +5274,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5319,21 +5319,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -5368,21 +5368,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 c1edcb61ce..83244bf8e7 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 @@ -79,7 +79,7 @@ static PaletteOffice2007SilverDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -183,18 +183,18 @@ public PaletteOffice2007SilverDarkMode() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -204,13 +204,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } @@ -630,7 +630,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -686,16 +686,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -878,7 +878,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -938,7 +938,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -992,9 +992,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1159,7 +1159,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1195,7 +1195,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) }, PaletteState.NormalDefaultOverride => style switch { - PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.ButtonNormalDefaultBack2 }, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), @@ -2064,15 +2064,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2120,7 +2120,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2141,7 +2141,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta ? BaseColors!.ButtonClusterButtonBorder1 : BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -2186,15 +2186,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2242,7 +2242,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2407,7 +2407,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2612,12 +2612,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2634,12 +2634,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2656,12 +2656,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2894,16 +2894,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2980,7 +2980,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3392,7 +3392,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3466,7 +3466,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4592,7 +4592,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4753,9 +4753,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _focusTabFill; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4766,7 +4766,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4818,7 +4818,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside3 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4830,7 +4830,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT3; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4846,7 +4846,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4864,7 +4864,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4882,7 +4882,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4937,7 +4937,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside4 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4949,7 +4949,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT4; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4967,7 +4967,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -5003,7 +5003,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5044,7 +5044,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -5087,7 +5087,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5164,7 +5164,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5176,7 +5176,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -5200,7 +5200,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5240,7 +5240,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5285,21 +5285,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -5334,21 +5334,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 9481aacaa5..2b6adb27a6 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 @@ -79,7 +79,7 @@ static PaletteOffice2007SilverLightMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -183,18 +183,18 @@ public PaletteOffice2007SilverLightMode() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -204,13 +204,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } @@ -664,7 +664,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -720,16 +720,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -912,7 +912,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -972,7 +972,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1026,9 +1026,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1193,7 +1193,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1229,7 +1229,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) }, PaletteState.NormalDefaultOverride => style switch { - PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.ButtonNormalDefaultBack2 }, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), @@ -2102,15 +2102,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta return _disabledBorder; } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2158,7 +2158,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2179,7 +2179,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta ? BaseColors!.ButtonClusterButtonBorder1 : BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -2228,15 +2228,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta return _disabledBorder; } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -2284,7 +2284,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm or PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -2449,7 +2449,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2654,12 +2654,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2676,12 +2676,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2698,12 +2698,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2936,16 +2936,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -3022,7 +3022,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3434,7 +3434,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3508,7 +3508,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4625,7 +4625,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4782,9 +4782,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _focusTabFill; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4795,7 +4795,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4847,7 +4847,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside3 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4859,7 +4859,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT3; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4875,7 +4875,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4893,7 +4893,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea3; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4911,7 +4911,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4966,7 +4966,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.RibbonGroupFrameInside4 }; case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: @@ -4978,7 +4978,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupCollapsedBackT4; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4996,7 +4996,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -5032,7 +5032,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5073,7 +5073,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -5116,7 +5116,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -5193,7 +5193,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5205,7 +5205,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -5229,7 +5229,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5269,7 +5269,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -5314,21 +5314,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -5363,21 +5363,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlackDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlackDarkMode_BaseScheme.cs index 169a6bb62e..85d620940e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlackDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlackDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007BlackDarkMode_BaseScheme : KryptonColorSche public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 218, 223); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(222, 225, 230); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(70, 70, 70); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -221,35 +221,35 @@ public sealed class PaletteOffice2007BlackDarkMode_BaseScheme : KryptonColorSche public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(247, 247, 247); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(225, 225, 225); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(103, 103, 103); - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); public override Color TrackBarFillTrack { get; set; } = Color.FromArgb(131, 132, 132); - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarBorderPosition { get; set; } = Color.FromArgb(35, 35, 35); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueDarkMode_BaseScheme.cs index bebb454a16..0343fe9d0c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007BlueDarkMode_BaseScheme : KryptonColorSchem public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007BlueDarkMode_BaseScheme : KryptonColorSchem public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(236, 243, 251); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(193, 213, 241); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(215, 233, 251); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueLightMode_BaseScheme.cs index 83f6456dbc..407f956ce7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007BlueLightMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007BlueLightMode_BaseScheme : KryptonColorSche public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007BlueLightMode_BaseScheme : KryptonColorSche public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(236, 243, 251); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(193, 213, 241); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(215, 233, 251); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverDarkMode_BaseScheme.cs index 7fc497fbb4..ca18d4276c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007SilverDarkMode_BaseScheme : KryptonColorSch public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(76, 83, 92); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007SilverDarkMode_BaseScheme : KryptonColorSch public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(130, 130, 130); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(156, 160, 165); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverLightMode_BaseScheme.cs index fb9be06301..0d7adfd5a2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Extra Themes/Schemes/PaletteOffice2007SilverLightMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007SilverLightMode_BaseScheme : KryptonColorSc public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(76, 83, 92); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007SilverLightMode_BaseScheme : KryptonColorSc public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(130, 130, 130); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(156, 160, 165); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 efe4efbecf..5fee3bd56f 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 @@ -79,7 +79,7 @@ static PaletteOffice2007DarkGray() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -182,18 +182,18 @@ public PaletteOffice2007DarkGray() : base( #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -203,13 +203,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007LightGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007LightGray.cs index 9a6612b950..4d055d06c3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007LightGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/PaletteOffice2007LightGray.cs @@ -30,18 +30,18 @@ public PaletteOffice2007LightGray(string themeName, Color[] schemeColors, ImageL #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -51,13 +51,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file 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 772c73f05e..257ba403fd 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 @@ -74,7 +74,7 @@ static PaletteOffice2007White() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -183,18 +183,18 @@ public PaletteOffice2007White() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -204,13 +204,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007DarkGray_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007DarkGray_BaseScheme.cs index d6804f22a7..42b1a091e8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007DarkGray_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007DarkGray_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007DarkGray_BaseScheme : KryptonColorSchemeBas public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(68, 68, 68); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007DarkGray_BaseScheme : KryptonColorSchemeBas public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(130, 130, 130); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(156, 160, 165); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007White_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007White_BaseScheme.cs index 31d5e1d3b4..d55a5b1f01 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007White_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Non Official Themes/Schemes/PaletteOffice2007White_BaseScheme.cs @@ -101,33 +101,33 @@ public sealed class PaletteOffice2007White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea3 { get; set; } = Color.White; public override Color RibbonGroupsArea4 { get; set; } = Color.FromArgb(212, 212, 212); public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(212, 212, 212); - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(148, 149, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(180, 182, 183); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 144, 151); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(205, 209, 214); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedBackT2 { get; set; } = Color.FromArgb(242, 244, 247); public override Color RibbonGroupCollapsedBackT3 { get; set; } = Color.FromArgb(238, 241, 245); public override Color RibbonGroupCollapsedBackT4 { get; set; } = Color.FromArgb(234, 235, 235); @@ -135,12 +135,12 @@ public sealed class PaletteOffice2007White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(208, 212, 217); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(254, 254, 254); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(254, 254, 254); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb( 59, 59, 59); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -210,7 +210,7 @@ public sealed class PaletteOffice2007White_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(224, 227, 231); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(135, 140, 146); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -240,12 +240,12 @@ public sealed class PaletteOffice2007White_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.Red; public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 db9121ece9..f27dd89c91 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 @@ -81,7 +81,7 @@ static PaletteOffice2007Black() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -372,18 +372,18 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -393,13 +393,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file 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 64f460e0ce..5513a812e8 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 @@ -78,7 +78,7 @@ static PaletteOffice2007Blue() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GalleryBlue); _radioButtonArray = @@ -217,18 +217,18 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -238,13 +238,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file 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 c0c5e58623..03c6f2a42a 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 @@ -78,7 +78,7 @@ static PaletteOffice2007Silver() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.GallerySilverBlack); _radioButtonArray = @@ -188,18 +188,18 @@ public PaletteOffice2007Silver() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -209,13 +209,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Black_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Black_BaseScheme.cs index fb9f336954..2d8128ecf3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Black_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Black_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007Black_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 218, 223); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(222, 225, 230); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(70, 70, 70); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -221,35 +221,35 @@ public sealed class PaletteOffice2007Black_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(247, 247, 247); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(225, 225, 225); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(103, 103, 103); - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); public override Color TrackBarFillTrack { get; set; } = Color.FromArgb(131, 132, 132); - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarBorderPosition { get; set; } = Color.FromArgb(35, 35, 35); } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Blue_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Blue_BaseScheme.cs index 7a94303e6f..9b57729908 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Blue_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Blue_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007Blue_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb( 21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007Blue_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(236, 243, 251); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(193, 213, 241); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(215, 233, 251); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Silver_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Silver_BaseScheme.cs index 7034453135..14ade56838 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Silver_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2007/Official Themes/Schemes/PaletteOffice2007Silver_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2007Silver_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb( 76, 83, 92); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,31 +221,31 @@ public sealed class PaletteOffice2007Silver_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(130, 130, 130); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(156, 160, 165); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 690142a357..71cf9fdca4 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 @@ -388,7 +388,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -443,16 +443,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -592,7 +592,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -603,7 +603,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) return state switch { // TODO: Change disabled colour for all 2010, 2013 & 365 themes - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -663,7 +663,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -717,9 +717,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -845,7 +845,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -855,7 +855,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -882,7 +882,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1290,7 +1290,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch @@ -1301,11 +1301,11 @@ or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], @@ -1357,7 +1357,7 @@ PaletteState.Tracking or PaletteState.CheckedTracking or PaletteState.Pressed : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1365,7 +1365,7 @@ PaletteState.Tracking or PaletteState.CheckedTracking or PaletteState.Pressed }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1376,7 +1376,7 @@ PaletteState.Tracking or PaletteState.CheckedTracking or PaletteState.Pressed PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack2] : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1427,15 +1427,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1483,7 +1483,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1491,7 +1491,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1754,7 +1754,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2074,12 +2074,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2095,12 +2095,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2116,12 +2116,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2423,7 +2423,7 @@ PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or @@ -2436,9 +2436,9 @@ PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2543,7 +2543,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2944,7 +2944,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3020,7 +3020,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4006,7 +4006,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -4042,7 +4042,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4060,7 +4060,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4174,7 +4174,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4186,7 +4186,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4228,7 +4228,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4263,7 +4263,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4310,7 +4310,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4345,7 +4345,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4384,7 +4384,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -4427,7 +4427,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4509,7 +4509,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4521,7 +4521,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4544,7 +4544,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4582,7 +4582,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4626,21 +4626,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4674,21 +4674,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010BlackBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010BlackBase.cs index 6faaff86ff..28ba5bb335 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010BlackBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Bases/PaletteOffice2010BlackBase.cs @@ -391,7 +391,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -446,16 +446,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -595,7 +595,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -606,7 +606,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) return state switch { // TODO: Change disabled colour for all 2010, 2013 & 365 themes - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -666,7 +666,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -720,9 +720,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -848,7 +848,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -858,7 +858,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -885,7 +885,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1215,15 +1215,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1271,7 +1271,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1279,7 +1279,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1290,7 +1290,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1341,15 +1341,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1397,7 +1397,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1405,7 +1405,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1563,7 +1563,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1763,12 +1763,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1784,12 +1784,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1805,12 +1805,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2109,7 +2109,7 @@ PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or @@ -2119,9 +2119,9 @@ PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2226,7 +2226,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2627,7 +2627,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2703,7 +2703,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3695,7 +3695,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3731,7 +3731,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3749,7 +3749,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3863,7 +3863,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3875,7 +3875,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3917,7 +3917,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3952,7 +3952,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3999,7 +3999,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4034,7 +4034,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4073,7 +4073,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4116,7 +4116,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4200,7 +4200,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4212,7 +4212,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4235,7 +4235,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4273,7 +4273,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4317,21 +4317,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4365,21 +4365,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 e020ba9c1e..76d8e84493 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 @@ -40,7 +40,7 @@ public class PaletteOffice2010BlackDarkMode : PaletteOffice2010BlackDarkModeBase #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -98,7 +98,7 @@ static PaletteOffice2010BlackDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -285,7 +285,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -322,7 +322,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -359,7 +359,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -543,7 +543,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -554,7 +554,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; @@ -915,7 +915,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -970,16 +970,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -1155,7 +1155,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -1165,7 +1165,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -1225,7 +1225,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1279,9 +1279,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1443,7 +1443,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1453,7 +1453,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -1480,7 +1480,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1808,15 +1808,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1864,7 +1864,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1872,7 +1872,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1883,7 +1883,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1934,15 +1934,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1990,7 +1990,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1998,7 +1998,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -2156,7 +2156,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2354,12 +2354,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2375,12 +2375,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2396,12 +2396,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2698,16 +2698,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2791,7 +2791,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3197,7 +3197,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3279,7 +3279,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4270,7 +4270,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -4306,7 +4306,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4324,7 +4324,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4438,7 +4438,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4450,7 +4450,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4492,7 +4492,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4533,7 +4533,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4580,7 +4580,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4615,7 +4615,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4654,7 +4654,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4697,7 +4697,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4779,7 +4779,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4791,7 +4791,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4814,7 +4814,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4852,7 +4852,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4896,21 +4896,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4944,21 +4944,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 6eab15bbe3..978b6be29e 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 @@ -40,7 +40,7 @@ public class PaletteOffice2010BlueDarkMode : PaletteOffice2010BlueDarkModeBase #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -98,7 +98,7 @@ static PaletteOffice2010BlueDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -189,7 +189,7 @@ public PaletteOffice2010BlueDarkMode() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -200,7 +200,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; @@ -560,7 +560,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -615,16 +615,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -800,7 +800,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -810,7 +810,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -870,7 +870,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -924,9 +924,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1088,7 +1088,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1098,7 +1098,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -1125,7 +1125,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1453,15 +1453,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1509,7 +1509,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1517,7 +1517,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1528,7 +1528,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1579,15 +1579,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1635,7 +1635,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1643,7 +1643,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1801,7 +1801,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1999,12 +1999,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2020,12 +2020,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2041,12 +2041,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2343,16 +2343,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2431,7 +2431,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2832,7 +2832,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2908,7 +2908,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3894,7 +3894,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3930,7 +3930,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3948,7 +3948,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4062,7 +4062,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4074,7 +4074,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4116,7 +4116,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4151,7 +4151,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4198,7 +4198,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4233,7 +4233,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4272,7 +4272,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4315,7 +4315,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4397,7 +4397,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4409,7 +4409,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4432,7 +4432,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4470,7 +4470,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4514,21 +4514,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4562,21 +4562,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 707656cf64..eb3c08ed37 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 @@ -40,7 +40,7 @@ public class PaletteOffice2010BlueLightMode : PaletteOffice2010BlueLightModeBase #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -103,7 +103,7 @@ static PaletteOffice2010BlueLightMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -194,7 +194,7 @@ public PaletteOffice2010BlueLightMode() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -205,7 +205,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; @@ -547,7 +547,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -602,16 +602,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -787,7 +787,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -797,7 +797,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -857,7 +857,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -911,9 +911,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1075,7 +1075,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1085,7 +1085,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -1112,7 +1112,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1440,15 +1440,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1496,7 +1496,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1504,7 +1504,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1515,7 +1515,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1566,15 +1566,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1622,7 +1622,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1630,7 +1630,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1788,7 +1788,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1986,12 +1986,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2007,12 +2007,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2028,12 +2028,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2330,16 +2330,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2418,7 +2418,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2819,7 +2819,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2895,7 +2895,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3881,7 +3881,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3917,7 +3917,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3935,7 +3935,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4049,7 +4049,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4061,7 +4061,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4103,7 +4103,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4138,7 +4138,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4185,7 +4185,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4220,7 +4220,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4259,7 +4259,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4302,7 +4302,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4384,7 +4384,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4396,7 +4396,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4419,7 +4419,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4457,7 +4457,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4501,21 +4501,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4549,21 +4549,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 d78eebf2a7..9aca6cb0bc 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 @@ -40,7 +40,7 @@ public class PaletteOffice2010SilverDarkMode : PaletteOffice2010SilverDarkModeBa #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -98,7 +98,7 @@ static PaletteOffice2010SilverDarkMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -189,7 +189,7 @@ public PaletteOffice2010SilverDarkMode() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -200,7 +200,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; @@ -544,7 +544,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride) || _ribbonColors is null) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -599,16 +599,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -784,7 +784,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -794,7 +794,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -854,7 +854,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride) || _ribbonColors is null) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -908,9 +908,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1072,7 +1072,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1082,7 +1082,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -1109,7 +1109,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1437,15 +1437,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1493,7 +1493,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1501,7 +1501,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1512,7 +1512,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1563,15 +1563,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1619,7 +1619,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1627,7 +1627,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1785,7 +1785,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1983,12 +1983,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2004,12 +2004,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2025,12 +2025,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2320,7 +2320,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } // Always work out value for an override state @@ -2333,16 +2333,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2426,13 +2426,13 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2838,13 +2838,13 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2924,13 +2924,13 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3890,7 +3890,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3929,7 +3929,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3965,7 +3965,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3983,7 +3983,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4012,7 +4012,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4103,7 +4103,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4115,7 +4115,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4137,7 +4137,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4163,7 +4163,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4198,7 +4198,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4227,7 +4227,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4251,7 +4251,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4286,7 +4286,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4315,7 +4315,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4331,7 +4331,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4374,7 +4374,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4405,7 +4405,7 @@ public override Color GetRibbonTextColor(PaletteRibbonTextStyle style, PaletteSt // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -4462,7 +4462,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4474,7 +4474,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4498,12 +4498,12 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4542,12 +4542,12 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4589,7 +4589,7 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4597,21 +4597,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4643,7 +4643,7 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat // Without _ribbonColors nothing goes if (_ribbonColors is null || _ribbonColors.Length == 0) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4651,21 +4651,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 e8976edd4c..a15c7b1ee7 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 @@ -40,7 +40,7 @@ public class PaletteOffice2010SilverLightMode : PaletteOffice2010SilverLightMode #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -98,7 +98,7 @@ static PaletteOffice2010SilverLightMode() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -189,7 +189,7 @@ public PaletteOffice2010SilverLightMode() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -200,7 +200,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; @@ -563,7 +563,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -618,16 +618,16 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: return style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5), @@ -803,7 +803,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -813,7 +813,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -873,7 +873,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -927,9 +927,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1091,7 +1091,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -1101,7 +1101,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -1128,7 +1128,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1456,15 +1456,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1512,7 +1512,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1520,7 +1520,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1531,7 +1531,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1582,15 +1582,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1638,7 +1638,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1646,7 +1646,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1804,7 +1804,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -2002,12 +2002,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2023,12 +2023,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2044,12 +2044,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2346,16 +2346,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2434,7 +2434,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2835,7 +2835,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2911,7 +2911,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3897,7 +3897,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3933,7 +3933,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3951,7 +3951,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4065,7 +4065,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4077,7 +4077,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4119,7 +4119,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4154,7 +4154,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4201,7 +4201,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4236,7 +4236,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4275,7 +4275,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -4318,7 +4318,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4400,7 +4400,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4412,7 +4412,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4435,7 +4435,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4473,7 +4473,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4517,21 +4517,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4565,21 +4565,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlackDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlackDarkMode_BaseScheme.cs index b1555fb4a5..edfd415d36 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlackDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlackDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2010BlackDarkMode_BaseScheme : KryptonColorSche public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 218, 223); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(222, 225, 230); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -225,7 +225,7 @@ public sealed class PaletteOffice2010BlackDarkMode_BaseScheme : KryptonColorSche public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(120, 120, 120); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(128, 128, 128); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(0, 0, 0); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(225, 225, 225); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(225, 225, 225); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(103, 103, 103); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010BlackDarkMode_BaseScheme : KryptonColorSche public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(91, 91, 91); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(73, 73, 73); public override Color ToolTipBottom { get; set; } = Color.FromArgb(91, 91, 91); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(17, 17, 17); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueDarkMode_BaseScheme.cs index 447b071f86..8cd1cd05d5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2010BlueDarkMode_BaseScheme : KryptonColorSchem public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -225,7 +225,7 @@ public sealed class PaletteOffice2010BlueDarkMode_BaseScheme : KryptonColorSchem public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(141, 168, 203); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(63, 122, 197); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(195, 217, 242); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(21, 66, 139); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(63, 122, 197); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(21, 66, 139); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010BlueDarkMode_BaseScheme : KryptonColorSchem public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueLightMode_BaseScheme.cs index 979c6fa2fc..7db46aa27c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010BlueLightMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2010BlueLightMode_BaseScheme : KryptonColorSche public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(214, 228, 246); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(227, 236, 248); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(21, 66, 139); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -225,7 +225,7 @@ public sealed class PaletteOffice2010BlueLightMode_BaseScheme : KryptonColorSche public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(168, 200, 234); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(165, 191, 213); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(195, 217, 242); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(21, 66, 139); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(101, 147, 207); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(21, 66, 139); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010BlueLightMode_BaseScheme : KryptonColorSche public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverDarkMode_BaseScheme.cs index 80568d3d31..2912b1cb5a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2010SilverDarkMode_BaseScheme : KryptonColorSch public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -212,7 +212,7 @@ public sealed class PaletteOffice2010SilverDarkMode_BaseScheme : KryptonColorSch public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(217, 221, 226); public override Color AppButtonInner1 { get; set; } = Color.FromArgb(250, 250, 250); public override Color AppButtonInner2 { get; set; } = Color.FromArgb(169, 174, 180); - public override Color AppButtonMenuDocsBack { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonMenuDocsBack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonMenuDocsText { get; set; } = Color.FromArgb(255, 255, 255); public override Color SeparatorHighInternalBorder1 { get; set; } = Color.FromArgb(168, 167, 191); public override Color SeparatorHighInternalBorder2 { get; set; } = Color.FromArgb(119, 118, 151); @@ -225,7 +225,7 @@ public sealed class PaletteOffice2010SilverDarkMode_BaseScheme : KryptonColorSch public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(119, 134, 172); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(173, 177, 181); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(124, 124, 148); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(222, 226, 236); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010SilverDarkMode_BaseScheme : KryptonColorSch public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverLightMode_BaseScheme.cs index 365d1c3471..d9ed6c63bb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Extra Themes/Schemes/PaletteOffice2010SilverLightMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2010SilverLightMode_BaseScheme : KryptonColorSc public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(76, 83, 92); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -225,7 +225,7 @@ public sealed class PaletteOffice2010SilverLightMode_BaseScheme : KryptonColorSc public override Color RibbonTabTracking4 { get; set; } = Color.FromArgb(224, 225, 231); public override Color RibbonGroupBorder3 { get; set; } = Color.FromArgb(195, 198, 209); public override Color RibbonGroupBorder4 { get; set; } = Color.FromArgb(232, 235, 237); - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupTitleText { get; set; } = Color.FromArgb(76, 83, 92); public override Color RibbonDropArrowLight { get; set; } = Color.FromArgb(232, 235, 237); public override Color RibbonDropArrowDark { get; set; } = Color.FromArgb(24, 24, 24); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010SilverLightMode_BaseScheme : KryptonColorSc public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 2b9ba36c8e..ed6c86532f 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 @@ -36,7 +36,7 @@ public class PaletteOffice2010DarkGray : PaletteOffice2010Base #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -94,7 +94,7 @@ static PaletteOffice2010DarkGray() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -185,7 +185,7 @@ public PaletteOffice2010DarkGray() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -196,7 +196,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010LightGray.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010LightGray.cs index 886c137538..8224dbbf78 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010LightGray.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/PaletteOffice2010LightGray.cs @@ -26,17 +26,17 @@ public class PaletteOffice2010LightGray : PaletteOffice2010Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.EMPTY_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.EMPTY_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.EMPTY_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.EMPTY_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.EMPTY_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -56,7 +56,7 @@ public PaletteOffice2010LightGray(Color[] schemeColors, ImageList checkBoxList, /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -67,7 +67,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; 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 70de7f53bf..8737b8a54f 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 @@ -29,17 +29,17 @@ public class PaletteOffice2010White : PaletteOffice2010Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -96,7 +96,7 @@ static PaletteOffice2010White() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -198,7 +198,7 @@ public PaletteOffice2010White() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -209,7 +209,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010DarkGray_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010DarkGray_BaseScheme.cs index 19420d9f19..958c15329f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010DarkGray_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010DarkGray_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2010DarkGray_BaseScheme : KryptonColorSchemeBas public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(68, 68, 68); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,14 +221,14 @@ public sealed class PaletteOffice2010DarkGray_BaseScheme : KryptonColorSchemeBas public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color HeaderDockInactiveBack1 { get; set; } = Color.FromArgb(237, 242, 248); public override Color HeaderDockInactiveBack2 { get; set; } = Color.FromArgb(207, 213, 220); public override Color ButtonNavigatorBorder { get; set; } = Color.FromArgb(161, 169, 179); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010DarkGray_BaseScheme : KryptonColorSchemeBas public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010White_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010White_BaseScheme.cs index 176adb3b31..cc5906929c 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010White_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Non Official Themes/Schemes/PaletteOffice2010White_BaseScheme.cs @@ -101,33 +101,33 @@ public sealed class PaletteOffice2010White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea3 { get; set; } = Color.White; public override Color RibbonGroupsArea4 { get; set; } = Color.White; public override Color RibbonGroupsArea5 { get; set; } = Color.White; - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(180, 180, 180); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(102, 102, 102); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 144, 151); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(205, 209, 214); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedBackT2 { get; set; } = Color.FromArgb(242, 244, 247); public override Color RibbonGroupCollapsedBackT3 { get; set; } = Color.FromArgb(238, 241, 245); public override Color RibbonGroupCollapsedBackT4 { get; set; } = Color.FromArgb(234, 235, 235); @@ -135,12 +135,12 @@ public sealed class PaletteOffice2010White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(208, 212, 217); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(254, 254, 254); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(254, 254, 254); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb( 59, 59, 59); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -210,7 +210,7 @@ public sealed class PaletteOffice2010White_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(224, 227, 231); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(135, 140, 146); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010White_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.Red; public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 2ac1cd8082..c43a79b7c5 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 @@ -44,7 +44,7 @@ public class PaletteOffice2010Black : PaletteOffice2010BlackBase #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -115,7 +115,7 @@ static PaletteOffice2010Black() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -210,7 +210,7 @@ public PaletteOffice2010Black() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -221,7 +221,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; 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 9f0f68be4b..66abd786af 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 @@ -29,17 +29,17 @@ public class PaletteOffice2010Blue : PaletteOffice2010Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -96,7 +96,7 @@ static PaletteOffice2010Blue() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -187,7 +187,7 @@ public PaletteOffice2010Blue() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -198,7 +198,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; 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 894b4d2996..424f269ca5 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 @@ -29,17 +29,17 @@ public class PaletteOffice2010Silver : PaletteOffice2010Base #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -96,7 +96,7 @@ static PaletteOffice2010Silver() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -187,7 +187,7 @@ public PaletteOffice2010Silver() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -198,7 +198,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Black_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Black_BaseScheme.cs index e28f1d0358..89c88201a9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Black_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Black_BaseScheme.cs @@ -103,44 +103,44 @@ public sealed class PaletteOffice2010Black_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(145, 145, 145); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(159, 159, 159); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(194, 194, 194); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(92, 92, 92); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(54, 54, 54); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(71, 71, 71); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(113, 113, 113); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(147, 147, 147); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(139, 139, 139); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(187, 187, 188); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(167, 167, 168); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(0, 0, 0); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -210,7 +210,7 @@ public sealed class PaletteOffice2010Black_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(70, 70, 70); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(70, 70, 70); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(70, 70, 70); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(50, 50, 50); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010Black_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(91, 91, 91); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(73, 73, 73); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 201, 201); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(17, 17, 17); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(37, 37, 37); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(174, 174, 174); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Blue_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Blue_BaseScheme.cs index 7110e7c659..deb8fbf328 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Blue_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Blue_BaseScheme.cs @@ -103,44 +103,44 @@ public sealed class PaletteOffice2010Blue_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(216, 228, 242); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(239, 246, 253); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(240, 246, 252); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(165, 174, 183); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(58, 73, 89); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 160, 188); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(198, 218, 240); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(189, 203, 218); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(184, 199, 216); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(233, 241, 250); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(222, 233, 246); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(30, 57, 91); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -210,7 +210,7 @@ public sealed class PaletteOffice2010Blue_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(195, 212, 235); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(114, 142, 173); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010Blue_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Silver_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Silver_BaseScheme.cs index ca3ce50865..aa5c38cbc2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Silver_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2010/Official Themes/Schemes/PaletteOffice2010Silver_BaseScheme.cs @@ -103,31 +103,31 @@ public sealed class PaletteOffice2010Silver_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(229, 233, 238); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(255, 255, 255); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(253, 253, 253); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(148, 149, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(135, 140, 146); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 144, 151); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(205, 209, 214); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedBackT2 { get; set; } = Color.FromArgb(242, 244, 247); public override Color RibbonGroupCollapsedBackT3 { get; set; } = Color.FromArgb(238, 241, 245); public override Color RibbonGroupCollapsedBackT4 { get; set; } = Color.FromArgb(234, 235, 235); @@ -135,12 +135,12 @@ public sealed class PaletteOffice2010Silver_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(208, 212, 217); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(254, 254, 254); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(254, 254, 254); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb( 59, 59, 59); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -210,7 +210,7 @@ public sealed class PaletteOffice2010Silver_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(224, 227, 231); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(135, 140, 146); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -240,12 +240,12 @@ public sealed class PaletteOffice2010Silver_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 a4babcf654..3bc057c42c 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 @@ -408,7 +408,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -463,17 +463,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -615,7 +615,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -625,7 +625,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -685,7 +685,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -739,9 +739,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -867,7 +867,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -877,7 +877,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -904,7 +904,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1232,15 +1232,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1288,7 +1288,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1296,7 +1296,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1307,7 +1307,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack2] : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1358,15 +1358,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1414,7 +1414,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1422,7 +1422,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1580,7 +1580,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1778,12 +1778,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1799,12 +1799,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1820,12 +1820,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2049,16 +2049,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => _ribbonColors[(int)SchemeBaseColors.LinkNotVisitedOverrideControl], PaletteState.LinkVisitedOverride => _ribbonColors[(int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[(int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR // All other override states do nothing + _ => GlobalStaticVariables.EMPTY_COLOR // All other override states do nothing }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => _ribbonColors[(int)SchemeBaseColors.LinkNotVisitedOverridePanel], PaletteState.LinkVisitedOverride => _ribbonColors[(int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[(int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR // All other override states do nothing + _ => GlobalStaticVariables.EMPTY_COLOR // All other override states do nothing }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2137,7 +2137,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2538,7 +2538,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2614,7 +2614,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3604,7 +3604,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3640,7 +3640,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3658,7 +3658,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3772,7 +3772,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3784,7 +3784,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3826,7 +3826,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3861,7 +3861,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3908,7 +3908,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3943,7 +3943,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3982,7 +3982,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -4025,7 +4025,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4107,7 +4107,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4119,7 +4119,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4142,7 +4142,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4180,7 +4180,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4221,21 +4221,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4269,21 +4269,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013WhiteBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013WhiteBase.cs index e43cc7f0f2..6e6e020125 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013WhiteBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Bases/PaletteOffice2013WhiteBase.cs @@ -356,7 +356,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -411,17 +411,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -563,7 +563,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack1Checked, PaletteState.Tracking => BaseColors!.FormButtonBack1Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack1CheckTrack, @@ -573,7 +573,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -633,7 +633,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -687,9 +687,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBack2, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -815,7 +815,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBack2Checked, PaletteState.Tracking => BaseColors!.FormButtonBack2Track, PaletteState.CheckedTracking => BaseColors!.FormButtonBack2CheckTrack, @@ -825,7 +825,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -852,7 +852,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack1 : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => BaseColors!.ButtonNormalBack2, PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBack2, PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? BaseColors!.ButtonNormalBack2 : GetArrayColor(ButtonBackColor.Color8), PaletteState.Tracking => GetArrayColor(ButtonBackColor.Color4), @@ -1181,15 +1181,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1237,7 +1237,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1245,7 +1245,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1256,7 +1256,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteState.Disabled => style == PaletteBorderStyle.ButtonGallery ? BaseColors!.RibbonGalleryBack2 : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => BaseColors!.ButtonNormalBorder, PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalDefaultBorder, PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1307,15 +1307,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.ButtonNormalBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => BaseColors!.ControlBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1363,7 +1363,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : BaseColors!.FormBorderActive, PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => BaseColors!.FormButtonBorderCheck, PaletteState.Tracking or PaletteState.CheckedTracking => BaseColors!.FormButtonBorderTrack, PaletteState.Pressed or PaletteState.CheckedPressed => BaseColors!.FormButtonBorderPressed, @@ -1371,7 +1371,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1529,7 +1529,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1729,12 +1729,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1750,12 +1750,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1771,12 +1771,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2000,16 +2000,16 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverrideControl, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverrideControl, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverrideControl, - _ => GlobalStaticValues.EMPTY_COLOR // All other override states do nothing + _ => GlobalStaticVariables.EMPTY_COLOR // All other override states do nothing }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { PaletteState.LinkNotVisitedOverride => BaseColors!.LinkNotVisitedOverridePanel, PaletteState.LinkVisitedOverride => BaseColors!.LinkVisitedOverridePanel, PaletteState.LinkPressedOverride => BaseColors!.LinkPressedOverridePanel, - _ => GlobalStaticValues.EMPTY_COLOR // All other override states do nothing + _ => GlobalStaticVariables.EMPTY_COLOR // All other override states do nothing }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2088,7 +2088,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2489,7 +2489,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2565,7 +2565,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3560,7 +3560,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return BaseColors!.RibbonGroupFrameInside1; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3596,7 +3596,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.RibbonGroupsArea1; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3614,7 +3614,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3728,7 +3728,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3740,7 +3740,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3782,7 +3782,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3817,7 +3817,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3864,7 +3864,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3899,7 +3899,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3938,7 +3938,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return BaseColors!.RibbonGroupBorder5; @@ -3981,7 +3981,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4065,7 +4065,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4077,7 +4077,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4100,7 +4100,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4138,7 +4138,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4179,21 +4179,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4227,21 +4227,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 0dd17ec9fe..cb812ee453 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 @@ -84,7 +84,7 @@ static PaletteOffice2013DarkGray() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -175,15 +175,15 @@ public PaletteOffice2013DarkGray() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 f142966e2d..c7cec37661 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 @@ -84,7 +84,7 @@ static PaletteOffice2013LightGray() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -175,15 +175,15 @@ public PaletteOffice2013LightGray() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; 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 c383ccc78b..df24262f62 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 @@ -27,11 +27,11 @@ public class PaletteOffice2013White : PaletteOffice2013WhiteBase #region Ribbon Specific Colors - private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + private static readonly Color _ribbonAppButtonDarkColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; - private static readonly Color _ribbonAppButtonLightColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + private static readonly Color _ribbonAppButtonLightColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; - private static readonly Color _ribbonAppButtonTextColor = GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + private static readonly Color _ribbonAppButtonTextColor = GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion @@ -95,7 +95,7 @@ static PaletteOffice2013White() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -189,15 +189,15 @@ public PaletteOffice2013White() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013DarkGray_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013DarkGray_BaseScheme.cs index eb364e4b3f..0b580b2d2b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013DarkGray_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013DarkGray_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteOffice2013DarkGray_BaseScheme : KryptonColorSchemeBas public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(220, 224, 231); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(232, 234, 238); public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(68, 68, 68); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -221,14 +221,14 @@ public sealed class PaletteOffice2013DarkGray_BaseScheme : KryptonColorSchemeBas public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(240, 241, 242); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color HeaderDockInactiveBack1 { get; set; } = Color.FromArgb(237, 242, 248); public override Color HeaderDockInactiveBack2 { get; set; } = Color.FromArgb(207, 213, 220); public override Color ButtonNavigatorBorder { get; set; } = Color.FromArgb(161, 169, 179); @@ -240,12 +240,12 @@ public sealed class PaletteOffice2013DarkGray_BaseScheme : KryptonColorSchemeBas public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(170, 170, 170); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013White_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013White_BaseScheme.cs index f3ef3483cf..9ed09ae98d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013White_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Office 2013/Official Themes/Schemes/PaletteOffice2013White_BaseScheme.cs @@ -101,33 +101,33 @@ public sealed class PaletteOffice2013White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupsArea3 { get; set; } = Color.White; public override Color RibbonGroupsArea4 { get; set; } = Color.White; public override Color RibbonGroupsArea5 { get; set; } = Color.White; - public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(148, 149, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(180, 182, 183); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(207, 212, 218); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(255, 255, 255); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedBackT2 { get; set; } = Color.FromArgb(242, 244, 247); public override Color RibbonGroupCollapsedBackT3 { get; set; } = Color.FromArgb(238, 241, 245); public override Color RibbonGroupCollapsedBackT4 { get; set; } = Color.FromArgb(234, 235, 235); @@ -135,12 +135,12 @@ public sealed class PaletteOffice2013White_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(208, 212, 217); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(254, 254, 254); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(254, 254, 254); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(59, 59, 59); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(179, 185, 195); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 224, 224); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 125); @@ -210,7 +210,7 @@ public sealed class PaletteOffice2013White_BaseScheme : KryptonColorSchemeBase public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(224, 227, 231); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(224, 227, 231); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(135, 140, 146); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.Black; @@ -240,12 +240,12 @@ public sealed class PaletteOffice2013White_BaseScheme : KryptonColorSchemeBase public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(222, 227, 234); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(206, 214, 221); public override Color ToolTipBottom { get; set; } = Color.FromArgb(221, 221, 221); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.Red; public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(166, 170, 175); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(226, 220, 235); 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 4a72e3c0d6..19bac0ddaf 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalOffice2003.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalOffice2003.cs @@ -130,7 +130,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteState.Disabled: return SystemColors.Control; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Tracking: return ColorTable.MenuItemSelectedGradientBegin; } @@ -165,7 +165,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteState.Disabled: return SystemColors.Control; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Tracking: return ColorTable.MenuItemSelectedGradientBegin; } @@ -272,18 +272,18 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -293,13 +293,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion } @@ -615,7 +615,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -733,11 +733,11 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Control, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Control, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.Pressed or PaletteState.Tracking => style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => ColorTable.ButtonPressedGradientMiddle, _ => SystemColors.Window }, @@ -807,7 +807,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) return state switch { PaletteState.Disabled => SystemColors.Control, - PaletteState.Normal => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Normal => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => ColorTable.MenuItemSelectedGradientBegin, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -827,7 +827,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -946,10 +946,10 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Control, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : MergeColors(SystemColors.Window, 0.9f, SystemColors.ControlText, 0.1f), + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Control, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : MergeColors(SystemColors.Window, 0.9f, SystemColors.ControlText, 0.1f), PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : MergeColors(SystemColors.Window, 0.95f, SystemColors.ControlText, 0.05f), PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) @@ -1025,7 +1025,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) return state switch { PaletteState.Disabled => SystemColors.Control, - PaletteState.Normal => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Normal => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => ColorTable.MenuItemSelectedGradientEnd, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1293,7 +1293,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1402,8 +1402,8 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta case PaletteBorderStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : ColorTable.OverflowButtonGradientEnd, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : ColorTable.OverflowButtonGradientEnd, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => ColorTable.MenuBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1488,7 +1488,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1595,8 +1595,8 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta case PaletteBorderStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : ColorTable.ButtonPressedHighlightBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : ColorTable.ButtonPressedHighlightBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => ColorTable.MenuBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1760,7 +1760,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_MATERIAL_THEME_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_MATERIAL_THEME_CORNER_ROUNDING_VALUE; } return style switch @@ -1958,12 +1958,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1979,12 +1979,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2000,12 +2000,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2229,7 +2229,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => Color.Blue, PaletteState.LinkVisitedOverride => Color.Purple, PaletteState.LinkPressedOverride => Color.Red, - _ => GlobalStaticValues.EMPTY_COLOR // All other override states do nothing + _ => GlobalStaticVariables.EMPTY_COLOR // All other override states do nothing }; } @@ -2273,7 +2273,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2638,7 +2638,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2681,7 +2681,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3602,7 +3602,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3640,7 +3640,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3705,7 +3705,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3740,7 +3740,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3751,7 +3751,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3791,10 +3791,10 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3829,7 +3829,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3876,7 +3876,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3911,7 +3911,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3953,7 +3953,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -3993,7 +3993,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4077,7 +4077,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4108,7 +4108,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4146,7 +4146,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4187,21 +4187,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return ColorTable.SeparatorDark; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return SystemColors.Control; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4235,21 +4235,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return ColorTable.SeparatorDark; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return SystemColors.Control; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4444,7 +4444,7 @@ private void DefineRibbonColors() ribbonTabSelected2, // RibbonTabSelected2 ribbonTabSelected3, // RibbonTabSelected3 ribbonTabSelected4, // RibbonTabSelected4 - GlobalStaticValues.EMPTY_COLOR, // RibbonTabSelected5 + GlobalStaticVariables.EMPTY_COLOR, // RibbonTabSelected5 ribbonTabTracking1, // RibbonTabTracking1 ribbonTabTracking2, // RibbonTabTracking2 Color.FromArgb(196, ColorTable.ButtonSelectedGradientMiddle), // RibbonTabHighlight1 @@ -4492,8 +4492,8 @@ private void DefineRibbonColors() ribbonGroupFrameBorder1, // RibbonGroupFrameBorder2 ribbonGroupFrameInside1, // RibbonGroupFrameInside1 ribbonGroupFrameInside1, // RibbonGroupFrameInside2 - GlobalStaticValues.EMPTY_COLOR, // RibbonGroupFrameInside3 - GlobalStaticValues.EMPTY_COLOR, // RibbonGroupFrameInside4 + GlobalStaticVariables.EMPTY_COLOR, // RibbonGroupFrameInside3 + GlobalStaticVariables.EMPTY_COLOR, // RibbonGroupFrameInside4 SystemColors.ControlText, // RibbonGroupCollapsedText SystemColors.ControlText, // RibbonGroupButtonText // Non ribbon colors @@ -4691,19 +4691,19 @@ private Image CreateGalleryDropDownImage(Color color) /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -4713,13 +4713,13 @@ public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion AppButton Colors } 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 f8c3b4f18b..2b541e0e53 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalSystem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/PaletteProfessionalSystem.cs @@ -321,7 +321,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -439,11 +439,11 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Control, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Control, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.Pressed or PaletteState.Tracking => style switch { - PaletteBackStyle.TabLowProfile => GlobalStaticValues.EMPTY_COLOR, + PaletteBackStyle.TabLowProfile => GlobalStaticVariables.EMPTY_COLOR, PaletteBackStyle.TabHighProfile => ColorTable.ButtonPressedGradientMiddle, _ => SystemColors.Window }, @@ -513,7 +513,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) return state switch { PaletteState.Disabled => SystemColors.Control, - PaletteState.Normal => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Normal => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => ColorTable.MenuItemSelectedGradientBegin, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -533,7 +533,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -652,10 +652,10 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Control, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : MergeColors(SystemColors.Window, 0.9f, SystemColors.ControlText, 0.1f), + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Control, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : MergeColors(SystemColors.Window, 0.9f, SystemColors.ControlText, 0.1f), PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : MergeColors(SystemColors.Window, 0.95f, SystemColors.ControlText, 0.05f), PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) @@ -731,7 +731,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) return state switch { PaletteState.Disabled => SystemColors.Control, - PaletteState.Normal => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Normal => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => ColorTable.MenuItemSelectedGradientEnd, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -999,7 +999,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1108,8 +1108,8 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta case PaletteBorderStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : ColorTable.OverflowButtonGradientEnd, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : ColorTable.OverflowButtonGradientEnd, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => ColorTable.MenuBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1194,7 +1194,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1301,8 +1301,8 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta case PaletteBorderStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : ColorTable.ButtonPressedHighlightBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : FadedColor(ColorTable.ButtonSelectedBorder), + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : ColorTable.ButtonPressedHighlightBorder, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => ColorTable.MenuBorder, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1466,7 +1466,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_MATERIAL_THEME_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_MATERIAL_THEME_CORNER_ROUNDING_VALUE; } return style switch @@ -1664,12 +1664,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1685,12 +1685,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1706,12 +1706,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1935,7 +1935,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet PaletteState.LinkNotVisitedOverride => Color.Blue, PaletteState.LinkVisitedOverride => Color.Purple, PaletteState.LinkPressedOverride => Color.Red, - _ => GlobalStaticValues.EMPTY_COLOR // All other override states do nothing + _ => GlobalStaticVariables.EMPTY_COLOR // All other override states do nothing }; } @@ -1979,7 +1979,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2344,7 +2344,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2387,7 +2387,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3310,7 +3310,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3348,7 +3348,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3413,7 +3413,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS break; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3448,7 +3448,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3459,7 +3459,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3499,10 +3499,10 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3537,7 +3537,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3584,7 +3584,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3619,7 +3619,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3661,7 +3661,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? BaseColors!.RibbonQATMini5 @@ -3701,7 +3701,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3785,7 +3785,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -3816,7 +3816,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -3854,7 +3854,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -3895,21 +3895,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return ColorTable.SeparatorDark; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return SystemColors.Control; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -3943,21 +3943,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return ColorTable.SeparatorDark; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return SystemColors.Control; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4151,7 +4151,7 @@ private void DefineRibbonColors() ribbonTabSelected2, // RibbonTabSelected2 ribbonTabSelected3, // RibbonTabSelected3 ribbonTabSelected4, // RibbonTabSelected4 - GlobalStaticValues.EMPTY_COLOR, // RibbonTabSelected5 + GlobalStaticVariables.EMPTY_COLOR, // RibbonTabSelected5 ribbonTabTracking1, // RibbonTabTracking1 ribbonTabTracking2, // RibbonTabTracking2 Color.FromArgb(196, ColorTable.ButtonSelectedGradientMiddle), // RibbonTabHighlight1 @@ -4199,8 +4199,8 @@ private void DefineRibbonColors() ribbonGroupFrameBorder1, // RibbonGroupFrameBorder2 ribbonGroupFrameInside1, // RibbonGroupFrameInside1 ribbonGroupFrameInside1, // RibbonGroupFrameInside2 - GlobalStaticValues.EMPTY_COLOR, // RibbonGroupFrameInside3 - GlobalStaticValues.EMPTY_COLOR, // RibbonGroupFrameInside4 + GlobalStaticVariables.EMPTY_COLOR, // RibbonGroupFrameInside3 + GlobalStaticVariables.EMPTY_COLOR, // RibbonGroupFrameInside4 SystemColors.ControlText, // RibbonGroupCollapsedText SystemColors.ControlText, // RibbonGroupButtonText // Non ribbon colors @@ -4396,19 +4396,19 @@ private Image CreateGalleryDropDownImage(Color color) /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -4418,13 +4418,13 @@ public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_BOTTOM_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TOP_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.DEFAULT_RIBBON_FILE_APP_TAB_TEXT_COLOR; #endregion AppButton Colors } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/Schemes/PaletteProfessionalSystem_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/Schemes/PaletteProfessionalSystem_BaseScheme.cs index e7fc7e436f..9508203f7a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/Schemes/PaletteProfessionalSystem_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Professional/Schemes/PaletteProfessionalSystem_BaseScheme.cs @@ -138,8 +138,8 @@ public sealed class PaletteProfessionalSystem_BaseScheme : KryptonColorSchemeBas public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(0, 0, 0, 0); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(0, 0, 0, 0); public override Color RibbonGroupCollapsedText { get; set; } = SystemColors.ControlText; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupButtonText { get; set; } = SystemColors.ControlText; public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(255, 0, 0); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(255, 0, 0); @@ -239,17 +239,17 @@ public sealed class PaletteProfessionalSystem_BaseScheme : KryptonColorSchemeBas public override Color ButtonNavigatorPressed2 { get; set; } = Color.FromArgb(255, 0, 0); public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(255, 0, 0); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(255, 0, 0); - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; } 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 0dfd027250..c88dfda870 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 @@ -486,7 +486,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -555,7 +555,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) PaletteState.Normal => style == PaletteBackStyle.ButtonNavigatorStack ? _sparkleColors[2] : _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[6], PaletteState.Pressed => _sparkleColors[8], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl @@ -572,7 +572,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -582,7 +582,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _sparkleColors[10], PaletteState.Tracking => _sparkleColors[5], PaletteState.CheckedTracking => _sparkleColors[12], @@ -685,9 +685,9 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite220, - PaletteState.Pressed or PaletteState.Tracking => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite220, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite220, + PaletteState.Pressed or PaletteState.Tracking => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite220, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => style == PaletteBackStyle.TabHighProfile ? _sparkleColors[29] : _colorWhite220, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -719,7 +719,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -802,7 +802,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -812,7 +812,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _sparkleColors[11], PaletteState.Tracking => _sparkleColors[22], PaletteState.CheckedTracking => _sparkleColors[13], @@ -912,9 +912,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite220, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite238, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite220, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite238, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _colorWhite238, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1240,7 +1240,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch @@ -1257,7 +1257,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -1285,7 +1285,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteBorderStyle.ContextMenuItemSplit => state == PaletteState.Disabled ? _colorWhite220 : _colorWhite167, PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabDock or PaletteBorderStyle.TabDockAutoHidden or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed or PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _colorDark00, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1314,7 +1314,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch @@ -1331,7 +1331,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -1358,7 +1358,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta PaletteBorderStyle.ContextMenuItemSplit => state == PaletteState.Disabled ? _colorWhite220 : _colorWhite167, PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabDock or PaletteBorderStyle.TabDockAutoHidden or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed or PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _colorDark00, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1475,7 +1475,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1756,12 +1756,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1777,12 +1777,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1798,12 +1798,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2030,7 +2030,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2040,9 +2040,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2120,7 +2120,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2518,7 +2518,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2594,7 +2594,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3744,7 +3744,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _colorDark00; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3904,9 +3904,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _sparkleColors[37]; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3917,7 +3917,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3969,7 +3969,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking or PaletteState.Pressed => _sparkleColors[34], _ => _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside3] }; @@ -3982,7 +3982,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupCollapsedBackT3]; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3998,7 +3998,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4033,7 +4033,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4088,7 +4088,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking or PaletteState.Pressed => _ribbonFrameBack4, _ => _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside4] }; @@ -4101,7 +4101,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupCollapsedBackT4]; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4119,7 +4119,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -4154,7 +4154,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4195,7 +4195,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini5] @@ -4218,7 +4218,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4238,7 +4238,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4313,7 +4313,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4344,7 +4344,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4380,7 +4380,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4421,21 +4421,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4467,15 +4467,15 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat switch (element) { case PaletteElement.TrackBarTick: - return CommonHelper.IsOverrideState(state) ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.TrackBarTickMarks; + return CommonHelper.IsOverrideState(state) ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.TrackBarTickMarks; case PaletteElement.TrackBarTrack: - return CommonHelper.IsOverrideState(state) ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.TrackBarFillTrack; + return CommonHelper.IsOverrideState(state) ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.TrackBarFillTrack; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4527,18 +4527,18 @@ protected override void OnUserPreferenceChanged(object sender, UserPreferenceCha #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -4548,13 +4548,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBlueDarkModeBase.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBlueDarkModeBase.cs index a860c63d2f..fd7d497c52 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBlueDarkModeBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Base/PaletteSparkleBlueDarkModeBase.cs @@ -424,7 +424,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -493,7 +493,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) PaletteState.Normal => style == PaletteBackStyle.ButtonNavigatorStack ? _sparkleColors[2] : _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[6], PaletteState.Pressed => _sparkleColors[8], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl @@ -510,7 +510,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -520,7 +520,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _sparkleColors[10], PaletteState.Tracking => _sparkleColors[5], PaletteState.CheckedTracking => _sparkleColors[12], @@ -623,9 +623,9 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite220, - PaletteState.Pressed or PaletteState.Tracking => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite220, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite220, + PaletteState.Pressed or PaletteState.Tracking => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite220, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => style == PaletteBackStyle.TabHighProfile ? _sparkleColors[29] : _colorWhite220, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -657,7 +657,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -740,7 +740,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -750,7 +750,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _sparkleColors[11], PaletteState.Tracking => _sparkleColors[22], PaletteState.CheckedTracking => _sparkleColors[13], @@ -850,9 +850,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite220, - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _colorWhite238, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite220, + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _colorWhite238, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _colorWhite238, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -1180,7 +1180,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch @@ -1197,7 +1197,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -1225,7 +1225,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta PaletteBorderStyle.ContextMenuItemSplit => state == PaletteState.Disabled ? _colorWhite220 : _colorWhite167, PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabDock or PaletteBorderStyle.TabDockAutoHidden or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed or PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _colorDark00, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1254,7 +1254,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch @@ -1271,7 +1271,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta { PaletteState.Disabled => _disabledBack, PaletteState.Normal => _sparkleColors[5], - PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking => _sparkleColors[27], PaletteState.Pressed or PaletteState.CheckedNormal => _sparkleColors[15], PaletteState.CheckedTracking or PaletteState.CheckedPressed => _sparkleColors[12], @@ -1298,7 +1298,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta PaletteBorderStyle.ContextMenuItemSplit => state == PaletteState.Disabled ? _colorWhite220 : _colorWhite167, PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabDock or PaletteBorderStyle.TabDockAutoHidden or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed or PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _colorDark00, _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1415,7 +1415,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1615,12 +1615,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1636,12 +1636,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1657,12 +1657,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1894,7 +1894,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -1904,9 +1904,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -1984,7 +1984,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2387,7 +2387,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2463,7 +2463,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3589,7 +3589,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _colorDark00; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3749,9 +3749,9 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS return _sparkleColors[37]; case PaletteState.ContextTracking: case PaletteState.ContextCheckedNormal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3762,7 +3762,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonAppMenuDocs: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3814,7 +3814,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking or PaletteState.Pressed => _sparkleColors[34], _ => _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside3] }; @@ -3827,7 +3827,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupCollapsedBackT3]; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3843,7 +3843,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3878,7 +3878,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3933,7 +3933,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupCollapsedFrameBack: return state switch { - PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticValues.EMPTY_COLOR, + PaletteState.ContextNormal or PaletteState.ContextTracking => GlobalStaticVariables.EMPTY_COLOR, PaletteState.Tracking or PaletteState.Pressed => _ribbonFrameBack4, _ => _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside4] }; @@ -3946,7 +3946,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupCollapsedBackT4]; case PaletteState.ContextNormal: case PaletteState.ContextTracking: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3964,7 +3964,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3999,7 +3999,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4040,7 +4040,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonQATMinibar: return state == PaletteState.Normal ? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini5] @@ -4063,7 +4063,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -4083,7 +4083,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4162,7 +4162,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4193,7 +4193,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4229,7 +4229,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4270,21 +4270,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4316,15 +4316,15 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat switch (element) { case PaletteElement.TrackBarTick: - return CommonHelper.IsOverrideState(state) ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.TrackBarTickMarks; + return CommonHelper.IsOverrideState(state) ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.TrackBarTickMarks; case PaletteElement.TrackBarTrack: - return CommonHelper.IsOverrideState(state) ? GlobalStaticValues.EMPTY_COLOR : BaseColors!.TrackBarFillTrack; + return CommonHelper.IsOverrideState(state) ? GlobalStaticVariables.EMPTY_COLOR : BaseColors!.TrackBarFillTrack; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 5c1f26a679..6f0c86ef16 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 @@ -146,18 +146,18 @@ public PaletteSparkleBlueDarkMode() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; @@ -167,13 +167,13 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState #region AppButton Colors /// - public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabBottomColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTopColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonFileAppTabTextColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; #endregion AppButton Colors } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueDarkMode_BaseScheme.cs index 24f901b4f9..edf01604d8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparkleBlueDarkMode_BaseScheme : KryptonColorSchemeBa public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -221,35 +221,35 @@ public sealed class PaletteSparkleBlueDarkMode_BaseScheme : KryptonColorSchemeBa public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueLighMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueLighMode_BaseScheme.cs index a91275d6d8..d00c9a15d3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueLighMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleBlueLighMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparkleBlueLighMode_BaseScheme : KryptonColorSchemeBa public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -221,35 +221,35 @@ public sealed class PaletteSparkleBlueLighMode_BaseScheme : KryptonColorSchemeBa public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeDarkMode_BaseScheme.cs index cd2731fc8d..524351a74d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparkleOrangeDarkMode_BaseScheme : KryptonColorScheme public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(172, 163, 158); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 215, 212); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 124); @@ -221,35 +221,35 @@ public sealed class PaletteSparkleOrangeDarkMode_BaseScheme : KryptonColorScheme public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeLightMode_BaseScheme.cs index 1c45af1a6c..47965bfe3f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparkleOrangeLightMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparkleOrangeLightMode_BaseScheme : KryptonColorSchem public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(172, 163, 158); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 215, 212); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 124); @@ -221,35 +221,35 @@ public sealed class PaletteSparkleOrangeLightMode_BaseScheme : KryptonColorSchem public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleDarkMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleDarkMode_BaseScheme.cs index d16e1230bc..c455223dce 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleDarkMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleDarkMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparklePurpleDarkMode_BaseScheme : KryptonColorScheme public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(163, 158, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(215, 212, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 124, 125); @@ -221,35 +221,35 @@ public sealed class PaletteSparklePurpleDarkMode_BaseScheme : KryptonColorScheme public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleLightMode_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleLightMode_BaseScheme.cs index fb8feb0f6a..765f99c297 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleLightMode_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Extra Themes/Schemes/PaletteSparklePurpleLightMode_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparklePurpleLightMode_BaseScheme : KryptonColorSchem public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(163, 158, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(215, 212, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 124, 125); @@ -221,35 +221,35 @@ public sealed class PaletteSparklePurpleLightMode_BaseScheme : KryptonColorSchem public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleBlue_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleBlue_BaseScheme.cs index e2367c251c..b620dfc7ae 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleBlue_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleBlue_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparkleBlue_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(158, 163, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(212, 215, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(124, 125, 125); @@ -221,35 +221,35 @@ public sealed class PaletteSparkleBlue_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleOrange_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleOrange_BaseScheme.cs index 1572058cb9..ef667078be 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleOrange_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparkleOrange_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparkleOrange_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(172, 163, 158); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(216, 215, 212); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 125, 124); @@ -221,35 +221,35 @@ public sealed class PaletteSparkleOrange_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparklePurple_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparklePurple_BaseScheme.cs index 1b1e4dfdc7..27c269abbd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparklePurple_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Sparkle/Official Themes/Schemes/PaletteSparklePurple_BaseScheme.cs @@ -138,9 +138,9 @@ public sealed class PaletteSparklePurple_BaseScheme : KryptonColorSchemeBase public override Color RibbonGroupFrameInside3 { get; set; } = Color.FromArgb(150, 150, 150); public override Color RibbonGroupFrameInside4 { get; set; } = Color.FromArgb(205, 205, 205); public override Color RibbonGroupCollapsedText { get; set; } = Color.White; - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(163, 158, 172); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(215, 212, 216); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(125, 124, 125); @@ -221,35 +221,35 @@ public sealed class PaletteSparklePurple_BaseScheme : KryptonColorSchemeBase public override Color RibbonGalleryBackTracking { get; set; } = Color.FromArgb(238, 238, 238); public override Color RibbonGalleryBack1 { get; set; } = Color.FromArgb(195, 200, 209); public override Color RibbonGalleryBack2 { get; set; } = Color.FromArgb(217, 220, 224); - public override Color RibbonTabTracking3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonTabTracking4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonGroupTitleText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowLight { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color RibbonDropArrowDark { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color ToolTipBottom { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color TrackBarTickMarks { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarTopTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBottomTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarFillTrack { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value - public override Color TrackBarBorderPosition { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonTabTracking3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonTabTracking4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorder5 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonGroupTitleText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowLight { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color RibbonDropArrowDark { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color HeaderDockInactiveBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorBorder { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorTrack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorPressed2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ButtonNavigatorChecked2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color ToolTipBottom { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color TrackBarTickMarks { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarTopTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBottomTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarFillTrack { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarOutsidePosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value + public override Color TrackBarBorderPosition { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value } 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 cdcd3a250a..48dc1ddb10 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 @@ -432,15 +432,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -488,7 +488,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -496,7 +496,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -509,7 +509,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -560,15 +560,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -616,7 +616,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -624,7 +624,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -784,7 +784,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -982,12 +982,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1003,12 +1003,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1024,12 +1024,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1258,7 +1258,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -1268,9 +1268,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -1360,7 +1360,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1772,7 +1772,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -1848,7 +1848,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2833,7 +2833,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -2869,7 +2869,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -2887,7 +2887,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3001,7 +3001,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3013,7 +3013,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3055,7 +3055,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3090,7 +3090,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3137,7 +3137,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3172,7 +3172,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3211,7 +3211,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -3254,7 +3254,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3336,7 +3336,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -3348,7 +3348,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -3371,7 +3371,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -3409,7 +3409,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -3453,21 +3453,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -3501,21 +3501,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 6a9e2b8eb3..c8f1686a06 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 @@ -346,7 +346,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -401,17 +401,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -553,7 +553,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -563,7 +563,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -627,7 +627,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -681,9 +681,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -809,7 +809,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -819,7 +819,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -846,7 +846,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] @@ -1178,15 +1178,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1234,7 +1234,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1242,7 +1242,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1255,7 +1255,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1306,15 +1306,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1362,7 +1362,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1370,7 +1370,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1530,7 +1530,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1728,12 +1728,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1749,12 +1749,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1770,12 +1770,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2004,7 +2004,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2014,9 +2014,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2097,7 +2097,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2498,7 +2498,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2574,7 +2574,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3559,7 +3559,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3595,7 +3595,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3613,7 +3613,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3727,7 +3727,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3739,7 +3739,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3781,7 +3781,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3816,7 +3816,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3863,7 +3863,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3898,7 +3898,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3937,7 +3937,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -3980,7 +3980,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4062,7 +4062,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4074,7 +4074,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4097,7 +4097,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4135,7 +4135,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4179,21 +4179,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4227,21 +4227,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 3f702401f0..ca054c7f6e 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 @@ -347,7 +347,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -402,17 +402,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -554,7 +554,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -564,7 +564,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -628,7 +628,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -682,9 +682,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -810,7 +810,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -820,7 +820,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -847,7 +847,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] @@ -1179,15 +1179,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1235,7 +1235,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1243,7 +1243,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1256,7 +1256,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1307,15 +1307,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1363,7 +1363,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1371,7 +1371,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1531,7 +1531,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1729,12 +1729,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1750,12 +1750,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1771,12 +1771,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2005,7 +2005,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2015,9 +2015,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2098,7 +2098,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2499,7 +2499,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2575,7 +2575,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3560,7 +3560,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3596,7 +3596,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3614,7 +3614,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3728,7 +3728,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3740,7 +3740,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3782,7 +3782,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3817,7 +3817,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3864,7 +3864,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3899,7 +3899,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3938,7 +3938,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -3981,7 +3981,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4063,7 +4063,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4075,7 +4075,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4098,7 +4098,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4136,7 +4136,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4180,21 +4180,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4228,21 +4228,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 447c939df3..9a527e84b4 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 @@ -346,7 +346,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -401,17 +401,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -553,7 +553,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -563,7 +563,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -627,7 +627,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -681,9 +681,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -809,7 +809,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -819,7 +819,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -846,7 +846,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] @@ -1177,15 +1177,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1233,7 +1233,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1241,7 +1241,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1254,7 +1254,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1305,15 +1305,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1361,7 +1361,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1369,7 +1369,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1529,7 +1529,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1727,12 +1727,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1748,12 +1748,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1769,12 +1769,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2003,7 +2003,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2013,9 +2013,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2096,7 +2096,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2497,7 +2497,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2573,7 +2573,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3558,7 +3558,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3594,7 +3594,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3612,7 +3612,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3726,7 +3726,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3738,7 +3738,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3780,7 +3780,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3815,7 +3815,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3862,7 +3862,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3897,7 +3897,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3936,7 +3936,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -3979,7 +3979,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4061,7 +4061,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4073,7 +4073,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4096,7 +4096,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4134,7 +4134,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4178,21 +4178,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4226,21 +4226,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 9be46d78eb..07c74facb7 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 @@ -346,7 +346,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -401,17 +401,17 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) switch (state) { case PaletteState.Disabled: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack; case PaletteState.Normal: - return style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window; + return style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window; case PaletteState.Pressed: case PaletteState.Tracking: switch (style) { case PaletteBackStyle.TabLowProfile: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteBackStyle.TabHighProfile: return state == PaletteState.Tracking ? GetArrayColor(ButtonBackColor.Color3) : GetArrayColor(ButtonBackColor.Color5); default: @@ -553,7 +553,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack1CheckTrack], @@ -563,7 +563,7 @@ public override Color GetBackColor1(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked1, PaletteState.Tracking => _formCloseTracking1, PaletteState.CheckedTracking => _formCloseCheckedTracking1, @@ -627,7 +627,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) // We do not provide override values if (CommonHelper.IsOverrideStateExclude(state, PaletteState.NormalDefaultOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -681,9 +681,9 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.TabCustom3: return state switch { - PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBack, - PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], - PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : SystemColors.Window, + PaletteState.Disabled => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBack, + PaletteState.Normal => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], + PaletteState.Tracking or PaletteState.Pressed => style == PaletteBackStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : SystemColors.Window, PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => SystemColors.Window, _ => throw DebugTools.NotImplemented(state.ToString()) }; @@ -809,7 +809,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonForm: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Checked], PaletteState.Tracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2Track], PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBack2CheckTrack], @@ -819,7 +819,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) case PaletteBackStyle.ButtonFormClose: return state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseChecked2, PaletteState.Tracking => _formCloseTracking2, PaletteState.CheckedTracking => _formCloseCheckedTracking2, @@ -846,7 +846,7 @@ public override Color GetBackColor2(PaletteBackStyle style, PaletteState state) PaletteState.Disabled => style == PaletteBackStyle.ButtonGallery ? _ribbonColors[(int)SchemeBaseColors.RibbonGalleryBack1] : GetArrayColor(ButtonBackColor.Color2), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2], PaletteState.NormalDefaultOverride => style is PaletteBackStyle.ButtonLowProfile or PaletteBackStyle.ButtonBreadCrumb or PaletteBackStyle.ButtonListItem or PaletteBackStyle.ButtonCommand or PaletteBackStyle.ButtonButtonSpec or PaletteBackStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBack2], PaletteState.CheckedNormal => style == PaletteBackStyle.ButtonInputControl ? _ribbonColors[(int)SchemeBaseColors.ButtonNormalBack2] @@ -1177,15 +1177,15 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1233,7 +1233,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1241,7 +1241,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1254,7 +1254,7 @@ public override Color GetBorderColor1(PaletteBorderStyle style, PaletteState sta : GetArrayColor(ButtonBorderColor.Color1), PaletteState.Normal => _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.NormalDefaultOverride => style is PaletteBorderStyle.ButtonLowProfile or PaletteBorderStyle.ButtonBreadCrumb or PaletteBorderStyle.ButtonListItem or PaletteBorderStyle.ButtonCommand or PaletteBorderStyle.ButtonButtonSpec or PaletteBorderStyle.ContextMenuItemHighlight - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalDefaultBorder], PaletteState.CheckedNormal => GetArrayColor(ButtonBorderColor.Color6), PaletteState.Tracking => GetArrayColor(ButtonBorderColor.Color2), @@ -1305,15 +1305,15 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta } } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { PaletteBorderStyle.TabHighProfile or PaletteBorderStyle.TabStandardProfile or PaletteBorderStyle.TabLowProfile or PaletteBorderStyle.TabOneNote or PaletteBorderStyle.TabCustom1 or PaletteBorderStyle.TabCustom2 or PaletteBorderStyle.TabCustom3 => state switch { - PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _disabledBorder, - PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], + PaletteState.Disabled => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _disabledBorder, + PaletteState.Normal or PaletteState.Tracking or PaletteState.Pressed => style == PaletteBorderStyle.TabLowProfile ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.ButtonNormalBorder], PaletteState.CheckedNormal or PaletteState.CheckedPressed or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.ControlBorder], _ => throw DebugTools.NotImplemented(state.ToString()) }, @@ -1361,7 +1361,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta : _ribbonColors[(int)SchemeBaseColors.FormBorderActive], PaletteBorderStyle.ButtonForm => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderCheck], PaletteState.Tracking or PaletteState.CheckedTracking => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderTrack], PaletteState.Pressed or PaletteState.CheckedPressed => _ribbonColors[(int)SchemeBaseColors.FormButtonBorderPressed], @@ -1369,7 +1369,7 @@ public override Color GetBorderColor2(PaletteBorderStyle style, PaletteState sta }, PaletteBorderStyle.ButtonFormClose => state switch { - PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled or PaletteState.Normal or PaletteState.NormalDefaultOverride => GlobalStaticVariables.EMPTY_COLOR, PaletteState.CheckedNormal => _formCloseBorderCheckedNormal, PaletteState.Tracking or PaletteState.CheckedTracking => _formCloseBorderTracking, PaletteState.Pressed or PaletteState.CheckedPressed => _formCloseBorderPressed, @@ -1529,7 +1529,7 @@ public override float GetBorderRounding(PaletteBorderStyle style, PaletteState s // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; + return GlobalStaticConstants.DEFAULT_PRIMARY_CORNER_ROUNDING_VALUE; } return style switch @@ -1727,12 +1727,12 @@ public override Color GetContentImageColorMap(PaletteContentStyle style, Palette // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1748,12 +1748,12 @@ public override Color GetContentImageColorTo(PaletteContentStyle style, PaletteS // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -1769,12 +1769,12 @@ public override Color GetContentImageColorTransparent(PaletteContentStyle style, // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return style switch { - PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticValues.EMPTY_COLOR, + PaletteContentStyle.HeaderPrimary or PaletteContentStyle.HeaderDockInactive or PaletteContentStyle.HeaderDockActive or PaletteContentStyle.HeaderCalendar or PaletteContentStyle.HeaderSecondary or PaletteContentStyle.HeaderForm or PaletteContentStyle.HeaderCustom1 or PaletteContentStyle.HeaderCustom2 or PaletteContentStyle.HeaderCustom3 or PaletteContentStyle.LabelAlternateControl or PaletteContentStyle.LabelNormalControl or PaletteContentStyle.LabelBoldControl or PaletteContentStyle.LabelItalicControl or PaletteContentStyle.LabelTitleControl or PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption or PaletteContentStyle.LabelToolTip or PaletteContentStyle.LabelSuperTip or PaletteContentStyle.LabelKeyTip or PaletteContentStyle.LabelCustom1 or PaletteContentStyle.LabelCustom2 or PaletteContentStyle.LabelCustom3 or PaletteContentStyle.ContextMenuHeading or PaletteContentStyle.ContextMenuItemImage or PaletteContentStyle.ContextMenuItemTextStandard or PaletteContentStyle.ContextMenuItemTextAlternate or PaletteContentStyle.ContextMenuItemShortcutText or PaletteContentStyle.InputControlStandalone or PaletteContentStyle.InputControlRibbon or PaletteContentStyle.InputControlCustom1 or PaletteContentStyle.InputControlCustom2 or PaletteContentStyle.InputControlCustom3 or PaletteContentStyle.TabHighProfile or PaletteContentStyle.TabStandardProfile or PaletteContentStyle.TabLowProfile or PaletteContentStyle.TabOneNote or PaletteContentStyle.TabDock or PaletteContentStyle.TabDockAutoHidden or PaletteContentStyle.TabCustom1 or PaletteContentStyle.TabCustom2 or PaletteContentStyle.TabCustom3 or PaletteContentStyle.ButtonStandalone or PaletteContentStyle.ButtonGallery or PaletteContentStyle.ButtonAlternate or PaletteContentStyle.ButtonLowProfile or PaletteContentStyle.ButtonBreadCrumb or PaletteContentStyle.ButtonListItem or PaletteContentStyle.ButtonCommand or PaletteContentStyle.ButtonButtonSpec or PaletteContentStyle.ButtonCalendarDay or PaletteContentStyle.ButtonCluster or PaletteContentStyle.ButtonNavigatorStack or PaletteContentStyle.ButtonNavigatorOverflow or PaletteContentStyle.ButtonNavigatorMini or PaletteContentStyle.ButtonForm or PaletteContentStyle.ButtonFormClose or PaletteContentStyle.ButtonCustom1 or PaletteContentStyle.ButtonCustom2 or PaletteContentStyle.ButtonCustom3 or PaletteContentStyle.ButtonInputControl or PaletteContentStyle.GridHeaderColumnList or PaletteContentStyle.GridHeaderColumnSheet or PaletteContentStyle.GridHeaderColumnCustom1 or PaletteContentStyle.GridHeaderColumnCustom2 or PaletteContentStyle.GridHeaderColumnCustom3 or PaletteContentStyle.GridHeaderRowList or PaletteContentStyle.GridHeaderRowSheet or PaletteContentStyle.GridHeaderRowCustom1 or PaletteContentStyle.GridHeaderRowCustom2 or PaletteContentStyle.GridHeaderRowCustom3 or PaletteContentStyle.GridDataCellList or PaletteContentStyle.GridDataCellSheet or PaletteContentStyle.GridDataCellCustom1 or PaletteContentStyle.GridDataCellCustom2 or PaletteContentStyle.GridDataCellCustom3 => GlobalStaticVariables.EMPTY_COLOR, _ => throw new ArgumentOutOfRangeException(nameof(style)) }; } @@ -2003,7 +2003,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverrideControl], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverrideControl], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, PaletteContentStyle.LabelAlternatePanel or PaletteContentStyle.LabelNormalPanel or PaletteContentStyle.LabelBoldPanel or PaletteContentStyle.LabelItalicPanel or PaletteContentStyle.LabelTitlePanel or PaletteContentStyle.LabelGroupBoxCaption => state switch { @@ -2013,9 +2013,9 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet (int)SchemeBaseColors.LinkVisitedOverridePanel], PaletteState.LinkPressedOverride => _ribbonColors[ (int)SchemeBaseColors.LinkPressedOverridePanel], - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }, - _ => GlobalStaticValues.EMPTY_COLOR + _ => GlobalStaticVariables.EMPTY_COLOR }; } @@ -2096,7 +2096,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2497,7 +2497,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -2573,7 +2573,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (style) @@ -3558,7 +3558,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS return _ribbonColors[(int)SchemeBaseColors.RibbonGroupFrameInside1]; case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: switch (state) @@ -3594,7 +3594,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS } break; case PaletteRibbonBackStyle.RibbonGroupArea: - return state == PaletteState.ContextCheckedNormal ? GlobalStaticValues.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; + return state == PaletteState.ContextCheckedNormal ? GlobalStaticVariables.EMPTY_COLOR : _ribbonColors[(int)SchemeBaseColors.RibbonGroupsArea1]; case PaletteRibbonBackStyle.RibbonTab: switch (state) @@ -3612,7 +3612,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder1; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3726,7 +3726,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder2; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3738,7 +3738,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBack: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3780,7 +3780,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3815,7 +3815,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder3; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3862,7 +3862,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonGroupNormalTitle: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonAppButton: switch (state) { @@ -3897,7 +3897,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS case PaletteState.FocusOverride: return _contextCheckedTabBorder4; case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -3936,7 +3936,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteRibbonBackStyle.RibbonQATOverflow: case PaletteRibbonBackStyle.RibbonGalleryBack: case PaletteRibbonBackStyle.RibbonGalleryBorder: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; case PaletteRibbonBackStyle.RibbonGroupNormalBorder: case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder: return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5]; @@ -3979,7 +3979,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS case PaletteState.ContextCheckedTracking: case PaletteState.FocusOverride: case PaletteState.Normal: - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; default: // Should never happen! Debug.Assert(false); @@ -4061,7 +4061,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat // We do not provide override values if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4073,7 +4073,7 @@ public override Color GetElementColor1(PaletteElement element, PaletteState stat case PaletteElement.TrackBarPosition: return state switch { - PaletteState.Disabled => GlobalStaticValues.EMPTY_COLOR, + PaletteState.Disabled => GlobalStaticVariables.EMPTY_COLOR, _ => BaseColors!.TrackBarOutsidePosition }; default: @@ -4096,7 +4096,7 @@ public override Color GetElementColor2(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4134,7 +4134,7 @@ public override Color GetElementColor3(PaletteElement element, PaletteState stat { if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } switch (element) @@ -4178,21 +4178,21 @@ public override Color GetElementColor4(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch @@ -4226,21 +4226,21 @@ public override Color GetElementColor5(PaletteElement element, PaletteState stat case PaletteElement.TrackBarTick: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarTickMarks]; case PaletteElement.TrackBarTrack: if (CommonHelper.IsOverrideState(state)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return _ribbonColors![(int)SchemeBaseColors.TrackBarFillTrack]; case PaletteElement.TrackBarPosition: if (CommonHelper.IsOverrideStateExclude(state, PaletteState.FocusOverride)) { - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } return state switch 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 942abd7cdb..2dff9920c5 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 @@ -80,7 +80,7 @@ static PaletteVisualStudio2010Office2007Variation() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -174,18 +174,18 @@ public PaletteVisualStudio2010Office2007Variation() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => -1; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/Schemes/PaletteVisualStudio2010Office2007Variation_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/Schemes/PaletteVisualStudio2010Office2007Variation_BaseScheme.cs index d112796254..ee785b9768 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/Schemes/PaletteVisualStudio2010Office2007Variation_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2007/Schemes/PaletteVisualStudio2010Office2007Variation_BaseScheme.cs @@ -103,44 +103,44 @@ public sealed class PaletteVisualStudio2010Office2007Variation_BaseScheme : Kryp public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(216, 228, 242); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(235, 240, 246); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(240, 246, 252); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(135, 142, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(165, 174, 183); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 160, 188); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(198, 218, 240); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(189, 203, 218); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(184, 199, 216); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(233, 241, 250); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(222, 233, 246); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(0, 0, 0); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -210,7 +210,7 @@ public sealed class PaletteVisualStudio2010Office2007Variation_BaseScheme : Kryp public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(195, 212, 235); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(114, 142, 173); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.FromArgb(0, 0, 0); @@ -240,12 +240,12 @@ public sealed class PaletteVisualStudio2010Office2007Variation_BaseScheme : Kryp public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); 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 27e474d165..a1df178407 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 @@ -35,7 +35,7 @@ public class PaletteVisualStudio2010Office2010Variation : PaletteVisualStudio201 #region Rafting - private readonly float _gradientRafting = GlobalStaticValues.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; + private readonly float _gradientRafting = GlobalStaticConstants.DEFAULT_RAFTING_RIBBON_TAB_BACKGROUND_GRADIENT; #endregion @@ -94,7 +94,7 @@ static PaletteVisualStudio2010Office2010Variation() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -186,7 +186,7 @@ public PaletteVisualStudio2010Office2010Variation() /// public override Color GetRibbonTabRowGradientColor1(PaletteState state) => - GlobalStaticValues.TAB_ROW_GRADIENT_FIRST_COLOR; + GlobalStaticVariables.TAB_ROW_GRADIENT_FIRST_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => @@ -197,7 +197,7 @@ public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState _tabRowBackgroundGradientRaftingLightColor; /// - public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override float GetRibbonTabRowGradientRaftingAngle(PaletteState state) => _gradientRafting; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/Schemes/PaletteVisualStudio2010Office2010Variation_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/Schemes/PaletteVisualStudio2010Office2010Variation_BaseScheme.cs index f91eeaaf32..33adb32891 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/Schemes/PaletteVisualStudio2010Office2010Variation_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2010/Schemes/PaletteVisualStudio2010Office2010Variation_BaseScheme.cs @@ -103,44 +103,44 @@ public sealed class PaletteVisualStudio2010Office2010Variation_BaseScheme : Kryp public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(216, 228, 242); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(235, 240, 246); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(240, 246, 252); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(135, 142, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(165, 174, 183); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 160, 188); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(198, 218, 240); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(189, 203, 218); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(184, 199, 216); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(233, 241, 250); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(222, 233, 246); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(30, 57, 91); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -210,7 +210,7 @@ public sealed class PaletteVisualStudio2010Office2010Variation_BaseScheme : Kryp public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(195, 212, 235); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(114, 142, 173); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.FromArgb(0, 0, 0); @@ -240,12 +240,12 @@ public sealed class PaletteVisualStudio2010Office2010Variation_BaseScheme : Kryp public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); 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 aa3053ca76..9e0f6cc36f 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 @@ -86,7 +86,7 @@ static PaletteVisualStudio2010Office2013Variation() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -176,15 +176,15 @@ public PaletteVisualStudio2010Office2013Variation() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/Schemes/PaletteVisualStudio2010Office2013Variation_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/Schemes/PaletteVisualStudio2010Office2013Variation_BaseScheme.cs index 3f4d4ac447..aa6441d000 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/Schemes/PaletteVisualStudio2010Office2013Variation_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/2013/Schemes/PaletteVisualStudio2010Office2013Variation_BaseScheme.cs @@ -103,44 +103,44 @@ public sealed class PaletteVisualStudio2010Office2013Variation_BaseScheme : Kryp public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(216, 228, 242); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(235, 240, 246); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(240, 246, 252); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(135, 142, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(165, 174, 183); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 160, 188); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(198, 218, 240); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(189, 203, 218); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(184, 199, 216); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(233, 241, 250); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(222, 233, 246); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(30, 57, 91); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -210,7 +210,7 @@ public sealed class PaletteVisualStudio2010Office2013Variation_BaseScheme : Kryp public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(195, 212, 235); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(114, 142, 173); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.FromArgb(0, 0, 0); @@ -240,12 +240,12 @@ public sealed class PaletteVisualStudio2010Office2013Variation_BaseScheme : Kryp public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); 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 c291d171d7..b83b1bba14 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 @@ -86,7 +86,7 @@ static PaletteVisualStudio2010Microsoft365Variation() { ImageSize = new Size(13, 7), ColorDepth = ColorDepth.Depth24Bit, - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR }; _galleryButtonList.Images.AddStrip(GalleryImageResources.Gallery2010); _radioButtonArray = @@ -176,15 +176,15 @@ public PaletteVisualStudio2010Microsoft365Variation() #region Tab Row Background /// - public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public override Color GetRibbonTabRowGradientColor1(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingDark(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundGradientRaftingLight(PaletteState state) => - GlobalStaticValues.EMPTY_COLOR; + GlobalStaticVariables.EMPTY_COLOR; /// public override Color GetRibbonTabRowBackgroundSolidColor(PaletteState state) => _tabRowBackgroundColor; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/Schemes/PaletteVisualStudio2010Microsoft365Variation_BaseScheme.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/Schemes/PaletteVisualStudio2010Microsoft365Variation_BaseScheme.cs index be74ba6eec..2441b0bf9d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/Schemes/PaletteVisualStudio2010Microsoft365Variation_BaseScheme.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Visual Studio/Official Themes/2010/Variations/365/Schemes/PaletteVisualStudio2010Microsoft365Variation_BaseScheme.cs @@ -103,44 +103,44 @@ public sealed class PaletteVisualStudio2010Microsoft365Variation_BaseScheme : Kr public override Color RibbonGroupsArea5 { get; set; } = Color.FromArgb(216, 228, 242); public override Color RibbonGroupBorder1 { get; set; } = Color.FromArgb(235, 240, 246); public override Color RibbonGroupBorder2 { get; set; } = Color.FromArgb(240, 246, 252); - public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitle1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitle2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupBorderContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleContext2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupDialogDark { get; set; } = Color.FromArgb(135, 142, 152); public override Color RibbonGroupDialogLight { get; set; } = Color.FromArgb(165, 174, 183); - public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupTitleTracking2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonMinimizeBarDark { get; set; } = Color.FromArgb(139, 160, 188); public override Color RibbonMinimizeBarLight { get; set; } = Color.FromArgb(198, 218, 240); - public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorder4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBack4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBorderT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT2 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupCollapsedBackT4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupFrameBorder1 { get; set; } = Color.FromArgb(189, 203, 218); public override Color RibbonGroupFrameBorder2 { get; set; } = Color.FromArgb(184, 199, 216); public override Color RibbonGroupFrameInside1 { get; set; } = Color.FromArgb(233, 241, 250); public override Color RibbonGroupFrameInside2 { get; set; } = Color.FromArgb(222, 233, 246); - public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color RibbonGroupFrameInside3 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupFrameInside4 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color RibbonGroupCollapsedText { get; set; } = Color.FromArgb(30, 57, 91); - public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color ButtonTextTracking { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color RibbonGroupButtonText { get; set; } = GlobalStaticValues.EMPTY_COLOR; // missing value + public override Color RibbonGroupTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color ButtonTextTracking { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color RibbonGroupButtonText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; // missing value public override Color AlternatePressedBack1 { get; set; } = Color.FromArgb(118, 153, 200); public override Color AlternatePressedBack2 { get; set; } = Color.FromArgb(184, 215, 253); public override Color AlternatePressedBorder1 { get; set; } = Color.FromArgb(135, 156, 175); @@ -210,7 +210,7 @@ public sealed class PaletteVisualStudio2010Microsoft365Variation_BaseScheme : Kr public override Color AppButtonOuter1 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter2 { get; set; } = Color.FromArgb(195, 212, 235); public override Color AppButtonOuter3 { get; set; } = Color.FromArgb(195, 212, 235); - public override Color AppButtonInner1 { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color AppButtonInner1 { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color AppButtonInner2 { get; set; } = Color.FromArgb(114, 142, 173); public override Color AppButtonMenuDocsBack { get; set; } = Color.White; public override Color AppButtonMenuDocsText { get; set; } = Color.FromArgb(0, 0, 0); @@ -240,12 +240,12 @@ public sealed class PaletteVisualStudio2010Microsoft365Variation_BaseScheme : Kr public override Color ButtonNavigatorChecked1 { get; set; } = Color.FromArgb(200, 219, 240); public override Color ButtonNavigatorChecked2 { get; set; } = Color.FromArgb(177, 201, 228); public override Color ToolTipBottom { get; set; } = Color.FromArgb(201, 217, 239); - public override Color MenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientStart { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color DisabledMenuItemText { get; set; } = GlobalStaticValues.EMPTY_COLOR; - public override Color MenuStripText { get; set; } = GlobalStaticValues.EMPTY_COLOR; + public override Color MenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientStart { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientMiddle { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuMarginGradientEnd { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color DisabledMenuItemText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; + public override Color MenuStripText { get; set; } = GlobalStaticVariables.EMPTY_COLOR; public override Color TrackBarTickMarks { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarTopTrack { get; set; } = Color.FromArgb(116, 150, 194); public override Color TrackBarBottomTrack { get; set; } = Color.FromArgb(152, 190, 241); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonInternalKCT.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonInternalKCT.cs index 90feae64c9..e7af40e25f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonInternalKCT.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonInternalKCT.cs @@ -44,7 +44,7 @@ public KryptonInternalKCT([DisallowNull] KryptonColorTable baseKCT, // Initialise all the colors to empty for (var i = 0; i < _colors.Length; i++) { - _colors[i] = GlobalStaticValues.EMPTY_COLOR; + _colors[i] = GlobalStaticVariables.EMPTY_COLOR; } // Initialise other storage values @@ -67,7 +67,7 @@ public KryptonInternalKCT([DisallowNull] KryptonColorTable baseKCT, /// Gets the starting color of the gradient used when the button is checked. /// public override Color ButtonCheckedGradientBegin => - _colors[(int)PaletteColorIndex.ButtonCheckedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonCheckedGradientBegin : _colors[(int)PaletteColorIndex.ButtonCheckedGradientBegin]; @@ -86,7 +86,7 @@ public Color InternalButtonCheckedGradientBegin /// Gets the end color of the gradient used when the button is checked. /// public override Color ButtonCheckedGradientEnd => - _colors[(int)PaletteColorIndex.ButtonCheckedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonCheckedGradientEnd : _colors[(int)PaletteColorIndex.ButtonCheckedGradientEnd]; @@ -105,7 +105,7 @@ public Color InternalButtonCheckedGradientEnd /// Gets the middle color of the gradient used when the button is checked. /// public override Color ButtonCheckedGradientMiddle => - _colors[(int)PaletteColorIndex.ButtonCheckedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonCheckedGradientMiddle : _colors[(int)PaletteColorIndex.ButtonCheckedGradientMiddle]; @@ -124,7 +124,7 @@ public Color InternalButtonCheckedGradientMiddle /// Gets the solid color used when the button is checked. /// public override Color ButtonCheckedHighlight => - _colors[(int)PaletteColorIndex.ButtonCheckedHighlight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedHighlight] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonCheckedHighlight : _colors[(int)PaletteColorIndex.ButtonCheckedHighlight]; @@ -143,7 +143,7 @@ public Color InternalButtonCheckedHighlight /// Gets the border color to use with ButtonCheckedHighlight. /// public override Color ButtonCheckedHighlightBorder => - _colors[(int)PaletteColorIndex.ButtonCheckedHighlightBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedHighlightBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonCheckedHighlightBorder : _colors[(int)PaletteColorIndex.ButtonCheckedHighlightBorder]; @@ -162,7 +162,7 @@ public Color InternalButtonCheckedHighlightBorder /// Gets the border color to use with the ButtonPressedGradientBegin, ButtonPressedGradientMiddle, and ButtonPressedGradientEnd colors. /// public override Color ButtonPressedBorder => - _colors[(int)PaletteColorIndex.ButtonPressedBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonPressedBorder : _colors[(int)PaletteColorIndex.ButtonPressedBorder]; @@ -181,7 +181,7 @@ public Color InternalButtonPressedBorder /// Gets the starting color of the gradient used when the button is pressed. /// public override Color ButtonPressedGradientBegin => - _colors[(int)PaletteColorIndex.ButtonPressedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonPressedGradientBegin : _colors[(int)PaletteColorIndex.ButtonPressedGradientBegin]; @@ -200,7 +200,7 @@ public Color InternalButtonPressedGradientBegin /// Gets the end color of the gradient used when the button is pressed. /// public override Color ButtonPressedGradientEnd => - _colors[(int)PaletteColorIndex.ButtonPressedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonPressedGradientEnd : _colors[(int)PaletteColorIndex.ButtonPressedGradientEnd]; @@ -219,7 +219,7 @@ public Color InternalButtonPressedGradientEnd /// Gets the middle color of the gradient used when the button is pressed. /// public override Color ButtonPressedGradientMiddle => - _colors[(int)PaletteColorIndex.ButtonPressedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonPressedGradientMiddle : _colors[(int)PaletteColorIndex.ButtonPressedGradientMiddle]; @@ -238,7 +238,7 @@ public Color InternalButtonPressedGradientMiddle /// Gets the solid color used when the button is pressed. /// public override Color ButtonPressedHighlight => - _colors[(int)PaletteColorIndex.ButtonPressedHighlight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedHighlight] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonPressedHighlight : _colors[(int)PaletteColorIndex.ButtonPressedHighlight]; @@ -257,7 +257,7 @@ public Color InternalButtonPressedHighlight /// Gets the border color to use with ButtonPressedHighlight. /// public override Color ButtonPressedHighlightBorder => - _colors[(int)PaletteColorIndex.ButtonPressedHighlightBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedHighlightBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonPressedHighlightBorder : _colors[(int)PaletteColorIndex.ButtonPressedHighlightBorder]; @@ -276,7 +276,7 @@ public Color InternalButtonPressedHighlightBorder /// Gets the border color to use with the ButtonSelectedGradientBegin, ButtonSelectedGradientMiddle, and ButtonSelectedGradientEnd colors. /// public override Color ButtonSelectedBorder => - _colors[(int)PaletteColorIndex.ButtonSelectedBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonSelectedBorder : _colors[(int)PaletteColorIndex.ButtonSelectedBorder]; @@ -295,7 +295,7 @@ public Color InternalButtonSelectedBorder /// Gets the starting color of the gradient used when the button is selected. /// public override Color ButtonSelectedGradientBegin => - _colors[(int)PaletteColorIndex.ButtonSelectedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonSelectedGradientBegin : _colors[(int)PaletteColorIndex.ButtonSelectedGradientBegin]; @@ -314,7 +314,7 @@ public Color InternalButtonSelectedGradientBegin /// Gets the end color of the gradient used when the button is selected. /// public override Color ButtonSelectedGradientEnd => - _colors[(int)PaletteColorIndex.ButtonSelectedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonSelectedGradientEnd : _colors[(int)PaletteColorIndex.ButtonSelectedGradientEnd]; @@ -333,7 +333,7 @@ public Color InternalButtonSelectedGradientEnd /// Gets the middle color of the gradient used when the button is selected. /// public override Color ButtonSelectedGradientMiddle => - _colors[(int)PaletteColorIndex.ButtonSelectedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonSelectedGradientMiddle : _colors[(int)PaletteColorIndex.ButtonSelectedGradientMiddle]; @@ -352,7 +352,7 @@ public Color InternalButtonSelectedGradientMiddle /// Gets the solid color used when the button is selected. /// public override Color ButtonSelectedHighlight => - _colors[(int)PaletteColorIndex.ButtonSelectedHighlight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedHighlight] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonSelectedHighlight : _colors[(int)PaletteColorIndex.ButtonSelectedHighlight]; @@ -371,7 +371,7 @@ public Color InternalButtonSelectedHighlight /// Gets the border color to use with ButtonSelectedHighlight. /// public override Color ButtonSelectedHighlightBorder => - _colors[(int)PaletteColorIndex.ButtonSelectedHighlightBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedHighlightBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ButtonSelectedHighlightBorder : _colors[(int)PaletteColorIndex.ButtonSelectedHighlightBorder]; @@ -392,7 +392,7 @@ public Color InternalButtonSelectedHighlightBorder /// Gets the solid color to use when the button is checked and gradients are being used. /// public override Color CheckBackground => - _colors[(int)PaletteColorIndex.CheckBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.CheckBackground] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.CheckBackground : _colors[(int)PaletteColorIndex.CheckBackground]; @@ -411,7 +411,7 @@ public Color InternalCheckBackground /// Gets the solid color to use when the button is checked and selected and gradients are being used. /// public override Color CheckPressedBackground => - _colors[(int)PaletteColorIndex.CheckPressedBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.CheckPressedBackground] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.CheckPressedBackground : _colors[(int)PaletteColorIndex.CheckPressedBackground]; @@ -430,7 +430,7 @@ public Color InternalCheckPressedBackground /// Gets the solid color to use when the button is checked and selected and gradients are being used. /// public override Color CheckSelectedBackground => - _colors[(int)PaletteColorIndex.CheckSelectedBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.CheckSelectedBackground] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.CheckSelectedBackground : _colors[(int)PaletteColorIndex.CheckSelectedBackground]; @@ -450,7 +450,7 @@ public Color InternalCheckSelectedBackground /// /// Gets the color to use for shadow effects on the grip (move handle). /// - public override Color GripDark => _colors[(int)PaletteColorIndex.GripDark] == GlobalStaticValues.EMPTY_COLOR ? BaseKCT.GripDark : _colors[(int)PaletteColorIndex.GripDark]; + public override Color GripDark => _colors[(int)PaletteColorIndex.GripDark] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.GripDark : _colors[(int)PaletteColorIndex.GripDark]; /// /// Sets and sets the internal GripDark value. @@ -466,7 +466,7 @@ public Color InternalGripDark /// /// Gets the color to use for highlight effects on the grip (move handle). /// - public override Color GripLight => _colors[(int)PaletteColorIndex.GripLight] == GlobalStaticValues.EMPTY_COLOR ? BaseKCT.GripLight : _colors[(int)PaletteColorIndex.GripLight]; + public override Color GripLight => _colors[(int)PaletteColorIndex.GripLight] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.GripLight : _colors[(int)PaletteColorIndex.GripLight]; /// /// Sets and sets the internal GripLight value. @@ -485,7 +485,7 @@ public Color InternalGripLight /// Gets the starting color of the gradient used in the image margin of a ToolStripDropDownMenu. /// public override Color ImageMarginGradientBegin => - _colors[(int)PaletteColorIndex.ImageMarginGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ImageMarginGradientBegin : _colors[(int)PaletteColorIndex.ImageMarginGradientBegin]; @@ -504,7 +504,7 @@ public Color InternalImageMarginGradientBegin /// Gets the end color of the gradient used in the image margin of a ToolStripDropDownMenu. /// public override Color ImageMarginGradientEnd => - _colors[(int)PaletteColorIndex.ImageMarginGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ImageMarginGradientEnd : _colors[(int)PaletteColorIndex.ImageMarginGradientEnd]; @@ -523,7 +523,7 @@ public Color InternalImageMarginGradientEnd /// Gets the middle color of the gradient used in the image margin of a ToolStripDropDownMenu. /// public override Color ImageMarginGradientMiddle => - _colors[(int)PaletteColorIndex.ImageMarginGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ImageMarginGradientMiddle : _colors[(int)PaletteColorIndex.ImageMarginGradientMiddle]; @@ -542,7 +542,7 @@ public Color InternalImageMarginGradientMiddle /// Gets the starting color of the gradient used in the image margin of a ToolStripDropDownMenu when an item is revealed. /// public override Color ImageMarginRevealedGradientBegin => - _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ImageMarginRevealedGradientBegin : _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientBegin]; @@ -561,7 +561,7 @@ public Color InternalImageMarginRevealedGradientBegin /// Gets the end color of the gradient used in the image margin of a ToolStripDropDownMenu when an item is revealed. /// public override Color ImageMarginRevealedGradientEnd => - _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ImageMarginRevealedGradientEnd : _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientEnd]; @@ -580,7 +580,7 @@ public Color InternalImageMarginRevealedGradientEnd /// Gets the middle color of the gradient used in the image margin of a ToolStripDropDownMenu when an item is revealed. /// public override Color ImageMarginRevealedGradientMiddle => - _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ImageMarginRevealedGradientMiddle : _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientMiddle]; @@ -600,7 +600,7 @@ public Color InternalImageMarginRevealedGradientMiddle /// /// Gets the color that is the border color to use on a MenuStrip. /// - public override Color MenuBorder => _colors[(int)PaletteColorIndex.MenuBorder] == GlobalStaticValues.EMPTY_COLOR ? BaseKCT.MenuBorder : _colors[(int)PaletteColorIndex.MenuBorder]; + public override Color MenuBorder => _colors[(int)PaletteColorIndex.MenuBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuBorder : _colors[(int)PaletteColorIndex.MenuBorder]; /// /// Sets and sets the internal MenuBorder value. @@ -617,7 +617,7 @@ public Color InternalMenuBorder /// Gets the color used to draw menu item text. /// public override Color MenuItemText => - _colors[(int)PaletteColorIndex.MenuItemText] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemText] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemText : _colors[(int)PaletteColorIndex.MenuItemText]; @@ -650,7 +650,7 @@ public Color InternalMenuItemText /// Gets the border color to use with a ToolStripMenuItem. /// public override Color MenuItemBorder => - _colors[(int)PaletteColorIndex.MenuItemBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemBorder : _colors[(int)PaletteColorIndex.MenuItemBorder]; @@ -669,7 +669,7 @@ public Color InternalMenuItemBorder /// Gets the starting color of the gradient used when a top-level ToolStripMenuItem is pressed. /// public override Color MenuItemPressedGradientBegin => - _colors[(int)PaletteColorIndex.MenuItemPressedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemPressedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemPressedGradientBegin : _colors[(int)PaletteColorIndex.MenuItemPressedGradientBegin]; @@ -688,7 +688,7 @@ public Color InternalMenuItemPressedGradientBegin /// Gets the end color of the gradient used when a top-level ToolStripMenuItem is pressed. /// public override Color MenuItemPressedGradientEnd => - _colors[(int)PaletteColorIndex.MenuItemPressedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemPressedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemPressedGradientEnd : _colors[(int)PaletteColorIndex.MenuItemPressedGradientEnd]; @@ -707,7 +707,7 @@ public Color InternalMenuItemPressedGradientEnd /// Gets the middle color of the gradient used when a top-level ToolStripMenuItem is pressed. /// public override Color MenuItemPressedGradientMiddle => - _colors[(int)PaletteColorIndex.MenuItemPressedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemPressedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemPressedGradientMiddle : _colors[(int)PaletteColorIndex.MenuItemPressedGradientMiddle]; @@ -726,7 +726,7 @@ public Color InternalMenuItemPressedGradientMiddle /// Gets the solid color to use when a ToolStripMenuItem other than the top-level ToolStripMenuItem is selected. /// public override Color MenuItemSelected => - _colors[(int)PaletteColorIndex.MenuItemSelected] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemSelected] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemSelected : _colors[(int)PaletteColorIndex.MenuItemSelected]; @@ -745,7 +745,7 @@ public Color InternalMenuItemSelected /// Gets the starting color of the gradient used when the ToolStripMenuItem is selected. /// public override Color MenuItemSelectedGradientBegin => - _colors[(int)PaletteColorIndex.MenuItemSelectedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemSelectedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemSelectedGradientBegin : _colors[(int)PaletteColorIndex.MenuItemSelectedGradientBegin]; @@ -764,7 +764,7 @@ public Color InternalMenuItemSelectedGradientBegin /// Gets the end color of the gradient used when the ToolStripMenuItem is selected. /// public override Color MenuItemSelectedGradientEnd => - _colors[(int)PaletteColorIndex.MenuItemSelectedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemSelectedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuItemSelectedGradientEnd : _colors[(int)PaletteColorIndex.MenuItemSelectedGradientEnd]; @@ -788,7 +788,7 @@ public override Color MenuStripText { if (_colors.Length > (int)PaletteColorIndex.MenuStripText) { - return _colors[(int)PaletteColorIndex.MenuStripText] == GlobalStaticValues.EMPTY_COLOR + return _colors[(int)PaletteColorIndex.MenuStripText] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuStripText : _colors[(int)PaletteColorIndex.MenuStripText]; } @@ -811,7 +811,7 @@ public Color InternalMenuStripText /// Gets the starting color of the gradient used in the MenuStrip. /// public override Color MenuStripGradientBegin => - _colors[(int)PaletteColorIndex.MenuStripGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuStripGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuStripGradientBegin : _colors[(int)PaletteColorIndex.MenuStripGradientBegin]; @@ -830,7 +830,7 @@ public Color InternalMenuStripGradientBegin /// Gets the end color of the gradient used in the MenuStrip. /// public override Color MenuStripGradientEnd => - _colors[(int)PaletteColorIndex.MenuStripGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuStripGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.MenuStripGradientEnd : _colors[(int)PaletteColorIndex.MenuStripGradientEnd]; @@ -851,7 +851,7 @@ public Color InternalMenuStripGradientEnd /// Gets the starting color of the gradient used in the ToolStripOverflowButton. /// public override Color OverflowButtonGradientBegin => - _colors[(int)PaletteColorIndex.OverflowButtonGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.OverflowButtonGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.OverflowButtonGradientBegin : _colors[(int)PaletteColorIndex.OverflowButtonGradientBegin]; @@ -870,7 +870,7 @@ public Color InternalOverflowButtonGradientBegin /// Gets the end color of the gradient used in the ToolStripOverflowButton. /// public override Color OverflowButtonGradientEnd => - _colors[(int)PaletteColorIndex.OverflowButtonGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.OverflowButtonGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.OverflowButtonGradientEnd : _colors[(int)PaletteColorIndex.OverflowButtonGradientEnd]; @@ -889,7 +889,7 @@ public Color InternalOverflowButtonGradientEnd /// Gets the middle color of the gradient used in the ToolStripOverflowButton. /// public override Color OverflowButtonGradientMiddle => - _colors[(int)PaletteColorIndex.OverflowButtonGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.OverflowButtonGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.OverflowButtonGradientMiddle : _colors[(int)PaletteColorIndex.OverflowButtonGradientMiddle]; @@ -910,7 +910,7 @@ public Color InternalOverflowButtonGradientMiddle /// Gets the starting color of the gradient used in the ToolStripContainer. /// public override Color RaftingContainerGradientBegin => - _colors[(int)PaletteColorIndex.RaftingContainerGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.RaftingContainerGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.RaftingContainerGradientBegin : _colors[(int)PaletteColorIndex.RaftingContainerGradientBegin]; @@ -929,7 +929,7 @@ public Color InternalRaftingContainerGradientBegin /// Gets the end color of the gradient used in the ToolStripContainer. /// public override Color RaftingContainerGradientEnd => - _colors[(int)PaletteColorIndex.RaftingContainerGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.RaftingContainerGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.RaftingContainerGradientEnd : _colors[(int)PaletteColorIndex.RaftingContainerGradientEnd]; @@ -950,7 +950,7 @@ public Color InternalRaftingContainerGradientEnd /// Gets the color to use to for shadow effects on the ToolStripSeparator. /// public override Color SeparatorDark => - _colors[(int)PaletteColorIndex.SeparatorDark] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.SeparatorDark] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.SeparatorDark : _colors[(int)PaletteColorIndex.SeparatorDark]; @@ -969,7 +969,7 @@ public Color InternalSeparatorDark /// Gets the color to use to for highlight effects on the ToolStripSeparator. /// public override Color SeparatorLight => - _colors[(int)PaletteColorIndex.SeparatorLight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.SeparatorLight] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.SeparatorLight : _colors[(int)PaletteColorIndex.SeparatorLight]; @@ -990,7 +990,7 @@ public Color InternalSeparatorLight /// Gets the color used to draw text on a status strip. /// public override Color StatusStripText => - _colors[(int)PaletteColorIndex.StatusStripText] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.StatusStripText] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.StatusStripText : _colors[(int)PaletteColorIndex.StatusStripText]; @@ -1023,7 +1023,7 @@ public Color InternalStatusStripText /// Gets the starting color of the gradient used on the StatusStrip. /// public override Color StatusStripGradientBegin => - _colors[(int)PaletteColorIndex.StatusStripGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.StatusStripGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.StatusStripGradientBegin : _colors[(int)PaletteColorIndex.StatusStripGradientBegin]; @@ -1042,7 +1042,7 @@ public Color InternalStatusStripGradientBegin /// Gets the end color of the gradient used on the StatusStrip. /// public override Color StatusStripGradientEnd => - _colors[(int)PaletteColorIndex.StatusStripGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.StatusStripGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.StatusStripGradientEnd : _colors[(int)PaletteColorIndex.StatusStripGradientEnd]; @@ -1063,7 +1063,7 @@ public Color InternalStatusStripGradientEnd /// Gets the color used to draw text on a tool strip. /// public override Color ToolStripText => - _colors[(int)PaletteColorIndex.ToolStripText] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripText] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripText : _colors[(int)PaletteColorIndex.ToolStripText]; @@ -1096,7 +1096,7 @@ public Color InternalToolStripText /// Gets the border color to use on the bottom edge of the ToolStrip. /// public override Color ToolStripBorder => - _colors[(int)PaletteColorIndex.ToolStripBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripBorder] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripBorder : _colors[(int)PaletteColorIndex.ToolStripBorder]; @@ -1115,7 +1115,7 @@ public Color InternalToolStripBorder /// Gets the starting color of the gradient used in the ToolStripContentPanel. /// public override Color ToolStripContentPanelGradientBegin => - _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripContentPanelGradientBegin : _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientBegin]; @@ -1134,7 +1134,7 @@ public Color InternalToolStripContentPanelGradientBegin /// Gets the end color of the gradient used in the ToolStripContentPanel. /// public override Color ToolStripContentPanelGradientEnd => - _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripContentPanelGradientEnd : _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientEnd]; @@ -1153,7 +1153,7 @@ public Color InternalToolStripContentPanelGradientEnd /// Gets the solid background color of the ToolStripDropDown. /// public override Color ToolStripDropDownBackground => - _colors[(int)PaletteColorIndex.ToolStripDropDownBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripDropDownBackground] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripDropDownBackground : _colors[(int)PaletteColorIndex.ToolStripDropDownBackground]; @@ -1172,7 +1172,7 @@ public Color InternalToolStripDropDownBackground /// Gets the starting color of the gradient used in the ToolStrip background. /// public override Color ToolStripGradientBegin => - _colors[(int)PaletteColorIndex.ToolStripGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripGradientBegin : _colors[(int)PaletteColorIndex.ToolStripGradientBegin]; @@ -1191,7 +1191,7 @@ public Color InternalToolStripGradientBegin /// Gets the end color of the gradient used in the ToolStrip background. /// public override Color ToolStripGradientEnd => - _colors[(int)PaletteColorIndex.ToolStripGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripGradientEnd : _colors[(int)PaletteColorIndex.ToolStripGradientEnd]; @@ -1210,7 +1210,7 @@ public Color InternalToolStripGradientEnd /// Gets the middle color of the gradient used in the ToolStrip background. /// public override Color ToolStripGradientMiddle => - _colors[(int)PaletteColorIndex.ToolStripGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripGradientMiddle : _colors[(int)PaletteColorIndex.ToolStripGradientMiddle]; @@ -1229,7 +1229,7 @@ public Color InternalToolStripGradientMiddle /// Gets the starting color of the gradient used in the ToolStripPanel. /// public override Color ToolStripPanelGradientBegin => - _colors[(int)PaletteColorIndex.ToolStripPanelGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripPanelGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripPanelGradientBegin : _colors[(int)PaletteColorIndex.ToolStripPanelGradientBegin]; @@ -1248,7 +1248,7 @@ public Color InternalToolStripPanelGradientBegin /// Gets the end color of the gradient used in the ToolStripPanel. /// public override Color ToolStripPanelGradientEnd => - _colors[(int)PaletteColorIndex.ToolStripPanelGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripPanelGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? BaseKCT.ToolStripPanelGradientEnd : _colors[(int)PaletteColorIndex.ToolStripPanelGradientEnd]; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecTyped.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecTyped.cs index 81d884af6f..4e3a2687e7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecTyped.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteButtonSpecTyped.cs @@ -42,7 +42,7 @@ internal KryptonPaletteButtonSpecTyped([DisallowNull] PaletteRedirect redirector _text = string.Empty; _extraText = string.Empty; _toolTipTitle = string.Empty; - _colorMap = GlobalStaticValues.EMPTY_COLOR; + _colorMap = GlobalStaticVariables.EMPTY_COLOR; _allowInheritImage = true; _allowInheritText = true; _allowInheritExtraText = true; @@ -66,7 +66,7 @@ internal KryptonPaletteButtonSpecTyped([DisallowNull] PaletteRedirect redirector (Text == string.Empty) && (ExtraText == string.Empty) && (ToolTipTitle == string.Empty) && - (ColorMap == GlobalStaticValues.EMPTY_COLOR) && + (ColorMap == GlobalStaticVariables.EMPTY_COLOR) && AllowInheritImage && AllowInheritText && AllowInheritExtraText && @@ -264,12 +264,12 @@ public Color ColorMap } } - private bool ShouldSerializeColorMap() => ColorMap != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeColorMap() => ColorMap != GlobalStaticVariables.EMPTY_COLOR; /// /// Resets the ColorMap property to its default value. /// - public void ResetColorMap() => ColorMap = GlobalStaticValues.EMPTY_COLOR; + public void ResetColorMap() => ColorMap = GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -451,7 +451,7 @@ public override string GetButtonSpecLongText(PaletteButtonSpecStyle style) => /// Style of button spec. /// Color value. public override Color GetButtonSpecColorMap(PaletteButtonSpecStyle style) => - ColorMap != GlobalStaticValues.EMPTY_COLOR ? ColorMap : base.GetButtonSpecColorMap(style); + ColorMap != GlobalStaticVariables.EMPTY_COLOR ? ColorMap : base.GetButtonSpecColorMap(style); #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCargo.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCargo.cs index 462142d34c..dff2d9f1a3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCargo.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCargo.cs @@ -28,11 +28,11 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) NeedPaint = needPaint; // Default cargo values - Color1 = GlobalStaticValues.EMPTY_COLOR; - Color2 = GlobalStaticValues.EMPTY_COLOR; - Color3 = GlobalStaticValues.EMPTY_COLOR; - Color4 = GlobalStaticValues.EMPTY_COLOR; - Color5 = GlobalStaticValues.EMPTY_COLOR; + Color1 = GlobalStaticVariables.EMPTY_COLOR; + Color2 = GlobalStaticVariables.EMPTY_COLOR; + Color3 = GlobalStaticVariables.EMPTY_COLOR; + Color4 = GlobalStaticVariables.EMPTY_COLOR; + Color5 = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -43,11 +43,11 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (Color1 == GlobalStaticValues.EMPTY_COLOR) && - (Color2 == GlobalStaticValues.EMPTY_COLOR) && - (Color3 == GlobalStaticValues.EMPTY_COLOR) && - (Color4 == GlobalStaticValues.EMPTY_COLOR) && - (Color5 == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (Color1 == GlobalStaticVariables.EMPTY_COLOR) && + (Color2 == GlobalStaticVariables.EMPTY_COLOR) && + (Color3 == GlobalStaticVariables.EMPTY_COLOR) && + (Color4 == GlobalStaticVariables.EMPTY_COLOR) && + (Color5 == GlobalStaticVariables.EMPTY_COLOR); //(Font1 == null) && //(Font2 == null); @@ -67,7 +67,7 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) /// /// esets the Color1 property to its default value. /// - public void ResetColor1() => Color1 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor1() => Color1 = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Color2 @@ -84,7 +84,7 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) /// /// esets the Color2 property to its default value. /// - public void ResetColor2() => Color2 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor2() => Color2 = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Color3 @@ -101,7 +101,7 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) /// /// esets the Color3 property to its default value. /// - public void ResetColor3() => Color3 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor3() => Color3 = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Color4 @@ -118,7 +118,7 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) /// /// esets the Color4 property to its default value. /// - public void ResetColor4() => Color4 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor4() => Color4 = GlobalStaticVariables.EMPTY_COLOR; #endregion #region Color5 @@ -135,7 +135,7 @@ public KryptonPaletteCargo(NeedPaintHandler needPaint) /// /// esets the Color5 property to its default value. /// - public void ResetColor5() => Color5 = GlobalStaticValues.EMPTY_COLOR; + public void ResetColor5() => Color5 = GlobalStaticVariables.EMPTY_COLOR; #endregion /* diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCueHintText.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCueHintText.cs index 6495201583..5960897d22 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCueHintText.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteCueHintText.cs @@ -20,7 +20,7 @@ public KryptonPaletteCueHintText(NeedPaintHandler needPaint) { NeedPaint = needPaint; - CueColor = GlobalStaticValues.EMPTY_COLOR; + CueColor = GlobalStaticVariables.EMPTY_COLOR; CueFont = null; } @@ -28,13 +28,13 @@ public KryptonPaletteCueHintText(NeedPaintHandler needPaint) #endregion [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (CueColor == GlobalStaticValues.EMPTY_COLOR) && (CueFont == null); + public override bool IsDefault => (CueColor == GlobalStaticVariables.EMPTY_COLOR) && (CueFont == null); #region Colour public Color CueColor { get; set; } - public void ResetCueColor() => CueColor = GlobalStaticValues.EMPTY_COLOR; + public void ResetCueColor() => CueColor = GlobalStaticVariables.EMPTY_COLOR; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSButton.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSButton.cs index d06c5d35ee..eec71b91a7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSButton.cs @@ -36,29 +36,29 @@ internal KryptonPaletteTMSButton(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalButtonCheckedGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonCheckedGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonCheckedGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonCheckedHighlight == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonCheckedHighlightBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonPressedBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonPressedGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonPressedGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonPressedGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonPressedHighlight == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonPressedHighlightBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonSelectedBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonSelectedGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonSelectedGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonSelectedGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonSelectedHighlight == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalButtonSelectedHighlightBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalCheckBackground == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalCheckPressedBackground == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalCheckSelectedBackground == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalOverflowButtonGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalOverflowButtonGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalOverflowButtonGradientMiddle == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (InternalKCT.InternalButtonCheckedGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonCheckedGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonCheckedGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonCheckedHighlight == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonCheckedHighlightBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonPressedBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonPressedGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonPressedGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonPressedGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonPressedHighlight == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonPressedHighlightBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonSelectedBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonSelectedGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonSelectedGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonSelectedGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonSelectedHighlight == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalButtonSelectedHighlightBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalCheckBackground == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalCheckPressedBackground == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalCheckSelectedBackground == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalOverflowButtonGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalOverflowButtonGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalOverflowButtonGradientMiddle == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -116,7 +116,7 @@ public Color ButtonCheckedGradientBegin /// /// Resets the ButtonCheckedGradientBegin property to its default value. /// - public void ResetButtonCheckedGradientBegin() => ButtonCheckedGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonCheckedGradientBegin() => ButtonCheckedGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonCheckedGradientEnd @@ -141,7 +141,7 @@ public Color ButtonCheckedGradientEnd /// /// Resets the ButtonCheckedGradientEnd property to its default value. /// - public void ResetButtonCheckedGradientEnd() => ButtonCheckedGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonCheckedGradientEnd() => ButtonCheckedGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonCheckedGradientMiddle @@ -166,7 +166,7 @@ public Color ButtonCheckedGradientMiddle /// /// Resets the ButtonCheckedGradientMiddle property to its default value. /// - public void ResetButtonCheckedGradientMiddle() => ButtonCheckedGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonCheckedGradientMiddle() => ButtonCheckedGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonCheckedHighlight @@ -191,7 +191,7 @@ public Color ButtonCheckedHighlight /// /// Resets the ButtonCheckedHighlight property to its default value. /// - public void ResetButtonCheckedHighlight() => ButtonCheckedHighlight = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonCheckedHighlight() => ButtonCheckedHighlight = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonCheckedHighlightBorder @@ -216,7 +216,7 @@ public Color ButtonCheckedHighlightBorder /// /// Resets the ButtonCheckedHighlightBorder property to its default value. /// - public void ResetButtonCheckedHighlightBorder() => ButtonCheckedHighlightBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonCheckedHighlightBorder() => ButtonCheckedHighlightBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonPressedBorder @@ -241,7 +241,7 @@ public Color ButtonPressedBorder /// /// Resets the ButtonPressedBorder property to its default value. /// - public void ResetButtonPressedBorder() => ButtonPressedBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonPressedBorder() => ButtonPressedBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonPressedGradientBegin @@ -266,7 +266,7 @@ public Color ButtonPressedGradientBegin /// /// Resets the ButtonPressedGradientBegin property to its default value. /// - public void ResetButtonPressedGradientBegin() => ButtonPressedGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonPressedGradientBegin() => ButtonPressedGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonPressedGradientEnd @@ -291,7 +291,7 @@ public Color ButtonPressedGradientEnd /// /// Resets the ButtonPressedGradientEnd property to its default value. /// - public void ResetButtonPressedGradientEnd() => ButtonPressedGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonPressedGradientEnd() => ButtonPressedGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonPressedGradientMiddle @@ -316,7 +316,7 @@ public Color ButtonPressedGradientMiddle /// /// Resets the ButtonPressedGradientMiddle property to its default value. /// - public void ResetButtonPressedGradientMiddle() => ButtonPressedGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonPressedGradientMiddle() => ButtonPressedGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonPressedHighlight @@ -341,7 +341,7 @@ public Color ButtonPressedHighlight /// /// Resets the ButtonPressedHighlight property to its default value. /// - public void ResetButtonPressedHighlight() => ButtonPressedHighlight = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonPressedHighlight() => ButtonPressedHighlight = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonPressedHighlightBorder @@ -366,7 +366,7 @@ public Color ButtonPressedHighlightBorder /// /// Resets the ButtonPressedHighlightBorder property to its default value. /// - public void ResetButtonPressedHighlightBorder() => ButtonPressedHighlightBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonPressedHighlightBorder() => ButtonPressedHighlightBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonSelectedBorder @@ -391,7 +391,7 @@ public Color ButtonSelectedBorder /// /// Resets the ButtonSelectedBorder property to its default value. /// - public void ResetButtonSelectedBorder() => ButtonSelectedBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonSelectedBorder() => ButtonSelectedBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonSelectedGradientBegin @@ -416,7 +416,7 @@ public Color ButtonSelectedGradientBegin /// /// Resets the ButtonSelectedGradientBegin property to its default value. /// - public void ResetButtonSelectedGradientBegin() => ButtonSelectedGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonSelectedGradientBegin() => ButtonSelectedGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonSelectedGradientEnd @@ -441,7 +441,7 @@ public Color ButtonSelectedGradientEnd /// /// Resets the ButtonSelectedGradientEnd property to its default value. /// - public void ResetButtonSelectedGradientEnd() => ButtonSelectedGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonSelectedGradientEnd() => ButtonSelectedGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonSelectedGradientMiddle @@ -466,7 +466,7 @@ public Color ButtonSelectedGradientMiddle /// /// Resets the ButtonSelectedGradientMiddle property to its default value. /// - public void ResetButtonSelectedGradientMiddle() => ButtonSelectedGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonSelectedGradientMiddle() => ButtonSelectedGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonSelectedHighlight @@ -491,7 +491,7 @@ public Color ButtonSelectedHighlight /// /// Resets the ButtonSelectedHighlight property to its default value. /// - public void ResetButtonSelectedHighlight() => ButtonSelectedHighlight = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonSelectedHighlight() => ButtonSelectedHighlight = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ButtonSelectedHighlightBorder @@ -516,7 +516,7 @@ public Color ButtonSelectedHighlightBorder /// /// Resets the ButtonSelectedHighlightBorder property to its default value. /// - public void ResetButtonSelectedHighlightBorder() => ButtonSelectedHighlightBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetButtonSelectedHighlightBorder() => ButtonSelectedHighlightBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region CheckBackground @@ -541,7 +541,7 @@ public Color CheckBackground /// /// esets the CheckBackground property to its default value. /// - public void ResetCheckBackground() => CheckBackground = GlobalStaticValues.EMPTY_COLOR; + public void ResetCheckBackground() => CheckBackground = GlobalStaticVariables.EMPTY_COLOR; #endregion #region CheckPressedBackground @@ -566,7 +566,7 @@ public Color CheckPressedBackground /// /// esets the CheckPressedBackground property to its default value. /// - public void ResetCheckPressedBackground() => CheckPressedBackground = GlobalStaticValues.EMPTY_COLOR; + public void ResetCheckPressedBackground() => CheckPressedBackground = GlobalStaticVariables.EMPTY_COLOR; #endregion #region CheckSelectedBackground @@ -591,7 +591,7 @@ public Color CheckSelectedBackground /// /// esets the CheckSelectedBackground property to its default value. /// - public void ResetCheckSelectedBackground() => CheckSelectedBackground = GlobalStaticValues.EMPTY_COLOR; + public void ResetCheckSelectedBackground() => CheckSelectedBackground = GlobalStaticVariables.EMPTY_COLOR; #endregion #region OverflowButtonGradientBegin @@ -616,7 +616,7 @@ public Color OverflowButtonGradientBegin /// /// esets the OverflowButtonGradientBegin property to its default value. /// - public void ResetOverflowButtonGradientBegin() => OverflowButtonGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetOverflowButtonGradientBegin() => OverflowButtonGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region OverflowButtonGradientEnd @@ -641,7 +641,7 @@ public Color OverflowButtonGradientEnd /// /// esets the OverflowButtonGradientEnd property to its default value. /// - public void ResetOverflowButtonGradientEnd() => OverflowButtonGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetOverflowButtonGradientEnd() => OverflowButtonGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region OverflowButtonGradientMiddle @@ -666,6 +666,6 @@ public Color OverflowButtonGradientMiddle /// /// esets the OverflowButtonGradientMiddle property to its default value. /// - public void ResetOverflowButtonGradientMiddle() => OverflowButtonGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetOverflowButtonGradientMiddle() => OverflowButtonGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSGrip.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSGrip.cs index cf51b95fd3..24bfddc578 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSGrip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSGrip.cs @@ -36,8 +36,8 @@ internal KryptonPaletteTMSGrip(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalGripDark == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalGripLight == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (InternalKCT.InternalGripDark == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalGripLight == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -74,7 +74,7 @@ public Color GripDark /// /// esets the GripDark property to its default value. /// - public void ResetGripDark() => GripDark = GlobalStaticValues.EMPTY_COLOR; + public void ResetGripDark() => GripDark = GlobalStaticVariables.EMPTY_COLOR; #endregion #region GripLight @@ -99,6 +99,6 @@ public Color GripLight /// /// esets the GripLight property to its default value. /// - public void ResetGripLight() => GripLight = GlobalStaticValues.EMPTY_COLOR; + public void ResetGripLight() => GripLight = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenu.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenu.cs index fd9b24e0b8..bc93f9a5f8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenu.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenu.cs @@ -36,21 +36,21 @@ internal KryptonPaletteTMSMenu(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalImageMarginGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalImageMarginGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalImageMarginGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalImageMarginRevealedGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalImageMarginRevealedGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalImageMarginRevealedGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemText == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemPressedGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemPressedGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemPressedGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemSelected == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemSelectedGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuItemSelectedGradientEnd == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (InternalKCT.InternalImageMarginGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalImageMarginGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalImageMarginGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalImageMarginRevealedGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalImageMarginRevealedGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalImageMarginRevealedGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemText == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemPressedGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemPressedGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemPressedGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemSelected == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemSelectedGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuItemSelectedGradientEnd == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -100,7 +100,7 @@ public Color ImageMarginGradientBegin /// /// Resets the ImageMarginGradientBegin property to its default value. /// - public void ResetImageMarginGradientBegin() => ImageMarginGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageMarginGradientBegin() => ImageMarginGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ImageMarginGradientEnd @@ -125,7 +125,7 @@ public Color ImageMarginGradientEnd /// /// esets the ImageMarginGradientEnd property to its default value. /// - public void ResetImageMarginGradientEnd() => ImageMarginGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageMarginGradientEnd() => ImageMarginGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ImageMarginGradientMiddle @@ -150,7 +150,7 @@ public Color ImageMarginGradientMiddle /// /// esets the ImageMarginGradientMiddle property to its default value. /// - public void ResetImageMarginGradientMiddle() => ImageMarginGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageMarginGradientMiddle() => ImageMarginGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ImageMarginRevealedGradientBegin @@ -175,7 +175,7 @@ public Color ImageMarginRevealedGradientBegin /// /// esets the ImageMarginRevealedGradientBegin property to its default value. /// - public void ResetImageMarginRevealedGradientBegin() => ImageMarginRevealedGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageMarginRevealedGradientBegin() => ImageMarginRevealedGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ImageMarginRevealedGradientEnd @@ -200,7 +200,7 @@ public Color ImageMarginRevealedGradientEnd /// /// esets the ImageMarginRevealedGradientEnd property to its default value. /// - public void ResetImageMarginRevealedGradientEnd() => ImageMarginRevealedGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageMarginRevealedGradientEnd() => ImageMarginRevealedGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ImageMarginRevealedGradientMiddle @@ -225,7 +225,7 @@ public Color ImageMarginRevealedGradientMiddle /// /// esets the ImageMarginRevealedGradientMiddle property to its default value. /// - public void ResetImageMarginRevealedGradientMiddle() => ImageMarginRevealedGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageMarginRevealedGradientMiddle() => ImageMarginRevealedGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuBorder @@ -250,7 +250,7 @@ public Color MenuBorder /// /// esets the MenuBorder property to its default value. /// - public void ResetMenuBorder() => MenuBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuBorder() => MenuBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemText @@ -275,7 +275,7 @@ public Color MenuItemText /// /// esets the MenuItemText property to its default value. /// - public void ResetMenuItemText() => MenuItemText = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemText() => MenuItemText = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemBorder @@ -300,7 +300,7 @@ public Color MenuItemBorder /// /// esets the MenuItemBorder property to its default value. /// - public void ResetMenuItemBorder() => MenuItemBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemBorder() => MenuItemBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemPressedGradientBegin @@ -325,7 +325,7 @@ public Color MenuItemPressedGradientBegin /// /// esets the MenuItemPressedGradientBegin property to its default value. /// - public void ResetMenuItemPressedGradientBegin() => MenuItemPressedGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemPressedGradientBegin() => MenuItemPressedGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemPressedGradientEnd @@ -350,7 +350,7 @@ public Color MenuItemPressedGradientEnd /// /// esets the MenuItemPressedGradientEnd property to its default value. /// - public void ResetMenuItemPressedGradientEnd() => MenuItemPressedGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemPressedGradientEnd() => MenuItemPressedGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemPressedGradientMiddle @@ -375,7 +375,7 @@ public Color MenuItemPressedGradientMiddle /// /// esets the MenuItemPressedGradientMiddle property to its default value. /// - public void ResetMenuItemPressedGradientMiddle() => MenuItemPressedGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemPressedGradientMiddle() => MenuItemPressedGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemSelected @@ -400,7 +400,7 @@ public Color MenuItemSelected /// /// esets the MenuItemSelected property to its default value. /// - public void ResetMenuItemSelected() => MenuItemSelected = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemSelected() => MenuItemSelected = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemSelectedGradientBegin @@ -425,7 +425,7 @@ public Color MenuItemSelectedGradientBegin /// /// esets the MenuItemSelectedGradientBegin property to its default value. /// - public void ResetMenuItemSelectedGradientBegin() => MenuItemSelectedGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemSelectedGradientBegin() => MenuItemSelectedGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuItemSelectedGradientEnd @@ -450,6 +450,6 @@ public Color MenuItemSelectedGradientEnd /// /// esets the MenuItemSelectedGradientEnd property to its default value. /// - public void ResetMenuItemSelectedGradientEnd() => MenuItemSelectedGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuItemSelectedGradientEnd() => MenuItemSelectedGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenuStrip.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenuStrip.cs index 332f61ddd1..7cb68e5b5e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenuStrip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSMenuStrip.cs @@ -36,10 +36,10 @@ internal KryptonPaletteTMSMenuStrip(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalMenuStripText == GlobalStaticValues.EMPTY_COLOR) && + public override bool IsDefault => (InternalKCT.InternalMenuStripText == GlobalStaticVariables.EMPTY_COLOR) && (InternalKCT.InternalMenuStripFont == null) && - (InternalKCT.InternalMenuStripGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalMenuStripGradientEnd == GlobalStaticValues.EMPTY_COLOR); + (InternalKCT.InternalMenuStripGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalMenuStripGradientEnd == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -78,7 +78,7 @@ public Color MenuStripText /// /// esets the MenuStripText property to its default value. /// - public void ResetMenuStripText() => MenuStripText = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuStripText() => MenuStripText = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuStripFont @@ -128,7 +128,7 @@ public Color MenuStripGradientBegin /// /// esets the MenuStripGradientBegin property to its default value. /// - public void ResetMenuStripGradientBegin() => MenuStripGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuStripGradientBegin() => MenuStripGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region MenuStripGradientEnd @@ -153,6 +153,6 @@ public Color MenuStripGradientEnd /// /// esets the MenuStripGradientEnd property to its default value. /// - public void ResetMenuStripGradientEnd() => MenuStripGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetMenuStripGradientEnd() => MenuStripGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSRafting.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSRafting.cs index dafcf617ce..351cf32084 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSRafting.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSRafting.cs @@ -36,8 +36,8 @@ internal KryptonPaletteTMSRafting(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalRaftingContainerGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalRaftingContainerGradientEnd == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (InternalKCT.InternalRaftingContainerGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalRaftingContainerGradientEnd == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -74,7 +74,7 @@ public Color RaftingContainerGradientBegin /// /// esets the RaftingContainerGradientBegin property to its default value. /// - public void ResetRaftingContainerGradientBegin() => RaftingContainerGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetRaftingContainerGradientBegin() => RaftingContainerGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region RaftingContainerGradientEnd @@ -99,6 +99,6 @@ public Color RaftingContainerGradientEnd /// /// esets the RaftingContainerGradientEnd property to its default value. /// - public void ResetRaftingContainerGradientEnd() => RaftingContainerGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetRaftingContainerGradientEnd() => RaftingContainerGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSSeparator.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSSeparator.cs index d9cd7b87ea..e44c5274bf 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSSeparator.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSSeparator.cs @@ -36,8 +36,8 @@ internal KryptonPaletteTMSSeparator(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalSeparatorDark == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalSeparatorLight == GlobalStaticValues.EMPTY_COLOR); + public override bool IsDefault => (InternalKCT.InternalSeparatorDark == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalSeparatorLight == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -74,7 +74,7 @@ public Color SeparatorDark /// /// Resets the SeparatorDark property to its default value. /// - public void ResetSeparatorDark() => SeparatorDark = GlobalStaticValues.EMPTY_COLOR; + public void ResetSeparatorDark() => SeparatorDark = GlobalStaticVariables.EMPTY_COLOR; #endregion #region SeparatorLight @@ -99,6 +99,6 @@ public Color SeparatorLight /// /// Resets the SeparatorLight property to its default value. /// - public void ResetSeparatorLight() => SeparatorLight = GlobalStaticValues.EMPTY_COLOR; + public void ResetSeparatorLight() => SeparatorLight = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSStatusStrip.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSStatusStrip.cs index 485372fd5c..e845d3a8a2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSStatusStrip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSStatusStrip.cs @@ -36,10 +36,10 @@ internal KryptonPaletteTMSStatusStrip(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalStatusStripText == GlobalStaticValues.EMPTY_COLOR) && + public override bool IsDefault => (InternalKCT.InternalStatusStripText == GlobalStaticVariables.EMPTY_COLOR) && (InternalKCT.InternalStatusStripFont == null) && - (InternalKCT.InternalStatusStripGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalStatusStripGradientEnd == GlobalStaticValues.EMPTY_COLOR); + (InternalKCT.InternalStatusStripGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalStatusStripGradientEnd == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -78,7 +78,7 @@ public Color StatusStripText /// /// Resets the StatusStripText property to its default value. /// - public void ResetStatusStripText() => StatusStripText = GlobalStaticValues.EMPTY_COLOR; + public void ResetStatusStripText() => StatusStripText = GlobalStaticVariables.EMPTY_COLOR; #endregion #region StatusStripFont @@ -103,7 +103,7 @@ public Font? StatusStripFont /// /// Resets the StatusStripFont property to its default value. /// - public void ResetStatusStripFont() => StatusStripText = GlobalStaticValues.EMPTY_COLOR; + public void ResetStatusStripFont() => StatusStripText = GlobalStaticVariables.EMPTY_COLOR; #endregion #region StatusStripGradientBegin @@ -128,7 +128,7 @@ public Color StatusStripGradientBegin /// /// Resets the StatusStripGradientBegin property to its default value. /// - public void ResetStatusStripGradientBegin() => StatusStripGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetStatusStripGradientBegin() => StatusStripGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region StatusStripGradientEnd @@ -153,6 +153,6 @@ public Color StatusStripGradientEnd /// /// Resets the StatusStripGradientEnd property to its default value. /// - public void ResetStatusStripGradientEnd() => StatusStripGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetStatusStripGradientEnd() => StatusStripGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSToolStrip.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSToolStrip.cs index 5dc9d71450..be6a1e903f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSToolStrip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Component/KryptonPaletteTMSToolStrip.cs @@ -36,17 +36,17 @@ internal KryptonPaletteTMSToolStrip(KryptonInternalKCT internalKCT, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => (InternalKCT.InternalToolStripText == GlobalStaticValues.EMPTY_COLOR) && + public override bool IsDefault => (InternalKCT.InternalToolStripText == GlobalStaticVariables.EMPTY_COLOR) && (InternalKCT.InternalToolStripFont == null) && - (InternalKCT.InternalToolStripBorder == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripContentPanelGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripContentPanelGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripDropDownBackground == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripGradientEnd == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripGradientMiddle == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripPanelGradientBegin == GlobalStaticValues.EMPTY_COLOR) && - (InternalKCT.InternalToolStripPanelGradientEnd == GlobalStaticValues.EMPTY_COLOR); + (InternalKCT.InternalToolStripBorder == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripContentPanelGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripContentPanelGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripDropDownBackground == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripGradientEnd == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripGradientMiddle == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripPanelGradientBegin == GlobalStaticVariables.EMPTY_COLOR) && + (InternalKCT.InternalToolStripPanelGradientEnd == GlobalStaticVariables.EMPTY_COLOR); #endregion @@ -92,7 +92,7 @@ public Color ToolStripText /// /// esets the ToolStripText property to its default value. /// - public void ResetToolStripText() => ToolStripText = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripText() => ToolStripText = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripFont @@ -142,7 +142,7 @@ public Color ToolStripBorder /// /// esets the ToolStripBorder property to its default value. /// - public void ResetToolStripBorder() => ToolStripBorder = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripBorder() => ToolStripBorder = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripContentPanelGradientBegin @@ -167,7 +167,7 @@ public Color ToolStripContentPanelGradientBegin /// /// esets the ToolStripContentPanelGradientBegin property to its default value. /// - public void ResetToolStripContentPanelGradientBegin() => ToolStripContentPanelGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripContentPanelGradientBegin() => ToolStripContentPanelGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripContentPanelGradientEnd @@ -192,7 +192,7 @@ public Color ToolStripContentPanelGradientEnd /// /// esets the ToolStripContentPanelGradientEnd property to its default value. /// - public void ResetToolStripContentPanelGradientEnd() => ToolStripContentPanelGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripContentPanelGradientEnd() => ToolStripContentPanelGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripDropDownBackground @@ -217,7 +217,7 @@ public Color ToolStripDropDownBackground /// /// esets the ToolStripDropDownBackground property to its default value. /// - public void ResetToolStripDropDownBackground() => ToolStripDropDownBackground = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripDropDownBackground() => ToolStripDropDownBackground = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripGradientBegin @@ -242,7 +242,7 @@ public Color ToolStripGradientBegin /// /// esets the ToolStripGradientBegin property to its default value. /// - public void ResetToolStripGradientBegin() => ToolStripGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripGradientBegin() => ToolStripGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripGradientEnd @@ -267,7 +267,7 @@ public Color ToolStripGradientEnd /// /// esets the ToolStripGradientEnd property to its default value. /// - public void ResetToolStripGradientEnd() => ToolStripGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripGradientEnd() => ToolStripGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripGradientMiddle @@ -292,7 +292,7 @@ public Color ToolStripGradientMiddle /// /// esets the ToolStripGradientMiddle property to its default value. /// - public void ResetToolStripGradientMiddle() => ToolStripGradientMiddle = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripGradientMiddle() => ToolStripGradientMiddle = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripPanelGradientBegin @@ -317,7 +317,7 @@ public Color ToolStripPanelGradientBegin /// /// esets the ToolStripPanelGradientBegin property to its default value. /// - public void ResetToolStripPanelGradientBegin() => ToolStripPanelGradientBegin = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripPanelGradientBegin() => ToolStripPanelGradientBegin = GlobalStaticVariables.EMPTY_COLOR; #endregion #region ToolStripPanelGradientEnd @@ -342,6 +342,6 @@ public Color ToolStripPanelGradientEnd /// /// esets the ToolStripPanelGradientEnd property to its default value. /// - public void ResetToolStripPanelGradientEnd() => ToolStripPanelGradientEnd = GlobalStaticValues.EMPTY_COLOR; + public void ResetToolStripPanelGradientEnd() => ToolStripPanelGradientEnd = GlobalStaticVariables.EMPTY_COLOR; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonProfessionalCustomKCT.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonProfessionalCustomKCT.cs index ed6d62e296..9e53b83b89 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonProfessionalCustomKCT.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/KryptonProfessionalCustomKCT.cs @@ -40,7 +40,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// /// Gets the starting color of the gradient used when the button is checked. /// - public override Color ButtonCheckedGradientBegin => _colors[(int) PaletteColorIndex.ButtonCheckedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + public override Color ButtonCheckedGradientBegin => _colors[(int) PaletteColorIndex.ButtonCheckedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonCheckedGradientBegin : _colors[(int) PaletteColorIndex.ButtonCheckedGradientBegin]; @@ -51,7 +51,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used when the button is checked. /// public override Color ButtonCheckedGradientEnd => - _colors[(int)PaletteColorIndex.ButtonCheckedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonCheckedGradientEnd : _colors[(int)PaletteColorIndex.ButtonCheckedGradientEnd]; @@ -62,7 +62,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used when the button is checked. /// public override Color ButtonCheckedGradientMiddle => - _colors[(int)PaletteColorIndex.ButtonCheckedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonCheckedGradientMiddle : _colors[(int)PaletteColorIndex.ButtonCheckedGradientMiddle]; @@ -73,7 +73,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color used when the button is checked. /// public override Color ButtonCheckedHighlight => - _colors[(int)PaletteColorIndex.ButtonCheckedHighlight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedHighlight] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonCheckedHighlight : _colors[(int)PaletteColorIndex.ButtonCheckedHighlight]; @@ -84,7 +84,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use with ButtonCheckedHighlight. /// public override Color ButtonCheckedHighlightBorder => - _colors[(int)PaletteColorIndex.ButtonCheckedHighlightBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonCheckedHighlightBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonCheckedHighlightBorder : _colors[(int)PaletteColorIndex.ButtonCheckedHighlightBorder]; @@ -95,7 +95,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use with the ButtonPressedGradientBegin, ButtonPressedGradientMiddle, and ButtonPressedGradientEnd colors. /// public override Color ButtonPressedBorder => - _colors[(int)PaletteColorIndex.ButtonPressedBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonPressedBorder : _colors[(int)PaletteColorIndex.ButtonPressedBorder]; @@ -106,7 +106,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used when the button is pressed. /// public override Color ButtonPressedGradientBegin => - _colors[(int)PaletteColorIndex.ButtonPressedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonPressedGradientBegin : _colors[(int)PaletteColorIndex.ButtonPressedGradientBegin]; @@ -117,7 +117,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used when the button is pressed. /// public override Color ButtonPressedGradientEnd => - _colors[(int)PaletteColorIndex.ButtonPressedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonPressedGradientEnd : _colors[(int)PaletteColorIndex.ButtonPressedGradientEnd]; @@ -128,7 +128,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used when the button is pressed. /// public override Color ButtonPressedGradientMiddle => - _colors[(int)PaletteColorIndex.ButtonPressedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonPressedGradientMiddle : _colors[(int)PaletteColorIndex.ButtonPressedGradientMiddle]; @@ -139,7 +139,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color used when the button is pressed. /// public override Color ButtonPressedHighlight => - _colors[(int)PaletteColorIndex.ButtonPressedHighlight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedHighlight] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonPressedHighlight : _colors[(int)PaletteColorIndex.ButtonPressedHighlight]; @@ -150,7 +150,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use with ButtonPressedHighlight. /// public override Color ButtonPressedHighlightBorder => - _colors[(int)PaletteColorIndex.ButtonPressedHighlightBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonPressedHighlightBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonPressedHighlightBorder : _colors[(int)PaletteColorIndex.ButtonPressedHighlightBorder]; @@ -161,7 +161,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use with the ButtonSelectedGradientBegin, ButtonSelectedGradientMiddle, and ButtonSelectedGradientEnd colors. /// public override Color ButtonSelectedBorder => - _colors[(int)PaletteColorIndex.ButtonSelectedBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonSelectedBorder : _colors[(int)PaletteColorIndex.ButtonSelectedBorder]; @@ -172,7 +172,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used when the button is selected. /// public override Color ButtonSelectedGradientBegin => - _colors[(int)PaletteColorIndex.ButtonSelectedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonSelectedGradientBegin : _colors[(int)PaletteColorIndex.ButtonSelectedGradientBegin]; @@ -183,7 +183,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used when the button is selected. /// public override Color ButtonSelectedGradientEnd => - _colors[(int)PaletteColorIndex.ButtonSelectedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonSelectedGradientEnd : _colors[(int)PaletteColorIndex.ButtonSelectedGradientEnd]; @@ -194,7 +194,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used when the button is selected. /// public override Color ButtonSelectedGradientMiddle => - _colors[(int)PaletteColorIndex.ButtonSelectedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonSelectedGradientMiddle : _colors[(int)PaletteColorIndex.ButtonSelectedGradientMiddle]; @@ -205,7 +205,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color used when the button is selected. /// public override Color ButtonSelectedHighlight => - _colors[(int)PaletteColorIndex.ButtonSelectedHighlight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedHighlight] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonSelectedHighlight : _colors[(int)PaletteColorIndex.ButtonSelectedHighlight]; @@ -216,7 +216,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use with ButtonSelectedHighlight. /// public override Color ButtonSelectedHighlightBorder => - _colors[(int)PaletteColorIndex.ButtonSelectedHighlightBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ButtonSelectedHighlightBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.ButtonSelectedHighlightBorder : _colors[(int)PaletteColorIndex.ButtonSelectedHighlightBorder]; @@ -229,7 +229,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color to use when the button is checked and gradients are being used. /// public override Color CheckBackground => - _colors[(int)PaletteColorIndex.CheckBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.CheckBackground] == GlobalStaticVariables.EMPTY_COLOR ? base.CheckBackground : _colors[(int)PaletteColorIndex.CheckBackground]; @@ -240,7 +240,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color to use when the button is checked and selected and gradients are being used. /// public override Color CheckPressedBackground => - _colors[(int)PaletteColorIndex.CheckPressedBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.CheckPressedBackground] == GlobalStaticVariables.EMPTY_COLOR ? base.CheckPressedBackground : _colors[(int)PaletteColorIndex.CheckPressedBackground]; @@ -251,7 +251,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color to use when the button is checked and selected and gradients are being used. /// public override Color CheckSelectedBackground => - _colors[(int)PaletteColorIndex.CheckSelectedBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.CheckSelectedBackground] == GlobalStaticVariables.EMPTY_COLOR ? base.CheckSelectedBackground : _colors[(int)PaletteColorIndex.CheckSelectedBackground]; @@ -263,7 +263,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// /// Gets the color to use for shadow effects on the grip (move handle). /// - public override Color GripDark => _colors[(int)PaletteColorIndex.GripDark] == GlobalStaticValues.EMPTY_COLOR ? base.GripDark : _colors[(int)PaletteColorIndex.GripDark]; + public override Color GripDark => _colors[(int)PaletteColorIndex.GripDark] == GlobalStaticVariables.EMPTY_COLOR ? base.GripDark : _colors[(int)PaletteColorIndex.GripDark]; #endregion @@ -271,7 +271,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// /// Gets the color to use for highlight effects on the grip (move handle). /// - public override Color GripLight => _colors[(int)PaletteColorIndex.GripLight] == GlobalStaticValues.EMPTY_COLOR ? base.GripLight : _colors[(int)PaletteColorIndex.GripLight]; + public override Color GripLight => _colors[(int)PaletteColorIndex.GripLight] == GlobalStaticVariables.EMPTY_COLOR ? base.GripLight : _colors[(int)PaletteColorIndex.GripLight]; #endregion #endregion @@ -282,7 +282,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the image margin of a ToolStripDropDownMenu. /// public override Color ImageMarginGradientBegin => - _colors[(int)PaletteColorIndex.ImageMarginGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ImageMarginGradientBegin : _colors[(int)PaletteColorIndex.ImageMarginGradientBegin]; @@ -293,7 +293,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the image margin of a ToolStripDropDownMenu. /// public override Color ImageMarginGradientEnd => - _colors[(int)PaletteColorIndex.ImageMarginGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ImageMarginGradientEnd : _colors[(int)PaletteColorIndex.ImageMarginGradientEnd]; @@ -304,7 +304,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used in the image margin of a ToolStripDropDownMenu. /// public override Color ImageMarginGradientMiddle => - _colors[(int)PaletteColorIndex.ImageMarginGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.ImageMarginGradientMiddle : _colors[(int)PaletteColorIndex.ImageMarginGradientMiddle]; @@ -315,7 +315,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the image margin of a ToolStripDropDownMenu when an item is revealed. /// public override Color ImageMarginRevealedGradientBegin => - _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ImageMarginRevealedGradientBegin : _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientBegin]; @@ -326,7 +326,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the image margin of a ToolStripDropDownMenu when an item is revealed. /// public override Color ImageMarginRevealedGradientEnd => - _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ImageMarginRevealedGradientEnd : _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientEnd]; @@ -337,7 +337,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used in the image margin of a ToolStripDropDownMenu when an item is revealed. /// public override Color ImageMarginRevealedGradientMiddle => - _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.ImageMarginRevealedGradientMiddle : _colors[(int)PaletteColorIndex.ImageMarginRevealedGradientMiddle]; @@ -349,7 +349,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// /// Gets the color that is the border color to use on a MenuStrip. /// - public override Color MenuBorder => _colors[(int)PaletteColorIndex.MenuBorder] == GlobalStaticValues.EMPTY_COLOR ? base.MenuBorder : _colors[(int)PaletteColorIndex.MenuBorder]; + public override Color MenuBorder => _colors[(int)PaletteColorIndex.MenuBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuBorder : _colors[(int)PaletteColorIndex.MenuBorder]; #endregion @@ -357,7 +357,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// /// Gets the color used to draw menu item text. /// - public override Color MenuItemText => _colors[(int)PaletteColorIndex.MenuItemText] == GlobalStaticValues.EMPTY_COLOR ? base.MenuItemText : _colors[(int)PaletteColorIndex.MenuItemText]; + public override Color MenuItemText => _colors[(int)PaletteColorIndex.MenuItemText] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemText : _colors[(int)PaletteColorIndex.MenuItemText]; #endregion @@ -366,7 +366,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use with a ToolStripMenuItem. /// public override Color MenuItemBorder => - _colors[(int)PaletteColorIndex.MenuItemBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemBorder : _colors[(int)PaletteColorIndex.MenuItemBorder]; @@ -377,7 +377,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used when a top-level ToolStripMenuItem is pressed. /// public override Color MenuItemPressedGradientBegin => - _colors[(int)PaletteColorIndex.MenuItemPressedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemPressedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemPressedGradientBegin : _colors[(int)PaletteColorIndex.MenuItemPressedGradientBegin]; @@ -388,7 +388,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used when a top-level ToolStripMenuItem is pressed. /// public override Color MenuItemPressedGradientEnd => - _colors[(int)PaletteColorIndex.MenuItemPressedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemPressedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemPressedGradientEnd : _colors[(int)PaletteColorIndex.MenuItemPressedGradientEnd]; @@ -399,7 +399,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used when a top-level ToolStripMenuItem is pressed. /// public override Color MenuItemPressedGradientMiddle => - _colors[(int)PaletteColorIndex.MenuItemPressedGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemPressedGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemPressedGradientMiddle : _colors[(int)PaletteColorIndex.MenuItemPressedGradientMiddle]; @@ -410,7 +410,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid color to use when a ToolStripMenuItem other than the top-level ToolStripMenuItem is selected. /// public override Color MenuItemSelected => - _colors[(int)PaletteColorIndex.MenuItemSelected] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemSelected] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemSelected : _colors[(int)PaletteColorIndex.MenuItemSelected]; @@ -421,7 +421,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used when the ToolStripMenuItem is selected. /// public override Color MenuItemSelectedGradientBegin => - _colors[(int)PaletteColorIndex.MenuItemSelectedGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemSelectedGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemSelectedGradientBegin : _colors[(int)PaletteColorIndex.MenuItemSelectedGradientBegin]; @@ -432,7 +432,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used when the ToolStripMenuItem is selected. /// public override Color MenuItemSelectedGradientEnd => - _colors[(int)PaletteColorIndex.MenuItemSelectedGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuItemSelectedGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuItemSelectedGradientEnd : _colors[(int)PaletteColorIndex.MenuItemSelectedGradientEnd]; @@ -443,7 +443,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the color used to draw text on a menu strip. /// public override Color MenuStripText => - _colors[(int)PaletteColorIndex.MenuStripText] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuStripText] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuStripText : _colors[(int)PaletteColorIndex.MenuStripText]; @@ -454,7 +454,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the MenuStrip. /// public override Color MenuStripGradientBegin => - _colors[(int)PaletteColorIndex.MenuStripGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuStripGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuStripGradientBegin : _colors[(int)PaletteColorIndex.MenuStripGradientBegin]; @@ -465,7 +465,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the MenuStrip. /// public override Color MenuStripGradientEnd => - _colors[(int)PaletteColorIndex.MenuStripGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.MenuStripGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.MenuStripGradientEnd : _colors[(int)PaletteColorIndex.MenuStripGradientEnd]; @@ -478,7 +478,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the ToolStripOverflowButton. /// public override Color OverflowButtonGradientBegin => - _colors[(int)PaletteColorIndex.OverflowButtonGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.OverflowButtonGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.OverflowButtonGradientBegin : _colors[(int)PaletteColorIndex.OverflowButtonGradientBegin]; @@ -489,7 +489,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the ToolStripOverflowButton. /// public override Color OverflowButtonGradientEnd => - _colors[(int)PaletteColorIndex.OverflowButtonGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.OverflowButtonGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.OverflowButtonGradientEnd : _colors[(int)PaletteColorIndex.OverflowButtonGradientEnd]; @@ -500,7 +500,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used in the ToolStripOverflowButton. /// public override Color OverflowButtonGradientMiddle => - _colors[(int)PaletteColorIndex.OverflowButtonGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.OverflowButtonGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.OverflowButtonGradientMiddle : _colors[(int)PaletteColorIndex.OverflowButtonGradientMiddle]; @@ -513,7 +513,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the ToolStripContainer. /// public override Color RaftingContainerGradientBegin => - _colors[(int)PaletteColorIndex.RaftingContainerGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.RaftingContainerGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.RaftingContainerGradientBegin : _colors[(int)PaletteColorIndex.RaftingContainerGradientBegin]; @@ -524,7 +524,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the ToolStripContainer. /// public override Color RaftingContainerGradientEnd => - _colors[(int)PaletteColorIndex.RaftingContainerGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.RaftingContainerGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.RaftingContainerGradientEnd : _colors[(int)PaletteColorIndex.RaftingContainerGradientEnd]; @@ -537,7 +537,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the color to use to for shadow effects on the ToolStripSeparator. /// public override Color SeparatorDark => - _colors[(int)PaletteColorIndex.SeparatorDark] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.SeparatorDark] == GlobalStaticVariables.EMPTY_COLOR ? base.SeparatorDark : _colors[(int)PaletteColorIndex.SeparatorDark]; @@ -548,7 +548,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the color to use to for highlight effects on the ToolStripSeparator. /// public override Color SeparatorLight => - _colors[(int)PaletteColorIndex.SeparatorLight] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.SeparatorLight] == GlobalStaticVariables.EMPTY_COLOR ? base.SeparatorLight : _colors[(int)PaletteColorIndex.SeparatorLight]; @@ -561,7 +561,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the color used to draw text on a status strip. /// public override Color StatusStripText => - _colors[(int)PaletteColorIndex.StatusStripText] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.StatusStripText] == GlobalStaticVariables.EMPTY_COLOR ? base.StatusStripText : _colors[(int)PaletteColorIndex.StatusStripText]; @@ -572,7 +572,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used on the StatusStrip. /// public override Color StatusStripGradientBegin => - _colors[(int)PaletteColorIndex.StatusStripGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.StatusStripGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.StatusStripGradientBegin : _colors[(int)PaletteColorIndex.StatusStripGradientBegin]; @@ -583,7 +583,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used on the StatusStrip. /// public override Color StatusStripGradientEnd => - _colors[(int)PaletteColorIndex.StatusStripGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.StatusStripGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.StatusStripGradientEnd : _colors[(int)PaletteColorIndex.StatusStripGradientEnd]; @@ -596,7 +596,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the color used to draw text on a tool strip. /// public override Color ToolStripText => - _colors[(int)PaletteColorIndex.ToolStripText] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripText] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripText : _colors[(int)PaletteColorIndex.ToolStripText]; @@ -607,7 +607,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the border color to use on the bottom edge of the ToolStrip. /// public override Color ToolStripBorder => - _colors[(int)PaletteColorIndex.ToolStripBorder] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripBorder] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripBorder : _colors[(int)PaletteColorIndex.ToolStripBorder]; @@ -618,7 +618,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the ToolStripContentPanel. /// public override Color ToolStripContentPanelGradientBegin => - _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripContentPanelGradientBegin : _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientBegin]; @@ -629,7 +629,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the ToolStripContentPanel. /// public override Color ToolStripContentPanelGradientEnd => - _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripContentPanelGradientEnd : _colors[(int)PaletteColorIndex.ToolStripContentPanelGradientEnd]; @@ -640,7 +640,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the solid background color of the ToolStripDropDown. /// public override Color ToolStripDropDownBackground => - _colors[(int)PaletteColorIndex.ToolStripDropDownBackground] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripDropDownBackground] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripDropDownBackground : _colors[(int)PaletteColorIndex.ToolStripDropDownBackground]; @@ -651,7 +651,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the ToolStrip background. /// public override Color ToolStripGradientBegin => - _colors[(int)PaletteColorIndex.ToolStripGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripGradientBegin : _colors[(int)PaletteColorIndex.ToolStripGradientBegin]; @@ -662,7 +662,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the ToolStrip background. /// public override Color ToolStripGradientEnd => - _colors[(int)PaletteColorIndex.ToolStripGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripGradientEnd : _colors[(int)PaletteColorIndex.ToolStripGradientEnd]; @@ -673,7 +673,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the middle color of the gradient used in the ToolStrip background. /// public override Color ToolStripGradientMiddle => - _colors[(int)PaletteColorIndex.ToolStripGradientMiddle] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripGradientMiddle] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripGradientMiddle : _colors[(int)PaletteColorIndex.ToolStripGradientMiddle]; @@ -684,7 +684,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the starting color of the gradient used in the ToolStripPanel. /// public override Color ToolStripPanelGradientBegin => - _colors[(int)PaletteColorIndex.ToolStripPanelGradientBegin] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripPanelGradientBegin] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripPanelGradientBegin : _colors[(int)PaletteColorIndex.ToolStripPanelGradientBegin]; @@ -695,7 +695,7 @@ public KryptonProfessionalCustomKCT(Color[] headerColors, /// Gets the end color of the gradient used in the ToolStripPanel. /// public override Color ToolStripPanelGradientEnd => - _colors[(int)PaletteColorIndex.ToolStripPanelGradientEnd] == GlobalStaticValues.EMPTY_COLOR + _colors[(int)PaletteColorIndex.ToolStripPanelGradientEnd] == GlobalStaticVariables.EMPTY_COLOR ? base.ToolStripPanelGradientEnd : _colors[(int)PaletteColorIndex.ToolStripPanelGradientEnd]; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritMenuStrip.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritMenuStrip.cs index 817b8d33c7..e5a423ac95 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritMenuStrip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritMenuStrip.cs @@ -46,21 +46,21 @@ private KryptonColorTable? CurrentColorTable public override Color GetBackColor1(PaletteState state) { var ct = CurrentColorTable; - if (ct is not null && ct.MenuStripGradientBegin != GlobalStaticValues.EMPTY_COLOR) + if (ct is not null && ct.MenuStripGradientBegin != GlobalStaticVariables.EMPTY_COLOR) { return ct.MenuStripGradientBegin; } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } public override Color GetBackColor2(PaletteState state) { var ct = CurrentColorTable; - if (ct is not null && ct.MenuStripGradientEnd != GlobalStaticValues.EMPTY_COLOR) + if (ct is not null && ct.MenuStripGradientEnd != GlobalStaticVariables.EMPTY_COLOR) { return ct.MenuStripGradientEnd; } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } public override PaletteColorStyle GetBackColorStyle(PaletteState state) => PaletteColorStyle.Inherit; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritNode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritNode.cs index 7e91596d0a..abab2fbd18 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritNode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritNode.cs @@ -50,7 +50,7 @@ public PaletteBackInheritNode([DisallowNull] IPaletteBack inherit) /// /// Palette value should be applicable to this state. /// InheritBool value. - public override InheritBool GetBackDraw(PaletteState state) => (TreeNode != null) && (TreeNode.BackColor != GlobalStaticValues.EMPTY_COLOR) ? InheritBool.True : _inherit.GetBackDraw(state); + public override InheritBool GetBackDraw(PaletteState state) => (TreeNode != null) && (TreeNode.BackColor != GlobalStaticVariables.EMPTY_COLOR) ? InheritBool.True : _inherit.GetBackDraw(state); /// /// Gets the graphics drawing hint. @@ -64,14 +64,14 @@ public PaletteBackInheritNode([DisallowNull] IPaletteBack inherit) /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBackColor1(PaletteState state) => (TreeNode != null) && (TreeNode.BackColor != GlobalStaticValues.EMPTY_COLOR) ? TreeNode.BackColor : _inherit.GetBackColor1(state); + public override Color GetBackColor1(PaletteState state) => (TreeNode != null) && (TreeNode.BackColor != GlobalStaticVariables.EMPTY_COLOR) ? TreeNode.BackColor : _inherit.GetBackColor1(state); /// /// Gets the second back color. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetBackColor2(PaletteState state) => (TreeNode != null) && (TreeNode.BackColor != GlobalStaticValues.EMPTY_COLOR) ? TreeNode.BackColor : _inherit.GetBackColor2(state); + public override Color GetBackColor2(PaletteState state) => (TreeNode != null) && (TreeNode.BackColor != GlobalStaticVariables.EMPTY_COLOR) ? TreeNode.BackColor : _inherit.GetBackColor2(state); /// /// Gets the color drawing style. diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritStatusStrip.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritStatusStrip.cs index 62dd25b3d1..dd99c98abc 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritStatusStrip.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteBackInheritStatusStrip.cs @@ -34,21 +34,21 @@ private static KryptonColorTable? CurrentColorTable public override Color GetBackColor1(PaletteState state) { var ct = CurrentColorTable; - if (ct is not null && ct.StatusStripGradientBegin != GlobalStaticValues.EMPTY_COLOR) + if (ct is not null && ct.StatusStripGradientBegin != GlobalStaticVariables.EMPTY_COLOR) { return ct.StatusStripGradientBegin; } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } public override Color GetBackColor2(PaletteState state) { var ct = CurrentColorTable; - if (ct is not null && ct.StatusStripGradientEnd != GlobalStaticValues.EMPTY_COLOR) + if (ct is not null && ct.StatusStripGradientEnd != GlobalStaticVariables.EMPTY_COLOR) { return ct.StatusStripGradientEnd; } - return GlobalStaticValues.EMPTY_COLOR; + return GlobalStaticVariables.EMPTY_COLOR; } public override PaletteColorStyle GetBackColorStyle(PaletteState state) => PaletteColorStyle.Inherit; diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteContentInheritNode.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteContentInheritNode.cs index c7b5cfc2c2..78c133cd98 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteContentInheritNode.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteContentInheritNode.cs @@ -159,14 +159,14 @@ public PaletteContentInheritNode(IPaletteContent inherit) => /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetContentShortTextColor1(PaletteState state) => (TreeNode != null) && (TreeNode.ForeColor != GlobalStaticValues.EMPTY_COLOR) ? TreeNode.ForeColor : _inherit.GetContentShortTextColor1(state); + public override Color GetContentShortTextColor1(PaletteState state) => (TreeNode != null) && (TreeNode.ForeColor != GlobalStaticVariables.EMPTY_COLOR) ? TreeNode.ForeColor : _inherit.GetContentShortTextColor1(state); /// /// Gets the second back color for the short text. /// /// Palette value should be applicable to this state. /// Color value. - public override Color GetContentShortTextColor2(PaletteState state) => (TreeNode != null) && (TreeNode.ForeColor != GlobalStaticValues.EMPTY_COLOR) ? TreeNode.ForeColor : _inherit.GetContentShortTextColor2(state); + public override Color GetContentShortTextColor2(PaletteState state) => (TreeNode != null) && (TreeNode.ForeColor != GlobalStaticVariables.EMPTY_COLOR) ? TreeNode.ForeColor : _inherit.GetContentShortTextColor2(state); /// /// Gets the color drawing style for the short text. @@ -282,7 +282,7 @@ public PaletteContentInheritNode(IPaletteContent inherit) => /// Palette value should be applicable to this state. /// Color value. public override Color GetContentLongTextColor1(PaletteState state) => - (TreeNode is KryptonTreeNode kryptonNode) && (kryptonNode.LongForeColor != GlobalStaticValues.EMPTY_COLOR) + (TreeNode is KryptonTreeNode kryptonNode) && (kryptonNode.LongForeColor != GlobalStaticVariables.EMPTY_COLOR) ? kryptonNode.LongForeColor : _inherit.GetContentLongTextColor1(state); @@ -292,7 +292,7 @@ public override Color GetContentLongTextColor1(PaletteState state) => /// Palette value should be applicable to this state. /// Color value. public override Color GetContentLongTextColor2(PaletteState state) => - (TreeNode is KryptonTreeNode kryptonNode) && (kryptonNode.LongForeColor != GlobalStaticValues.EMPTY_COLOR) + (TreeNode is KryptonTreeNode kryptonNode) && (kryptonNode.LongForeColor != GlobalStaticVariables.EMPTY_COLOR) ? kryptonNode.LongForeColor : _inherit.GetContentLongTextColor2(state); diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteDataGridViewContentStates.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteDataGridViewContentStates.cs index bbd3dd2b4b..6a7e64b05a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteDataGridViewContentStates.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteDataGridViewContentStates.cs @@ -56,8 +56,8 @@ public PaletteDataGridViewContentStates([DisallowNull] IPaletteContent inherit, _draw = InheritBool.Inherit; _hint = PaletteTextHint.Inherit; _trim = PaletteTextTrim.Inherit; - _color1 = GlobalStaticValues.EMPTY_COLOR; - _color2 = GlobalStaticValues.EMPTY_COLOR; + _color1 = GlobalStaticVariables.EMPTY_COLOR; + _color2 = GlobalStaticVariables.EMPTY_COLOR; _colorStyle = PaletteColorStyle.Inherit; _colorAlign = PaletteRectangleAlign.Inherit; _colorAngle = -1; @@ -86,8 +86,8 @@ public PaletteDataGridViewContentStates([DisallowNull] IPaletteContent inherit, public override bool IsDefault => (Draw == InheritBool.Inherit) && (Hint == PaletteTextHint.Inherit) && (Trim == PaletteTextTrim.Inherit) && - (Color1 == GlobalStaticValues.EMPTY_COLOR) && - (Color2 == GlobalStaticValues.EMPTY_COLOR) && + (Color1 == GlobalStaticVariables.EMPTY_COLOR) && + (Color2 == GlobalStaticVariables.EMPTY_COLOR) && (ColorStyle == PaletteColorStyle.Inherit) && (ColorAlign == PaletteRectangleAlign.Inherit) && (ColorAngle == -1) && @@ -412,7 +412,7 @@ public virtual Color Color1 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetContentShortTextColor1(PaletteState state) => _color1 != GlobalStaticValues.EMPTY_COLOR ? _color1 : Inherit.GetContentShortTextColor1(state); + public Color GetContentShortTextColor1(PaletteState state) => _color1 != GlobalStaticVariables.EMPTY_COLOR ? _color1 : Inherit.GetContentShortTextColor1(state); #endregion @@ -444,7 +444,7 @@ public virtual Color Color2 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetContentShortTextColor2(PaletteState state) => _color2 != GlobalStaticValues.EMPTY_COLOR ? _color2 : Inherit.GetContentShortTextColor2(state); + public Color GetContentShortTextColor2(PaletteState state) => _color2 != GlobalStaticVariables.EMPTY_COLOR ? _color2 : Inherit.GetContentShortTextColor2(state); #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlBackStates.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlBackStates.cs index e10ccb4553..ea945f6d0f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlBackStates.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlBackStates.cs @@ -41,7 +41,7 @@ public PaletteInputControlBackStates([DisallowNull] IPaletteBack inherit, NeedPaint = needPaint; // Default the initial values - _color1 = GlobalStaticValues.EMPTY_COLOR; + _color1 = GlobalStaticVariables.EMPTY_COLOR; } #endregion @@ -51,7 +51,7 @@ public PaletteInputControlBackStates([DisallowNull] IPaletteBack inherit, /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => Color1 == GlobalStaticValues.EMPTY_COLOR; + public override bool IsDefault => Color1 == GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -120,7 +120,7 @@ public Color Color1 /// /// Palette value should be applicable to this state. /// Color value. - public Color GetBackColor1(PaletteState state) => Color1 != GlobalStaticValues.EMPTY_COLOR ? Color1 : Inherit.GetBackColor1(state); + public Color GetBackColor1(PaletteState state) => Color1 != GlobalStaticVariables.EMPTY_COLOR ? Color1 : Inherit.GetBackColor1(state); #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlContentStates.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlContentStates.cs index 27ec5418be..00ae50effe 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlContentStates.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteInputControlContentStates.cs @@ -46,7 +46,7 @@ public PaletteInputControlContentStates([DisallowNull] IPaletteContent inherit, // Default the initial values _font = null; - _color1 = GlobalStaticValues.EMPTY_COLOR; + _color1 = GlobalStaticVariables.EMPTY_COLOR; _padding = CommonHelper.InheritPadding; _shortTextH = PaletteRelativeAlign.Inherit; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteWrapLabel.cs b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteWrapLabel.cs index bab73798fb..2772b5ff0f 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteWrapLabel.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Palette Controls/PaletteWrapLabel.cs @@ -34,7 +34,7 @@ public PaletteWrapLabel(KryptonWrapLabel wrapLabel) { _wrapLabel = wrapLabel; _font = null; - _textColor = GlobalStaticValues.EMPTY_COLOR; + _textColor = GlobalStaticVariables.EMPTY_COLOR; _hint = PaletteTextHint.Inherit; } @@ -44,7 +44,7 @@ public PaletteWrapLabel(KryptonLinkWrapLabel linkWrapLabel) { _linkWrapLabel = linkWrapLabel; _font = null; - _textColor = GlobalStaticValues.EMPTY_COLOR; + _textColor = GlobalStaticVariables.EMPTY_COLOR; _hint = PaletteTextHint.Inherit; } @@ -57,7 +57,7 @@ public PaletteWrapLabel(KryptonLinkWrapLabel linkWrapLabel) [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => (_font == null) && - (_textColor == GlobalStaticValues.EMPTY_COLOR) && + (_textColor == GlobalStaticVariables.EMPTY_COLOR) && (_hint == PaletteTextHint.Inherit); #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMaterialRenderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMaterialRenderer.cs index 0bfee6f963..c6fe4dc787 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMaterialRenderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonMaterialRenderer.cs @@ -46,24 +46,24 @@ protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e) { var style = kss.StateCommon.GetBackColorStyle(PaletteState.Normal); var c1 = kss.StateCommon.GetBackColor1(PaletteState.Normal); - if (style == PaletteColorStyle.Solid && c1 != GlobalStaticValues.EMPTY_COLOR && !c1.IsEmpty) + if (style == PaletteColorStyle.Solid && c1 != GlobalStaticVariables.EMPTY_COLOR && !c1.IsEmpty) { back = c1; } else { - back = (KCT.StatusStripGradientEnd != GlobalStaticValues.EMPTY_COLOR && !KCT.StatusStripGradientEnd.IsEmpty) + back = (KCT.StatusStripGradientEnd != GlobalStaticVariables.EMPTY_COLOR && !KCT.StatusStripGradientEnd.IsEmpty) ? KCT.StatusStripGradientEnd - : ((KCT.StatusStripGradientBegin != GlobalStaticValues.EMPTY_COLOR && !KCT.StatusStripGradientBegin.IsEmpty) + : ((KCT.StatusStripGradientBegin != GlobalStaticVariables.EMPTY_COLOR && !KCT.StatusStripGradientBegin.IsEmpty) ? KCT.StatusStripGradientBegin : ss.BackColor); } } else { - back = (KCT.StatusStripGradientEnd != GlobalStaticValues.EMPTY_COLOR && !KCT.StatusStripGradientEnd.IsEmpty) + back = (KCT.StatusStripGradientEnd != GlobalStaticVariables.EMPTY_COLOR && !KCT.StatusStripGradientEnd.IsEmpty) ? KCT.StatusStripGradientEnd - : ((KCT.StatusStripGradientBegin != GlobalStaticValues.EMPTY_COLOR && !KCT.StatusStripGradientBegin.IsEmpty) + : ((KCT.StatusStripGradientBegin != GlobalStaticVariables.EMPTY_COLOR && !KCT.StatusStripGradientBegin.IsEmpty) ? KCT.StatusStripGradientBegin : ss.BackColor); } @@ -168,7 +168,7 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e) { var state = !e.Item.Enabled ? PaletteState.Disabled : (e.Item.Selected ? PaletteState.Tracking : PaletteState.Normal); var textColor = KCT.Palette.GetContentShortTextColor1(PaletteContentStyle.ContextMenuItemTextStandard, state); - if (textColor == GlobalStaticValues.EMPTY_COLOR || textColor.IsEmpty) + if (textColor == GlobalStaticVariables.EMPTY_COLOR || textColor.IsEmpty) { // Deterministic fallback based on state textColor = KCT.MenuItemText; @@ -180,7 +180,7 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e) var state = e.Item.Selected || e.Item.Pressed ? PaletteState.Tracking : PaletteState.Normal; // Prefer on-surface label color for top-level menu items under Material var c = KCT.Palette.GetContentShortTextColor1(PaletteContentStyle.LabelNormalPanel, state); - if (c == GlobalStaticValues.EMPTY_COLOR || c.IsEmpty) + if (c == GlobalStaticVariables.EMPTY_COLOR || c.IsEmpty) { c = KCT.MenuStripText; } @@ -195,7 +195,7 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e) // Menu items hosted on a ToolStrip (not MenuStrip/ContextMenu): use on-surface label color var state = !e.Item.Enabled ? PaletteState.Disabled : (e.Item.Selected || e.Item.Pressed ? PaletteState.Tracking : PaletteState.Normal); var c = KCT.Palette.GetContentShortTextColor1(PaletteContentStyle.LabelNormalPanel, state); - if (c == GlobalStaticValues.EMPTY_COLOR || c.IsEmpty) + if (c == GlobalStaticVariables.EMPTY_COLOR || c.IsEmpty) { c = KCT.MenuItemText; } @@ -206,7 +206,7 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e) // Generic ToolStrip items: use on-surface label color from palette for Material dark var state = !e.Item.Enabled ? PaletteState.Disabled : (e.Item.Selected ? PaletteState.Tracking : PaletteState.Normal); var c = KCT.Palette.GetContentShortTextColor1(PaletteContentStyle.LabelNormalPanel, state); - if (c == GlobalStaticValues.EMPTY_COLOR || c.IsEmpty) + if (c == GlobalStaticVariables.EMPTY_COLOR || c.IsEmpty) { c = KCT.ToolStripText; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonProfessionalRenderer.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonProfessionalRenderer.cs index b940261303..eb2fe4fb05 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonProfessionalRenderer.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/KryptonProfessionalRenderer.cs @@ -182,7 +182,7 @@ protected bool TryRenderStatusStripOverride(ToolStripRenderEventArgs e, Graphics // Default style when the user provides one color only: Solid if (effectiveStyle == PaletteColorStyle.Inherit) { - effectiveStyle = (color2 == GlobalStaticValues.EMPTY_COLOR || color2.IsEmpty) + effectiveStyle = (color2 == GlobalStaticVariables.EMPTY_COLOR || color2.IsEmpty) ? PaletteColorStyle.Solid : PaletteColorStyle.Linear; } @@ -199,15 +199,15 @@ protected bool TryRenderStatusStripOverride(ToolStripRenderEventArgs e, Graphics { case PaletteColorStyle.Solid: { - using var brush = new SolidBrush((color1 == GlobalStaticValues.EMPTY_COLOR || color1.IsEmpty) + using var brush = new SolidBrush((color1 == GlobalStaticVariables.EMPTY_COLOR || color1.IsEmpty) ? KCT.StatusStripGradientEnd : color1); graphics.FillRectangle(brush, rect); break; } default: { - Color a = (color1 == GlobalStaticValues.EMPTY_COLOR || color1.IsEmpty) ? KCT.StatusStripGradientBegin : color1; - Color b = (color2 == GlobalStaticValues.EMPTY_COLOR || color2.IsEmpty) ? KCT.StatusStripGradientEnd : color2; + Color a = (color1 == GlobalStaticVariables.EMPTY_COLOR || color1.IsEmpty) ? KCT.StatusStripGradientBegin : color1; + Color b = (color2 == GlobalStaticVariables.EMPTY_COLOR || color2.IsEmpty) ? KCT.StatusStripGradientEnd : color2; using var brush = new LinearGradientBrush(rect, a, b, angle); graphics.FillRectangle(brush, rect); break; diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs index 8fde3119f9..ff5c0e764e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderBase.cs @@ -971,13 +971,13 @@ protected static void DrawImageHelper([DisallowNull] ViewContext context, } // Do we need to remap a colors in the bitmap? - if ((remapTransparent != GlobalStaticValues.EMPTY_COLOR) || - ((remapColor != GlobalStaticValues.EMPTY_COLOR) && (remapNew != GlobalStaticValues.EMPTY_COLOR))) + if ((remapTransparent != GlobalStaticVariables.EMPTY_COLOR) || + ((remapColor != GlobalStaticVariables.EMPTY_COLOR) && (remapNew != GlobalStaticVariables.EMPTY_COLOR))) { var colorMaps = new List(); // Create remapping for the transparent color - if (remapTransparent != GlobalStaticValues.EMPTY_COLOR) + if (remapTransparent != GlobalStaticVariables.EMPTY_COLOR) { var remap = new ColorMap { @@ -988,7 +988,7 @@ protected static void DrawImageHelper([DisallowNull] ViewContext context, } // Create remapping from source to target colors - if ((remapColor != GlobalStaticValues.EMPTY_COLOR) && (remapNew != GlobalStaticValues.EMPTY_COLOR)) + if ((remapColor != GlobalStaticVariables.EMPTY_COLOR) && (remapNew != GlobalStaticVariables.EMPTY_COLOR)) { var remap = new ColorMap { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderMicrosoft365.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderMicrosoft365.cs index 2a157668f9..c2a261156a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderMicrosoft365.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderMicrosoft365.cs @@ -249,7 +249,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If we have a context color to use then modify the drawing colors - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -346,7 +346,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderOffice2013.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderOffice2013.cs index f6e630b4aa..f7c5308ef5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderOffice2013.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderOffice2013.cs @@ -283,7 +283,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If we have a context color to use then modify the drawing colors - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -387,7 +387,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs index f47ae25753..f83be97f7a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderStandard.cs @@ -350,21 +350,21 @@ static RenderStandard() _gridSortOrder = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR, + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR, ImageSize = new Size(17, 11) }; _gridSortOrder.Images.AddStrip(GridImageResources.GridSortOrder); _gridRowIndicators = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR, + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR, ImageSize = new Size(19, 13) }; _gridRowIndicators.Images.AddStrip(GridImageResources.GridRowIndicators); _gridErrorIcon = new ImageList { - TransparentColor = GlobalStaticValues.TRANSPARENCY_KEY_COLOR, + TransparentColor = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR, ImageSize = new Size(18, 17) }; _gridErrorIcon.Images.AddStrip(GenericImageResources.GridErrorIcon); @@ -3340,7 +3340,7 @@ public override Rectangle DrawGridErrorGlyph([DisallowNull] RenderContext contex if (state == PaletteState.Disabled) { - ControlPaint.DrawImageDisabled(context!.Graphics, errorImage, x, y, GlobalStaticValues.EMPTY_COLOR); + ControlPaint.DrawImageDisabled(context!.Graphics, errorImage, x, y, GlobalStaticVariables.EMPTY_COLOR); } else { @@ -8209,7 +8209,7 @@ protected virtual void DrawRibbonTabTrackingBottomDraw2007(Rectangle rect, cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -8486,7 +8486,7 @@ protected virtual void DrawRibbonTabTrackingRight2010(Rectangle rect, cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { c1 = c5; c2 = CommonHelper.MergeColors(c2, 0.8f, ControlPaint.Light(c5), 0.2f); @@ -9413,7 +9413,7 @@ protected virtual void DrawRibbonTabSelectedBottomDraw2007(Rectangle rect, cache.Dispose(); // If we have a context color to use then modify the drawing colors - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -9445,7 +9445,7 @@ protected virtual void DrawRibbonTabSelectedBottomDraw2007(Rectangle rect, context.Graphics.FillPath(cache.CenterBrush!, cache.OutsidePath!); - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { context.Graphics.FillPath(cache.InsideBrush!, cache.InsidePath!); } @@ -10466,7 +10466,7 @@ protected virtual void DrawRibbonTabHighlightBottomDraw(Rectangle rect, Color topDark = palette.GetRibbonBackColor3(state); Color bottomLight = palette.GetRibbonBackColor4(state); Color bottomMedium = palette.GetRibbonBackColor5(state); - Color bottomDark = CommonHelper.MergeColors(topDark, 0.78f, GlobalStaticValues.EMPTY_COLOR, 0.22f); + Color bottomDark = CommonHelper.MergeColors(topDark, 0.78f, GlobalStaticVariables.EMPTY_COLOR, 0.22f); var generate = true; MementoRibbonAppButton cache; @@ -10963,7 +10963,7 @@ protected virtual void DrawRibbonAppButtonBorder2(Graphics? g, 90f); cache.PressedFillBrush = new LinearGradientBrush(new RectangleF(rect.X - 1, rect.Y - 1, rect.Width + 2, rect.Height + 2), - Color.FromArgb((dark ? GlobalStaticValues.EMPTY_COLOR : _whiten10).A, cache.C4), + Color.FromArgb((dark ? GlobalStaticVariables.EMPTY_COLOR : _whiten10).A, cache.C4), Color.FromArgb((dark ? _darken38 : _darken16).A, cache.C5), 90f); cache.TrackFillBrush.Blend = _linear50Blend; diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio.cs index def730d4b3..e1acd84ca9 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio.cs @@ -245,7 +245,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If we have a context color to use then modify the drawing colors - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -342,7 +342,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010With2013.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010With2013.cs index 2cc595c1c6..d8d58f9fa0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010With2013.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010With2013.cs @@ -280,7 +280,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If we have a context color to use then modify the drawing colors - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -384,7 +384,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010WithMicrosoft365.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010WithMicrosoft365.cs index 74998b8521..a856a1e0fb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010WithMicrosoft365.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/RenderVisualStudio2010WithMicrosoft365.cs @@ -246,7 +246,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If we have a context color to use then modify the drawing colors - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { @@ -343,7 +343,7 @@ public override ToolStripRenderer RenderToolStrip([DisallowNull] PaletteBase? co cache.Dispose(); // If c5 has a colour then use that to highlight the tab - if (c5 != GlobalStaticValues.EMPTY_COLOR) + if (c5 != GlobalStaticVariables.EMPTY_COLOR) { if (!standard) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Rendering/ThemeManager.cs b/Source/Krypton Components/Krypton.Toolkit/Rendering/ThemeManager.cs index 8c0c17f894..ca57edd1ae 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Rendering/ThemeManager.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Rendering/ThemeManager.cs @@ -33,7 +33,7 @@ public class ThemeManager public static ICollection SupportedInternalThemeNames => PaletteModeStrings.SupportedInternalThemeNames; /// Returns the Default Global Palette. - public static PaletteMode DefaultGlobalPalette => GlobalStaticValues.GLOBAL_DEFAULT_PALETTE_MODE; + public static PaletteMode DefaultGlobalPalette => GlobalStaticConstants.GLOBAL_DEFAULT_PALETTE_MODE; #endregion @@ -88,7 +88,7 @@ public static void ApplyTheme(string themeFile, bool silent, KryptonManager mana } catch (Exception exc) { - KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } else @@ -117,7 +117,7 @@ public static void ApplyGlobalTheme(KryptonManager manager, PaletteMode paletteM } catch (Exception exc) { - KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(exc, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } diff --git a/Source/Krypton Components/Krypton.Toolkit/Tooling/ExceptionHandler.cs b/Source/Krypton Components/Krypton.Toolkit/Tooling/ExceptionHandler.cs index 1831d4587e..d1542ddae0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Tooling/ExceptionHandler.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Tooling/ExceptionHandler.cs @@ -101,7 +101,7 @@ public static void PrintStackTrace(Exception exception, string fileName) } catch (Exception e) { - CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -127,7 +127,7 @@ public static void PrintExceptionStackTrace(Exception exception, string fileName } catch (Exception e) { - CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Translations/General/GeneralToolkitStrings.cs b/Source/Krypton Components/Krypton.Toolkit/Translations/General/GeneralToolkitStrings.cs index 6cae55b8ca..4b690456df 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Translations/General/GeneralToolkitStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Translations/General/GeneralToolkitStrings.cs @@ -51,7 +51,7 @@ public GeneralToolkitStrings() /// Returns a string that represents the current defaulted state. /// /// A string that represents the current defaulted state. - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonFileSystemListViewStrings.cs b/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonFileSystemListViewStrings.cs index f19442c625..c4745f8b98 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonFileSystemListViewStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonFileSystemListViewStrings.cs @@ -254,7 +254,7 @@ private static string GetOSString(uint resourceId, string defaultValue, ref stri #region Overrides - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonSearchBoxStrings.cs b/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonSearchBoxStrings.cs index bc72796707..db29baf686 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonSearchBoxStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Translations/General/KryptonSearchBoxStrings.cs @@ -120,7 +120,7 @@ public void Reset() #region Overrides - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonMiscellaneousStrings.cs b/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonMiscellaneousStrings.cs index aac844d224..5063e6754d 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonMiscellaneousStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonMiscellaneousStrings.cs @@ -164,7 +164,7 @@ public void Reset() #region Public Overrides - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonPrintPreviewDialogStrings.cs b/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonPrintPreviewDialogStrings.cs index 3f39620e42..1f51fb1cbb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonPrintPreviewDialogStrings.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Translations/Miscellaneous/KryptonPrintPreviewDialogStrings.cs @@ -110,7 +110,7 @@ public KryptonPrintPreviewDialogStrings() #region Protected Overrides /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/GlobalToolkitUtilities.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/GlobalToolkitUtilities.cs index 267062a219..3b15433959 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/GlobalToolkitUtilities.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/GlobalToolkitUtilities.cs @@ -33,7 +33,7 @@ public static void LaunchProcess(string processName) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -48,7 +48,7 @@ public static void LaunchProcess(string processName, string arguments) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } } @@ -62,7 +62,7 @@ public static void LaunchProcess(string processName, string arguments) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } return null; @@ -92,7 +92,7 @@ public static void LaunchProcess(string processName, string arguments) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } return null; diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/GraphicsExtensions.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/GraphicsExtensions.cs index 799e01ec5f..14c9198ed3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/GraphicsExtensions.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/GraphicsExtensions.cs @@ -44,7 +44,7 @@ public static class GraphicsExtensions { //Console.WriteLine("Unable to extract the icon from the binary"); - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); } return result; @@ -109,7 +109,7 @@ public static Icon LoadIcon(IconType type, Size size) } catch (Exception e) { - KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(e, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); return null; } @@ -161,7 +161,7 @@ public static Icon LoadIcon(IconType type, Size size) } catch (Exception ex) { - KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticValues.DEFAULT_USE_STACK_TRACE); + KryptonExceptionHandler.CaptureException(ex, showStackTrace: GlobalStaticConstants.DEFAULT_USE_STACK_TRACE); // /* EXTRACT ICON ERROR */ //// BUBBLE UP diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/KryptonEmojiParser.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/KryptonEmojiParser.cs index e351ac9204..383b546cee 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/KryptonEmojiParser.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/KryptonEmojiParser.cs @@ -55,8 +55,8 @@ private static async Task> LoadEmojisInternalAsync(Krypto // Determine the URL to fetch based on the specified emoji list type var emojiListUrl = emojiListType switch { - KryptonEmojiListType.Latest => GlobalStaticValues.DEFAULT_LATEST_EMOJI_LIST_URL, - KryptonEmojiListType.Public => GlobalStaticValues.DEFAULT_PUBLIC_EMOJI_LIST_URL, + KryptonEmojiListType.Latest => GlobalStaticConstants.DEFAULT_LATEST_EMOJI_LIST_URL, + KryptonEmojiListType.Public => GlobalStaticConstants.DEFAULT_PUBLIC_EMOJI_LIST_URL, _ => throw new ArgumentException("Invalid emoji list type specified.") }; diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs index ffa34dd697..2dd087d84a 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/PaletteImageScaler.cs @@ -148,7 +148,7 @@ private static void ScaleButtonSpecImageType(KryptonPaletteButtonSpecTyped bst, return img; } using var tmpBmp = new Bitmap(img); - tmpBmp.MakeTransparent(GlobalStaticValues.TRANSPARENCY_KEY_COLOR); + tmpBmp.MakeTransparent(GlobalStaticVariables.TRANSPARENCY_KEY_COLOR); return CommonHelper.ScaleImageForSizedDisplay(tmpBmp, img.Width * scaleFactor.Width, img.Height * scaleFactor.Height, false); } } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/SchemeBaseColorsExtensions.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/SchemeBaseColorsExtensions.cs index 614fd87c3d..541e8001ed 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/SchemeBaseColorsExtensions.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/SchemeBaseColorsExtensions.cs @@ -32,7 +32,7 @@ public static Color[] ToArray(this KryptonColorSchemeBase scheme) { var property = type.GetProperty(names[i]); colors[i] = property is null - ? GlobalStaticValues.EMPTY_COLOR + ? GlobalStaticVariables.EMPTY_COLOR : (Color)property.GetValue(scheme)!; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Utilities/UACShieldHelper.cs b/Source/Krypton Components/Krypton.Toolkit/Utilities/UACShieldHelper.cs index 2d00f8ec50..960ec5cf88 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Utilities/UACShieldHelper.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Utilities/UACShieldHelper.cs @@ -80,7 +80,7 @@ public static Bitmap GetOSSpecificUACShieldIcon(IconSize size) bool isLargeIcon = size.Width >= 32 || size.Height >= 32; // Try the primary UAC shield icon ID - var icon = GraphicsExtensions.ExtractIcon(Libraries.Imageres, GlobalStaticValues.UAC_SHIELD_ICON_ID, isLargeIcon); + var icon = GraphicsExtensions.ExtractIcon(Libraries.Imageres, GlobalStaticConstants.UAC_SHIELD_ICON_ID, isLargeIcon); if (icon != null) { @@ -92,7 +92,7 @@ public static Bitmap GetOSSpecificUACShieldIcon(IconSize size) } // Try the alternative UAC shield icon ID - icon = GraphicsExtensions.ExtractIcon(Libraries.Imageres, GlobalStaticValues.UAC_SHIELD_ICON_ID_ALT, isLargeIcon); + icon = GraphicsExtensions.ExtractIcon(Libraries.Imageres, GlobalStaticConstants.UAC_SHIELD_ICON_ID_ALT, isLargeIcon); if (icon != null) { diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeContentValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeContentValues.cs index d923ee3c02..826be20080 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeContentValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeContentValues.cs @@ -69,7 +69,7 @@ public BadgeContentValues(NeedPaintHandler needPaint) [DefaultValue(DEFAULT_BADGE_TEXT)] public string Text { - get => _text ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _text ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { if (_text != value) diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeOverflowValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeOverflowValues.cs index 17d4c25ad8..7af094b753 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeOverflowValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/Badge/BadgeOverflowValues.cs @@ -49,7 +49,7 @@ public BadgeOverflowValues(NeedPaintHandler? needPaint) [DefaultValue("+")] public string OverflowText { - get => _overflowText ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _overflowText ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { if (_overflowText != value) diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs index 4aa27f32d8..180c6ed101 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ButtonValues.cs @@ -20,7 +20,7 @@ public class ButtonValues : Storage, { #region Static Fields private const string DEFAULT_TEXT = nameof(Button); - private static readonly string _defaultExtraText = GlobalStaticValues.DEFAULT_EMPTY_STRING; + private static readonly string _defaultExtraText = GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion #region Instance Fields @@ -59,8 +59,8 @@ public ButtonValues(NeedPaintHandler needPaint) // Set initial values _image = null; - _transparent = GlobalStaticValues.EMPTY_COLOR; - _dropDownArrowColor = GlobalStaticValues.EMPTY_COLOR; + _transparent = GlobalStaticVariables.EMPTY_COLOR; + _dropDownArrowColor = GlobalStaticVariables.EMPTY_COLOR; _text = DEFAULT_TEXT; _extraText = _defaultExtraText; _useAsDialogButton = false; @@ -85,9 +85,9 @@ public ButtonValues(NeedPaintHandler needPaint) (UseAsADialogButton == false) && (UseAsUACElevationButton == false) && (ShowSplitOption == false) && - (DropDownArrowColor == GlobalStaticValues.EMPTY_COLOR) && + (DropDownArrowColor == GlobalStaticVariables.EMPTY_COLOR) && //(UACShieldIconSize == UACShieldIconSize.ExtraSmall) - (ImageTransparentColor == GlobalStaticValues.EMPTY_COLOR) && + (ImageTransparentColor == GlobalStaticVariables.EMPTY_COLOR) && (Text == DEFAULT_TEXT) && (ExtraText == _defaultExtraText) && _overlayImage.IsDefault; @@ -147,12 +147,12 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Resets the ImageTransparentColor property to its default value. /// - public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content image transparent color. @@ -188,7 +188,7 @@ public Color ImageTransparentColor [AllowNull] public string Text { - get => _text ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _text ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { @@ -392,14 +392,14 @@ public Color? DropDownArrowColor { if (_dropDownArrowColor != value) { - _dropDownArrowColor = value ?? GlobalStaticValues.EMPTY_COLOR; + _dropDownArrowColor = value ?? GlobalStaticVariables.EMPTY_COLOR; PerformNeedPaint(true); } } } - private void ResetDropDownArrowColor() => _dropDownArrowColor = GlobalStaticValues.EMPTY_COLOR; - private bool ShouldSerializeDropDownArrowColor() => _dropDownArrowColor != GlobalStaticValues.EMPTY_COLOR; + private void ResetDropDownArrowColor() => _dropDownArrowColor = GlobalStaticVariables.EMPTY_COLOR; + private bool ShouldSerializeDropDownArrowColor() => _dropDownArrowColor != GlobalStaticVariables.EMPTY_COLOR; #endregion #region CreateImageStates diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/CaptionValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/CaptionValues.cs index 00bac6d65b..08293503cd 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/CaptionValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/CaptionValues.cs @@ -51,7 +51,7 @@ public CaptionValues(NeedPaintHandler needPaint, GetDpiFactor getDpiFactor) /// Gets the default description value. /// /// String reference. - protected override string GetDescriptionDefault() => GlobalStaticValues.DEFAULT_EMPTY_STRING; + protected override string GetDescriptionDefault() => GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ColorButtonValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ColorButtonValues.cs index 30779143e5..8a1b3779ed 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ColorButtonValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ColorButtonValues.cs @@ -21,7 +21,7 @@ public class ColorButtonValues : Storage, #region Static Fields private readonly string _defaultText = KryptonManager.Strings.ColorStrings.Color; - private static readonly string _defaultExtraText = GlobalStaticValues.DEFAULT_EMPTY_STRING; + private static readonly string _defaultExtraText = GlobalStaticVariables.DEFAULT_EMPTY_STRING; private static readonly Image? _defaultImage = GenericImageResources.ButtonColorImageSmall; #endregion @@ -57,7 +57,7 @@ public ColorButtonValues(NeedPaintHandler needPaint) // Set initial values _image = _defaultImage; - _transparent = GlobalStaticValues.EMPTY_COLOR; + _transparent = GlobalStaticVariables.EMPTY_COLOR; _text = _defaultText; _extraText = _defaultExtraText; ImageStates = CreateImageStates(); @@ -77,7 +77,7 @@ public ColorButtonValues(NeedPaintHandler needPaint) [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => ImageStates.IsDefault && (Image == _defaultImage) && - (ImageTransparentColor == GlobalStaticValues.EMPTY_COLOR) && + (ImageTransparentColor == GlobalStaticVariables.EMPTY_COLOR) && (Text == _defaultText) && (ExtraText == _defaultExtraText) && (_roundedCorners == 0) @@ -138,12 +138,12 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Resets the ImageTransparentColor property to its default value. /// - public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content image transparent color. @@ -179,7 +179,7 @@ public Color ImageTransparentColor [AllowNull] public string Text { - get => _text ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _text ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { @@ -358,7 +358,7 @@ public int RoundedCorners { g.SmoothingMode = SmoothingMode.AntiAlias; // If the color is not defined, i.e. it is empty then... - if (_selectedColor.Equals(GlobalStaticValues.EMPTY_COLOR)) + if (_selectedColor.Equals(GlobalStaticVariables.EMPTY_COLOR)) { // Indicate the absence of a color by drawing a border around // the selected color area, thus indicating the area inside the @@ -416,7 +416,7 @@ private static void FillRoundedRectangle(Graphics g, Brush brush, Rectangle rect /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/CountdownButtonValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/CountdownButtonValues.cs index 0709c4a1d4..2ff4e51c52 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/CountdownButtonValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/CountdownButtonValues.cs @@ -34,8 +34,8 @@ public CountdownButtonValues() [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public override bool IsDefault => CountdownDuration.Equals(GlobalStaticValues.DEFAULT_COUNTDOWN_VALUE) && - CountdownInterval.Equals(GlobalStaticValues.DEFAULT_COUNTDOWN_INTERVAL) && + public override bool IsDefault => CountdownDuration.Equals(GlobalStaticConstants.DEFAULT_COUNTDOWN_VALUE) && + CountdownInterval.Equals(GlobalStaticConstants.DEFAULT_COUNTDOWN_INTERVAL) && CountdownTextFormat.Equals("{0} ({1})"); #endregion @@ -95,8 +95,8 @@ public int CountdownInterval public void Reset() { - CountdownInterval = GlobalStaticValues.DEFAULT_COUNTDOWN_INTERVAL; - CountdownDuration = GlobalStaticValues.DEFAULT_COUNTDOWN_VALUE; + CountdownInterval = GlobalStaticConstants.DEFAULT_COUNTDOWN_INTERVAL; + CountdownDuration = GlobalStaticConstants.DEFAULT_COUNTDOWN_VALUE; CountdownTextFormat = "{0} ({1})"; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/FixedContentValue.cs b/Source/Krypton Components/Krypton.Toolkit/Values/FixedContentValue.cs index e03261b7db..ea56035062 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/FixedContentValue.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/FixedContentValue.cs @@ -22,7 +22,7 @@ public class FixedContentValue : IContentValues /// Initialize a new instance of the FixedContentValue class. /// public FixedContentValue() - : this(GlobalStaticValues.DEFAULT_EMPTY_STRING, GlobalStaticValues.DEFAULT_EMPTY_STRING, null, GlobalStaticValues.EMPTY_COLOR) + : this(GlobalStaticVariables.DEFAULT_EMPTY_STRING, GlobalStaticVariables.DEFAULT_EMPTY_STRING, null, GlobalStaticVariables.EMPTY_COLOR) { } @@ -95,7 +95,7 @@ public FixedContentValue(string? shortText, [Localizable(true)] public Color ImageTransparentColor { get; set; } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -138,7 +138,7 @@ public FixedContentValue(string? shortText, /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesPrimary.cs b/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesPrimary.cs index ac37ce1b1a..e7e75f49ba 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesPrimary.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesPrimary.cs @@ -45,7 +45,7 @@ public HeaderGroupValuesPrimary(NeedPaintHandler needPaint, GetDpiFactor getDpiF /// Gets the default description value. /// /// String reference. - protected override string GetDescriptionDefault() => GlobalStaticValues.DEFAULT_EMPTY_STRING; + protected override string GetDescriptionDefault() => GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesSecondary.cs b/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesSecondary.cs index 9b34f1fd4a..b7f425c9e2 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesSecondary.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/HeaderGroupValuesSecondary.cs @@ -51,7 +51,7 @@ public HeaderGroupValuesSecondary(NeedPaintHandler needPaint, GetDpiFactor getDp /// Gets the default description value. /// /// String reference. - protected override string GetDescriptionDefault() => GlobalStaticValues.DEFAULT_EMPTY_STRING; + protected override string GetDescriptionDefault() => GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/HeaderValuesBase.cs b/Source/Krypton Components/Krypton.Toolkit/Values/HeaderValuesBase.cs index a973c5edb5..8c0dcf2d95 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/HeaderValuesBase.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/HeaderValuesBase.cs @@ -61,7 +61,7 @@ protected HeaderValuesBase(NeedPaintHandler? needPaint, GetDpiFactor getDpiFacto // Set initial values to the default _image = GetImageDefault(); - _transparent = GlobalStaticValues.EMPTY_COLOR; + _transparent = GlobalStaticVariables.EMPTY_COLOR; _heading = GetHeadingDefault(); _description = GetDescriptionDefault(); } @@ -164,8 +164,8 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; - protected internal void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; + protected internal void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content image transparent color. @@ -188,7 +188,7 @@ public Color ImageTransparentColor [AllowNull] public virtual string Heading { - get => _heading ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _heading ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { @@ -254,7 +254,7 @@ public virtual string Description /// /// The state for which the overlay image is needed. /// Color value. - public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public virtual Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarButtonValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarButtonValues.cs index 148abb2a68..f31ad07ba4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarButtonValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarButtonValues.cs @@ -125,7 +125,7 @@ public IntegratedToolBarButtonValues() /// Converts to string. /// A that represents this instance. - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarCommandValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarCommandValues.cs index 52ef3dfd3a..b258d6caa7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarCommandValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarCommandValues.cs @@ -54,7 +54,7 @@ public IntegratedToolBarCommandValues() /// Converts to string. /// A that represents this instance. - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarValues.cs index 91a2bbf1d5..146daee408 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/IntegratedToolBarValues.cs @@ -85,7 +85,7 @@ public override string ToString() { return base.ToString() is string s ? s - : GlobalStaticValues.DEFAULT_EMPTY_STRING; + : GlobalStaticVariables.DEFAULT_EMPTY_STRING; } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/Internal/InternalCommandLinkImageValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/Internal/InternalCommandLinkImageValues.cs index f9a0db4cfe..51413b47b1 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/Internal/InternalCommandLinkImageValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/Internal/InternalCommandLinkImageValues.cs @@ -68,8 +68,8 @@ public Color ImageTransparentColor } } } - private bool ShouldSerializeImageTransparentColor() => _transparencyKey != GlobalStaticValues.EMPTY_COLOR; - private void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => _transparencyKey != GlobalStaticVariables.EMPTY_COLOR; + private void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; /// The UAC image. [Category("Visuals")] @@ -117,10 +117,10 @@ public IconSize UACShieldIconSize public Color GetImageTransparentColor(PaletteState state) => ImageTransparentColor; /// - public string GetShortText() => GlobalStaticValues.DEFAULT_EMPTY_STRING; + public string GetShortText() => GlobalStaticVariables.DEFAULT_EMPTY_STRING; /// - public string GetLongText() => GlobalStaticValues.DEFAULT_EMPTY_STRING; + public string GetLongText() => GlobalStaticVariables.DEFAULT_EMPTY_STRING; /// /// Gets the overlay image. @@ -134,7 +134,7 @@ public IconSize UACShieldIconSize /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/LabelValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/LabelValues.cs index aca2b5254e..ef49cb77fb 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/LabelValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/LabelValues.cs @@ -20,7 +20,7 @@ public class LabelValues : Storage, { #region Static Fields private const string DEFAULT_TEXT = nameof(Label); - private static readonly string _defaultExtraText = GlobalStaticValues.DEFAULT_EMPTY_STRING; + private static readonly string _defaultExtraText = GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion #region Instance Fields @@ -52,7 +52,7 @@ public LabelValues(NeedPaintHandler needPaint) // Set initial values _image = null; - _transparent = GlobalStaticValues.EMPTY_COLOR; + _transparent = GlobalStaticVariables.EMPTY_COLOR; _text = DEFAULT_TEXT; _extraText = _defaultExtraText; _overlayImage = new OverlayImageValues(needPaint); @@ -66,7 +66,7 @@ public LabelValues(NeedPaintHandler needPaint) [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => (Image == null) && - (ImageTransparentColor == GlobalStaticValues.EMPTY_COLOR) && + (ImageTransparentColor == GlobalStaticVariables.EMPTY_COLOR) && (Text == DEFAULT_TEXT) && (ExtraText == _defaultExtraText) && _overlayImage.IsDefault; @@ -134,12 +134,12 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Resets the ImageTransparentColor property to its default value. /// - public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content image transparent color. @@ -162,7 +162,7 @@ public Color ImageTransparentColor [AllowNull] public string Text { - get => _text ?? GlobalStaticValues.DEFAULT_EMPTY_STRING; + get => _text ?? GlobalStaticVariables.DEFAULT_EMPTY_STRING; set { diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/OverlayImageValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/OverlayImageValues.cs index a939754f0a..0189f298d3 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/OverlayImageValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/OverlayImageValues.cs @@ -50,7 +50,7 @@ public OverlayImageValues(NeedPaintHandler needPaint) [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public override bool IsDefault => (Image == null) && - (ImageTransparentColor == GlobalStaticValues.EMPTY_COLOR) && + (ImageTransparentColor == GlobalStaticVariables.EMPTY_COLOR) && (Position == OverlayImagePosition.TopRight) && (ScaleMode == OverlayImageScaleMode.None) && (ScaleFactor == 0.5f) && @@ -116,12 +116,12 @@ public Color ImageTransparentColor } } - private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticValues.EMPTY_COLOR; + private bool ShouldSerializeImageTransparentColor() => ImageTransparentColor != GlobalStaticVariables.EMPTY_COLOR; /// /// Resets the ImageTransparentColor property to its default value. /// - public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticValues.EMPTY_COLOR; + public void ResetImageTransparentColor() => ImageTransparentColor = GlobalStaticVariables.EMPTY_COLOR; #endregion @@ -263,7 +263,7 @@ public void Reset() { // Set initial values _image = null; - _transparent = GlobalStaticValues.EMPTY_COLOR; + _transparent = GlobalStaticVariables.EMPTY_COLOR; _position = OverlayImagePosition.TopRight; _scaleMode = OverlayImageScaleMode.None; _scaleFactor = 0.5f; // Default to 50% of main image @@ -290,5 +290,5 @@ public void CopyFrom(OverlayImageValues source) #endregion - public override string ToString() => !IsDefault ? @"Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? @"Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/PoweredByButtonValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/PoweredByButtonValues.cs index 4277655354..2506edb1b0 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/PoweredByButtonValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/PoweredByButtonValues.cs @@ -79,7 +79,7 @@ public ToolkitSupportType ToolkitSupportType #region Protected - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateCommonBaseValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateCommonBaseValues.cs index 2cae630197..316aea2f0b 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateCommonBaseValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateCommonBaseValues.cs @@ -224,7 +224,7 @@ public void Reset() #region Public Overrides /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionAppearanceValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionAppearanceValues.cs index 194df0251d..a5c8e66c95 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionAppearanceValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionAppearanceValues.cs @@ -190,7 +190,7 @@ internal void OnStateChanged(ProgressBarTriStateRegionStateValues state) #region Public Overrides /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion# } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionBackValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionBackValues.cs index e84cf43819..36d8992fd5 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionBackValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionBackValues.cs @@ -231,7 +231,7 @@ public void Reset() #region Public Overrides /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionContentValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionContentValues.cs index 761e53ca6b..b734d85938 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionContentValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionContentValues.cs @@ -162,7 +162,7 @@ public void Reset() #region Public Overrides /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionStateValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionStateValues.cs index 1344929431..98680a7033 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionStateValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ProgressBar/TriState/ProgressBarTriStateRegionStateValues.cs @@ -166,7 +166,7 @@ private static Color GetOppositeColor(Color color) => #region Public Overrides /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; #endregion } diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ToggleSwitchValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ToggleSwitchValues.cs index dd2c3e0a95..6d4c30cf38 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ToggleSwitchValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ToggleSwitchValues.cs @@ -325,5 +325,5 @@ public void Reset() #endregion /// - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Values/ToolkitStringValues.cs b/Source/Krypton Components/Krypton.Toolkit/Values/ToolkitStringValues.cs index 6574ecd21e..7f53521c72 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Values/ToolkitStringValues.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Values/ToolkitStringValues.cs @@ -535,7 +535,7 @@ public ToolkitStringValues() /// Converts to string. /// A that represents this instance. - public override string ToString() => !IsDefault ? "Modified" : GlobalStaticValues.DEFAULT_EMPTY_STRING; + public override string ToString() => !IsDefault ? "Modified" : GlobalStaticVariables.DEFAULT_EMPTY_STRING; [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] diff --git a/Source/Krypton Components/Krypton.Toolkit/View Base/Internal/InternalKryptonCountdownButton.cs b/Source/Krypton Components/Krypton.Toolkit/View Base/Internal/InternalKryptonCountdownButton.cs index 111358fdd0..9a54f926f7 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Base/Internal/InternalKryptonCountdownButton.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Base/Internal/InternalKryptonCountdownButton.cs @@ -92,18 +92,18 @@ public int CountdownInterval /// Initializes a new instance of the class. public InternalKryptonCountdownButton() { - _initialCountdownSeconds = GlobalStaticValues.DEFAULT_COUNTDOWN_VALUE; + _initialCountdownSeconds = GlobalStaticConstants.DEFAULT_COUNTDOWN_VALUE; _countdownTimer = new Timer { - Interval = GlobalStaticValues.DEFAULT_COUNTDOWN_INTERVAL + Interval = GlobalStaticConstants.DEFAULT_COUNTDOWN_INTERVAL }; _countdownTimer.Tick += OnCountdownTimer_Tick; - CountdownDuration = GlobalStaticValues.DEFAULT_COUNTDOWN_VALUE; + CountdownDuration = GlobalStaticConstants.DEFAULT_COUNTDOWN_VALUE; - CountdownInterval = GlobalStaticValues.DEFAULT_COUNTDOWN_INTERVAL; + CountdownInterval = GlobalStaticConstants.DEFAULT_COUNTDOWN_INTERVAL; } #endregion diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawEmptyContent.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawEmptyContent.cs index ad0f419c51..52f3b6df35 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawEmptyContent.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawEmptyContent.cs @@ -131,7 +131,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -157,7 +157,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuColorBlock.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuColorBlock.cs index b59fdb903a..347d9810fe 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuColorBlock.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuColorBlock.cs @@ -213,11 +213,11 @@ public override void RenderAfter([DisallowNull] RenderContext context) } // If not in normal state, then need to adorn display - var outside = GlobalStaticValues.EMPTY_COLOR; - var inside = GlobalStaticValues.EMPTY_COLOR; + var outside = GlobalStaticVariables.EMPTY_COLOR; + var inside = GlobalStaticVariables.EMPTY_COLOR; // Is this element selected? - var selected = (KryptonContextMenuColorColumns.SelectedColor != GlobalStaticValues.EMPTY_COLOR) && KryptonContextMenuColorColumns.SelectedColor.Equals(Color); + var selected = (KryptonContextMenuColorColumns.SelectedColor != GlobalStaticVariables.EMPTY_COLOR) && KryptonContextMenuColorColumns.SelectedColor.Equals(Color); switch (ElementState) { diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageColumn.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageColumn.cs index 83e09c4fe5..fcdb38ff94 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageColumn.cs @@ -100,7 +100,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) Color p1 = PaletteBack!.GetBackColor1(State); Color p2 = PaletteBack!.GetBackColor2(State); - if (p1 != GlobalStaticValues.EMPTY_COLOR || p2 != GlobalStaticValues.EMPTY_COLOR) + if (p1 != GlobalStaticVariables.EMPTY_COLOR || p2 != GlobalStaticVariables.EMPTY_COLOR) { if (p1 == p2) { @@ -150,7 +150,7 @@ public override void RenderAfter([DisallowNull] RenderContext context) // Prefer palette border colors so control overrides work; fallback to ColorTable Color lineLight = PaletteBorder!.GetBorderColor1(State); Color lineDark = PaletteBorder!.GetBorderColor2(State); - if (lineLight == GlobalStaticValues.EMPTY_COLOR && lineDark == GlobalStaticValues.EMPTY_COLOR) + if (lineLight == GlobalStaticVariables.EMPTY_COLOR && lineDark == GlobalStaticVariables.EMPTY_COLOR) { var colorTable = _provider.ProviderRedirector.ColorTable; lineLight = colorTable.ImageMarginGradientEnd; diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageSelectItem.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageSelectItem.cs index a456f08ba4..a3c28dc4e4 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageSelectItem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuImageSelectItem.cs @@ -161,7 +161,7 @@ public override void Render([DisallowNull] RenderContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -185,7 +185,7 @@ public override void Render([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuItem.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuItem.cs index d76252b382..540020de37 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuItem.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMenuItem.cs @@ -81,18 +81,18 @@ public ViewDrawMenuItem(IContextMenuProvider provider, if (_imageColumn) { itemColumnImage = _empty16x16; - itemImageTransparent = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + itemImageTransparent = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } switch (ResolveCheckState) { case CheckState.Checked: itemColumnImage = provider.ProviderImages.GetContextMenuCheckedImage(); - itemImageTransparent = GlobalStaticValues.EMPTY_COLOR; + itemImageTransparent = GlobalStaticVariables.EMPTY_COLOR; break; case CheckState.Indeterminate: itemColumnImage = provider.ProviderImages.GetContextMenuIndeterminateImage(); - itemImageTransparent = GlobalStaticValues.EMPTY_COLOR; + itemImageTransparent = GlobalStaticVariables.EMPTY_COLOR; break; } } @@ -110,7 +110,7 @@ public ViewDrawMenuItem(IContextMenuProvider provider, // Text/Extra Text PaletteContentJustText menuItemStyle = standardStyle ? menuItemState.ItemTextStandard : menuItemState.ItemTextAlternate; - _fixedTextExtraText = new FixedContentValue(ResolveText, ResolveExtraText, null, GlobalStaticValues.EMPTY_COLOR); + _fixedTextExtraText = new FixedContentValue(ResolveText, ResolveExtraText, null, GlobalStaticVariables.EMPTY_COLOR); _textContent = new ViewDrawMenuItemContent(menuItemStyle, _fixedTextExtraText, 1); docker.Add(_textContent, ViewDockStyle.Fill); _textContent.Enabled = ItemEnabled; @@ -128,7 +128,7 @@ public ViewDrawMenuItem(IContextMenuProvider provider, if (shortcutString.Length > 0) { - _shortcutContent = new ViewDrawMenuItemContent(menuItemState.ItemShortcutText, new FixedContentValue(shortcutString, null, null, GlobalStaticValues.EMPTY_COLOR), 2); + _shortcutContent = new ViewDrawMenuItemContent(menuItemState.ItemShortcutText, new FixedContentValue(shortcutString, null, null, GlobalStaticVariables.EMPTY_COLOR), 2); docker.Add(_shortcutContent, ViewDockStyle.Right); _shortcutContent.Enabled = ItemEnabled; } @@ -147,8 +147,8 @@ public ViewDrawMenuItem(IContextMenuProvider provider, ? _empty16x16 : provider.ProviderImages.GetContextMenuSubMenuImage(), KryptonContextMenuItem.Items.Count == 0 - ? GlobalStaticValues.TRANSPARENCY_KEY_COLOR - : GlobalStaticValues.EMPTY_COLOR), + ? GlobalStaticVariables.TRANSPARENCY_KEY_COLOR + : GlobalStaticVariables.EMPTY_COLOR), 3); docker.Add(new ViewLayoutCenter(_subMenuContent), ViewDockStyle.Right); _subMenuContent.Enabled = ItemEnabled; @@ -528,18 +528,18 @@ public override Size GetPreferredSize([DisallowNull] ViewLayoutContext context) if (_imageColumn) { itemColumnImage = _empty16x16; - itemImageTransparent = GlobalStaticValues.TRANSPARENCY_KEY_COLOR; + itemImageTransparent = GlobalStaticVariables.TRANSPARENCY_KEY_COLOR; } switch (ResolveCheckState) { case CheckState.Checked: itemColumnImage = _provider.ProviderImages.GetContextMenuCheckedImage(); - itemImageTransparent = GlobalStaticValues.EMPTY_COLOR; + itemImageTransparent = GlobalStaticVariables.EMPTY_COLOR; break; case CheckState.Indeterminate: itemColumnImage = _provider.ProviderImages.GetContextMenuIndeterminateImage(); - itemImageTransparent = GlobalStaticValues.EMPTY_COLOR; + itemImageTransparent = GlobalStaticVariables.EMPTY_COLOR; break; } } diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonth.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonth.cs index ca67714afc..42a95ac0c6 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonth.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonth.cs @@ -276,7 +276,7 @@ public override void Layout(ViewLayoutContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -302,7 +302,7 @@ public override void Layout(ViewLayoutContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDayNames.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDayNames.cs index 112dada0ac..8af0ae1660 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDayNames.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDayNames.cs @@ -229,7 +229,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -255,7 +255,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDays.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDays.cs index 3dd4b9afd6..ca77e90203 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDays.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawMonthDays.cs @@ -557,7 +557,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -583,7 +583,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawToday.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawToday.cs index 68b7f54f2d..88fccc0df8 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawToday.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawToday.cs @@ -85,7 +85,7 @@ public override string ToString() => /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -112,7 +112,7 @@ public string GetShortText() => /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawWeekNumbers.cs b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawWeekNumbers.cs index e49b6e9983..66b7efc716 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawWeekNumbers.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Draw/ViewDrawWeekNumbers.cs @@ -287,7 +287,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -313,7 +313,7 @@ public override void RenderBefore([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs index 25c0ed95eb..4c84dd0673 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutCrumbs.cs @@ -323,7 +323,7 @@ public override void Render([DisallowNull] RenderContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutMonths.cs b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutMonths.cs index 74edad9e75..ac84667120 100644 --- a/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutMonths.cs +++ b/Source/Krypton Components/Krypton.Toolkit/View Layout/ViewLayoutMonths.cs @@ -608,7 +608,7 @@ public override void Layout([DisallowNull] ViewLayoutContext context) /// /// The state for which the image is needed. /// Color value. - public Color GetImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the content short text. @@ -634,7 +634,7 @@ public override void Layout([DisallowNull] ViewLayoutContext context) /// /// The state for which the overlay image is needed. /// Color value. - public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticValues.EMPTY_COLOR; + public Color GetOverlayImageTransparentColor(PaletteState state) => GlobalStaticVariables.EMPTY_COLOR; /// /// Gets the position of the overlay image relative to the main image. diff --git a/Source/Krypton Components/Krypton.Workspace/Controls Workspace/KryptonWorkspace.cs b/Source/Krypton Components/Krypton.Workspace/Controls Workspace/KryptonWorkspace.cs index 1dc261b23a..7898a9bfc7 100644 --- a/Source/Krypton Components/Krypton.Workspace/Controls Workspace/KryptonWorkspace.cs +++ b/Source/Krypton Components/Krypton.Workspace/Controls Workspace/KryptonWorkspace.cs @@ -3804,12 +3804,12 @@ private void OnCellShowContextMenu(object? sender, ShowContextMenuArgs e) if (_menuPage is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_menuPage))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_menuPage))); } if (_menuCell is null) { - throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(_menuCell))); + throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(_menuCell))); } // Update the individual menu options diff --git a/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCellDesigner.cs b/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCellDesigner.cs index e651d917c6..42d9abbf17 100644 --- a/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCellDesigner.cs +++ b/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCellDesigner.cs @@ -34,7 +34,7 @@ protected override void OnComponentRemoving(object? sender, ComponentEventArgs e if (e.Component == Navigator) { // If this workspace cell is inside a parent - var cell = Navigator as KryptonWorkspaceCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(Navigator))); + var cell = Navigator as KryptonWorkspaceCell ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(Navigator))); // Cell an only be inside a workspace sequence var sequence = cell.WorkspaceParent as KryptonWorkspaceSequence; // Remove the cell from the parent diff --git a/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCollectionEditor.cs b/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCollectionEditor.cs index b0d85a3197..3055e27609 100644 --- a/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCollectionEditor.cs +++ b/Source/Krypton Components/Krypton.Workspace/Workspace/KryptonWorkspaceCollectionEditor.cs @@ -1103,7 +1103,7 @@ private void buttonMoveUp_Click(object? sender, EventArgs e) if (isNodePage) { // Remove page from parent cell - var parentNode = node.Parent as MenuTreeNode ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(node.Parent))); + var parentNode = node.Parent as MenuTreeNode ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(node.Parent))); parentNode.CellItem!.Pages.Remove(node.PageItem!); parentNode.Nodes.Remove(node); @@ -1417,7 +1417,7 @@ private void buttonAddCell_Click(object? sender, EventArgs e) private void buttonAddSequence_Click(object? sender, EventArgs e) { // Create new sequence and menu node for the sequence - var sequence = CreateInstance(typeof(KryptonWorkspaceSequence)) as KryptonWorkspaceSequence ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull("sequence")); + var sequence = CreateInstance(typeof(KryptonWorkspaceSequence)) as KryptonWorkspaceSequence ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull("sequence")); TreeNode newNode = new MenuTreeNode(sequence); var selectedNode = _treeView.SelectedNode as MenuTreeNode; @@ -1436,7 +1436,7 @@ private void buttonAddSequence_Click(object? sender, EventArgs e) else { // Selected node is a cell, so insert after this cell - var selectedParentNode = selectedNode.Parent as MenuTreeNode ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(selectedNode.Parent))); + var selectedParentNode = selectedNode.Parent as MenuTreeNode ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(selectedNode.Parent))); var selectedIndex = selectedParentNode.Nodes.IndexOf(selectedNode); selectedParentNode.SequenceItem!.Children!.Insert(selectedIndex + 1, sequence); selectedParentNode.Nodes.Insert(selectedIndex + 1, newNode); @@ -1655,7 +1655,7 @@ private static void SeparatorToItems(ViewDrawWorkspaceSeparator separator, after = separator.WorkspaceItem; // Workspace item before the separator (to the left or above) - var beforeSequence = after.WorkspaceParent as KryptonWorkspaceSequence ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(after.WorkspaceParent))); + var beforeSequence = after.WorkspaceParent as KryptonWorkspaceSequence ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(after.WorkspaceParent))); // Previous items might be invisible and so search till we find the visible one we expect before = null; @@ -1845,7 +1845,7 @@ public KryptonWorkspace Workspace { get { - var sequence = Context!.Instance as KryptonWorkspaceSequence ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(Context.Instance))); + var sequence = Context!.Instance as KryptonWorkspaceSequence ?? throw new NullReferenceException(GlobalStaticFunctions.VariableCannotBeNull(nameof(Context.Instance))); return sequence.WorkspaceControl; } } diff --git a/Source/Krypton Components/TestForm/BasicToastNotificationTest.cs b/Source/Krypton Components/TestForm/BasicToastNotificationTest.cs index ed816279e2..ef55213fcb 100644 --- a/Source/Krypton Components/TestForm/BasicToastNotificationTest.cs +++ b/Source/Krypton Components/TestForm/BasicToastNotificationTest.cs @@ -9,7 +9,6 @@ using Krypton.Utilities; -using GlobalStaticValues = Krypton.Toolkit.GlobalStaticValues; using GraphicsExtensions = Krypton.Toolkit.GraphicsExtensions; namespace TestForm; @@ -225,7 +224,7 @@ private void kchkShowDoNotShowAgain_CheckedChanged(object sender, EventArgs e) private void kbtnSampleText_Click(object sender, EventArgs e) { - ktxtToastContent.Text = GlobalStaticValues.DEFAULT_LONG_SEED_TEXT; + ktxtToastContent.Text = GlobalStaticVariables.DEFAULT_LONG_SEED_TEXT; } private void kcmbToastTitleAlignmentV_SelectedIndexChanged(object sender, EventArgs e) diff --git a/Source/Krypton Components/TestForm/ButtonTextTrackingExample.cs b/Source/Krypton Components/TestForm/ButtonTextTrackingExample.cs index 46c0a5f9c1..54d8ec8f6c 100644 --- a/Source/Krypton Components/TestForm/ButtonTextTrackingExample.cs +++ b/Source/Krypton Components/TestForm/ButtonTextTrackingExample.cs @@ -60,8 +60,8 @@ private void ApplyTrackingColor(Color color) if (color.IsEmpty || color.A == 0) { - palette.SetSchemeColor(SchemeBaseColors.ButtonTextTracking, GlobalStaticValues.EMPTY_COLOR); - palette.SetSchemeExtraColor(SchemeExtraColors.ButtonTextTracking, GlobalStaticValues.EMPTY_COLOR); + palette.SetSchemeColor(SchemeBaseColors.ButtonTextTracking, GlobalStaticVariables.EMPTY_COLOR); + palette.SetSchemeExtraColor(SchemeExtraColors.ButtonTextTracking, GlobalStaticVariables.EMPTY_COLOR); klblStatus.Values.Text = "Tracking color reset to theme default."; } else diff --git a/Source/Krypton Components/TestForm/Main.cs b/Source/Krypton Components/TestForm/Main.cs index 12a46755d8..54378f74c7 100644 --- a/Source/Krypton Components/TestForm/Main.cs +++ b/Source/Krypton Components/TestForm/Main.cs @@ -111,7 +111,7 @@ private void kryptonButton3_Click(object sender, EventArgs e) { ShowImportButton = true, ShowSilentOption = true, - StartIndex = Krypton.Toolkit.GlobalStaticValues.GLOBAL_DEFAULT_THEME_INDEX, + StartIndex = GlobalStaticConstants.GLOBAL_DEFAULT_THEME_INDEX, StartPosition = FormStartPosition.CenterScreen, WindowTitle = KryptonManager.Strings.MiscellaneousThemeStrings.ThemeBrowserWindowTitle }; diff --git a/Source/Krypton Components/TestForm/MenuToolBarStatusStripTest.cs b/Source/Krypton Components/TestForm/MenuToolBarStatusStripTest.cs index 2b4a01288e..e2658035ff 100644 --- a/Source/Krypton Components/TestForm/MenuToolBarStatusStripTest.cs +++ b/Source/Krypton Components/TestForm/MenuToolBarStatusStripTest.cs @@ -40,8 +40,8 @@ private void animateStatusStripToolStripMenuItem_Click(object? sender, EventArgs // Reset to palette defaults when manually stopped if (statusStrip1 is Krypton.Toolkit.KryptonStatusStrip kss) { - kss.StateCommon.Color1 = GlobalStaticValues.EMPTY_COLOR; - kss.StateCommon.Color2 = GlobalStaticValues.EMPTY_COLOR; + kss.StateCommon.Color1 = GlobalStaticVariables.EMPTY_COLOR; + kss.StateCommon.Color2 = GlobalStaticVariables.EMPTY_COLOR; kss.StateCommon.ColorStyle = PaletteColorStyle.Inherit; kss.StateCommon.ColorAngle = -1f; kss.Invalidate(); @@ -78,7 +78,7 @@ private void StatusStripTimer_Tick(object? sender, EventArgs e) // Use per-control override path kss.StateCommon.ColorStyle = Krypton.Toolkit.PaletteColorStyle.Solid; kss.StateCommon.Color1 = color; - kss.StateCommon.Color2 = GlobalStaticValues.EMPTY_COLOR; + kss.StateCommon.Color2 = GlobalStaticVariables.EMPTY_COLOR; kss.StateCommon.ColorAngle = -1f; } else @@ -99,8 +99,8 @@ private void KryptonManager_GlobalPaletteChanged(object? sender, EventArgs e) if (statusStrip1 is Krypton.Toolkit.KryptonStatusStrip kss) { // Clear per-control overrides to fall back to palette - kss.StateCommon.Color1 = GlobalStaticValues.EMPTY_COLOR; - kss.StateCommon.Color2 = GlobalStaticValues.EMPTY_COLOR; + kss.StateCommon.Color1 = GlobalStaticVariables.EMPTY_COLOR; + kss.StateCommon.Color2 = GlobalStaticVariables.EMPTY_COLOR; kss.StateCommon.ColorStyle = PaletteColorStyle.Inherit; kss.StateCommon.ColorAngle = -1f; kss.Invalidate(); @@ -130,11 +130,11 @@ private Color GetCurrentStatusStripBaseColor() var ct = KryptonManager.CurrentGlobalPalette?.ColorTable; if (ct is not null) { - if (ct.StatusStripGradientEnd != GlobalStaticValues.EMPTY_COLOR) + if (ct.StatusStripGradientEnd != GlobalStaticVariables.EMPTY_COLOR) { return ct.StatusStripGradientEnd; } - if (ct.StatusStripGradientBegin != GlobalStaticValues.EMPTY_COLOR) + if (ct.StatusStripGradientBegin != GlobalStaticVariables.EMPTY_COLOR) { return ct.StatusStripGradientBegin; } @@ -145,7 +145,7 @@ private Color GetCurrentStatusStripBaseColor() { // Use inherited default if available var c1 = kss.StateCommon.GetBackColor1(Krypton.Toolkit.PaletteState.Normal); - if (c1 != GlobalStaticValues.EMPTY_COLOR && !c1.IsEmpty) + if (c1 != GlobalStaticVariables.EMPTY_COLOR && !c1.IsEmpty) { return c1; } diff --git a/Source/Krypton Components/TestForm/ThemeControlExamples.cs b/Source/Krypton Components/TestForm/ThemeControlExamples.cs index b1d8f441ed..d017b3e239 100644 --- a/Source/Krypton Components/TestForm/ThemeControlExamples.cs +++ b/Source/Krypton Components/TestForm/ThemeControlExamples.cs @@ -22,7 +22,7 @@ private void kbtnThemeBrowser_Click(object sender, EventArgs e) { ShowImportButton = true, ShowSilentOption = true, - StartIndex = GlobalStaticValues.GLOBAL_DEFAULT_THEME_INDEX, + StartIndex = GlobalStaticConstants.GLOBAL_DEFAULT_THEME_INDEX, StartPosition = FormStartPosition.CenterScreen, WindowTitle = KryptonManager.Strings.MiscellaneousThemeStrings.ThemeBrowserWindowTitle }; diff --git a/Source/Krypton Components/TestForm/UserInputToastNotificationTest.cs b/Source/Krypton Components/TestForm/UserInputToastNotificationTest.cs index 780e6e227f..bbab351e17 100644 --- a/Source/Krypton Components/TestForm/UserInputToastNotificationTest.cs +++ b/Source/Krypton Components/TestForm/UserInputToastNotificationTest.cs @@ -9,8 +9,6 @@ using Krypton.Utilities; -using GlobalStaticValues = Krypton.Toolkit.GlobalStaticValues; - namespace TestForm; public partial class UserInputToastNotificationTest : KryptonForm @@ -183,7 +181,7 @@ private ArrayList TemporaryArrayList() private void kbtnSampleText_Click(object sender, EventArgs e) { - ktxtToastContent.Text = GlobalStaticValues.DEFAULT_LONG_SEED_TEXT; + ktxtToastContent.Text = GlobalStaticVariables.DEFAULT_LONG_SEED_TEXT; } private void kbtnContentFont_Click(object sender, EventArgs e)