Skip to content

Fixes #2286 - ColorScheme.SetAttribute is defunct and should be removed #2292

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

Merged
tig merged 2 commits into from
Jan 16, 2023
Merged

Fixes #2286 - ColorScheme.SetAttribute is defunct and should be removed #2292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36d19c6
Removed ColorScheme.SetAttribute
tig Jan 16, 2023
64ee03f
Merge branch 'develop' into fixes_2286_colorscheme_setattribute
tig Jan 16, 2023
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
136 changes: 5 additions & 131 deletions Terminal.Gui/Core/ConsoleDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,153 +212,27 @@ public class ColorScheme : IEquatable<ColorScheme> {
/// <summary>
/// The default color for text, when the view is not focused.
/// </summary>
public Attribute Normal { get { return _normal; } set { _normal = SetAttribute (value); } }
public Attribute Normal { get { return _normal; } set { _normal = value; } }

/// <summary>
/// The color for text when the view has the focus.
/// </summary>
public Attribute Focus { get { return _focus; } set { _focus = SetAttribute (value); } }
public Attribute Focus { get { return _focus; } set { _focus = value; } }

/// <summary>
/// The color for the hotkey when a view is not focused
/// </summary>
public Attribute HotNormal { get { return _hotNormal; } set { _hotNormal = SetAttribute (value); } }
public Attribute HotNormal { get { return _hotNormal; } set { _hotNormal = value; } }

/// <summary>
/// The color for the hotkey when the view is focused.
/// </summary>
public Attribute HotFocus { get { return _hotFocus; } set { _hotFocus = SetAttribute (value); } }
public Attribute HotFocus { get { return _hotFocus; } set { _hotFocus = value; } }

/// <summary>
/// The default color for text, when the view is disabled.
/// </summary>
public Attribute Disabled { get { return _disabled; } set { _disabled = SetAttribute (value); } }

bool preparingScheme = false;

Attribute SetAttribute (Attribute attribute, [CallerMemberName] string callerMemberName = null)
{
if (!Application._initialized && !preparingScheme)
return attribute;

if (preparingScheme)
return attribute;

preparingScheme = true;
switch (caller) {
case "TopLevel":
switch (callerMemberName) {
case "Normal":
HotNormal = Application.Driver.MakeAttribute (HotNormal.Foreground, attribute.Background);
break;
case "Focus":
HotFocus = Application.Driver.MakeAttribute (HotFocus.Foreground, attribute.Background);
break;
case "HotNormal":
HotFocus = Application.Driver.MakeAttribute (attribute.Foreground, HotFocus.Background);
break;
case "HotFocus":
HotNormal = Application.Driver.MakeAttribute (attribute.Foreground, HotNormal.Background);
if (Focus.Foreground != attribute.Background)
Focus = Application.Driver.MakeAttribute (Focus.Foreground, attribute.Background);
break;
}
break;

case "Base":
switch (callerMemberName) {
case "Normal":
HotNormal = Application.Driver.MakeAttribute (HotNormal.Foreground, attribute.Background);
break;
case "Focus":
HotFocus = Application.Driver.MakeAttribute (HotFocus.Foreground, attribute.Background);
break;
case "HotNormal":
HotFocus = Application.Driver.MakeAttribute (attribute.Foreground, HotFocus.Background);
Normal = Application.Driver.MakeAttribute (Normal.Foreground, attribute.Background);
break;
case "HotFocus":
HotNormal = Application.Driver.MakeAttribute (attribute.Foreground, HotNormal.Background);
if (Focus.Foreground != attribute.Background)
Focus = Application.Driver.MakeAttribute (Focus.Foreground, attribute.Background);
break;
}
break;

case "Menu":
switch (callerMemberName) {
case "Normal":
if (Focus.Background != attribute.Background)
Focus = Application.Driver.MakeAttribute (attribute.Foreground, Focus.Background);
HotNormal = Application.Driver.MakeAttribute (HotNormal.Foreground, attribute.Background);
Disabled = Application.Driver.MakeAttribute (Disabled.Foreground, attribute.Background);
break;
case "Focus":
Normal = Application.Driver.MakeAttribute (attribute.Foreground, Normal.Background);
HotFocus = Application.Driver.MakeAttribute (HotFocus.Foreground, attribute.Background);
break;
case "HotNormal":
if (Focus.Background != attribute.Background)
HotFocus = Application.Driver.MakeAttribute (attribute.Foreground, HotFocus.Background);
Normal = Application.Driver.MakeAttribute (Normal.Foreground, attribute.Background);
Disabled = Application.Driver.MakeAttribute (Disabled.Foreground, attribute.Background);
break;
case "HotFocus":
HotNormal = Application.Driver.MakeAttribute (attribute.Foreground, HotNormal.Background);
if (Focus.Foreground != attribute.Background)
Focus = Application.Driver.MakeAttribute (Focus.Foreground, attribute.Background);
break;
case "Disabled":
if (Focus.Background != attribute.Background)
HotFocus = Application.Driver.MakeAttribute (attribute.Foreground, HotFocus.Background);
Normal = Application.Driver.MakeAttribute (Normal.Foreground, attribute.Background);
HotNormal = Application.Driver.MakeAttribute (HotNormal.Foreground, attribute.Background);
break;
}
break;

case "Dialog":
switch (callerMemberName) {
case "Normal":
if (Focus.Background != attribute.Background)
Focus = Application.Driver.MakeAttribute (attribute.Foreground, Focus.Background);
HotNormal = Application.Driver.MakeAttribute (HotNormal.Foreground, attribute.Background);
break;
case "Focus":
Normal = Application.Driver.MakeAttribute (attribute.Foreground, Normal.Background);
HotFocus = Application.Driver.MakeAttribute (HotFocus.Foreground, attribute.Background);
break;
case "HotNormal":
if (Focus.Background != attribute.Background)
HotFocus = Application.Driver.MakeAttribute (attribute.Foreground, HotFocus.Background);
if (Normal.Foreground != attribute.Background)
Normal = Application.Driver.MakeAttribute (Normal.Foreground, attribute.Background);
break;
case "HotFocus":
HotNormal = Application.Driver.MakeAttribute (attribute.Foreground, HotNormal.Background);
if (Focus.Foreground != attribute.Background)
Focus = Application.Driver.MakeAttribute (Focus.Foreground, attribute.Background);
break;
}
break;

case "Error":
switch (callerMemberName) {
case "Normal":
HotNormal = Application.Driver.MakeAttribute (HotNormal.Foreground, attribute.Background);
HotFocus = Application.Driver.MakeAttribute (HotFocus.Foreground, attribute.Background);
break;
case "HotNormal":
case "HotFocus":
HotFocus = Application.Driver.MakeAttribute (attribute.Foreground, attribute.Background);
Normal = Application.Driver.MakeAttribute (Normal.Foreground, attribute.Background);
break;
}
break;
}
preparingScheme = false;
return attribute;
}
public Attribute Disabled { get { return _disabled; } set { _disabled = value; } }

/// <summary>
/// Compares two <see cref="ColorScheme"/> objects for equality.
Expand Down