Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

* #149 #151

Merged
merged 1 commit into from
Jun 8, 2021
Merged

* #149 #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected override void Dispose(bool disposing)
/// </summary>
[Category("Visuals")]
[Description("Global palette applied to drawing.")]
[DefaultValue(typeof(PaletteModeManager), "Office2010Blue")]
[DefaultValue(typeof(PaletteModeManager), "Office365Blue")]
public PaletteModeManager GlobalPaletteMode
{
get => InternalGlobalPaletteMode;
Expand Down Expand Up @@ -191,15 +191,15 @@ public PaletteModeManager GlobalPaletteMode

private bool ShouldSerializeGlobalPaletteMode()
{
return (GlobalPaletteMode != PaletteModeManager.Office2010Blue);
return (GlobalPaletteMode != PaletteModeManager.Office365Blue);
}

/// <summary>
/// Resets the GlobalPaletteMode property to its default value.
/// </summary>
public void ResetGlobalPaletteMode()
{
GlobalPaletteMode = PaletteModeManager.Office2010Blue;
GlobalPaletteMode = PaletteModeManager.Office365Blue;
}

/// <summary>
Expand All @@ -222,7 +222,7 @@ public IPalette GlobalPalette
IPalette tempPalette = InternalGlobalPalette;

// Use the new values
InternalGlobalPaletteMode = (value == null) ? PaletteModeManager.Office2010Blue : PaletteModeManager.Custom;
InternalGlobalPaletteMode = (value == null) ? PaletteModeManager.Office365Blue : PaletteModeManager.Custom;
InternalGlobalPalette = value;

// If the new value creates a circular reference
Expand Down Expand Up @@ -267,7 +267,7 @@ public IPalette GlobalPalette
/// </summary>
public void ResetGlobalPalette()
{
GlobalPaletteMode = PaletteModeManager.Office2010Blue;
GlobalPaletteMode = PaletteModeManager.Office365Blue;
}

/// <summary>
Expand Down Expand Up @@ -691,7 +691,7 @@ public static IRenderer GetRendererForMode(RendererMode mode)
#endregion

#region Static Internal
internal static PaletteModeManager InternalGlobalPaletteMode { get; private set; } = PaletteModeManager.Office2010Blue;
internal static PaletteModeManager InternalGlobalPaletteMode { get; private set; } = PaletteModeManager.Office365Blue;

internal static IPalette InternalGlobalPalette { get; private set; } = CurrentGlobalPalette;

Expand Down