Merge branch 'develop' into fix_2109_menubar_spacing

This commit is contained in:
Charlie Kindel
2022-10-21 16:08:04 -06:00

View File

@@ -1073,14 +1073,10 @@ namespace Terminal.Gui {
Attribute hotColor, normalColor;
if (i == selected && IsMenuOpen) {
hotColor = i == selected ? ColorScheme.HotFocus : ColorScheme.HotNormal;
normalColor = i == selected ? ColorScheme.Focus :
GetNormalColor ();
} else if (openedByAltKey) {
normalColor = i == selected ? ColorScheme.Focus : GetNormalColor ();
} else {
hotColor = ColorScheme.HotNormal;
normalColor = GetNormalColor ();
} else {
hotColor = GetNormalColor ();
normalColor = GetNormalColor ();
}
// Note Help on MenuBar is drawn with parens around it
DrawHotString (menu.Help.IsEmpty ? $" {menu.Title} " : $" {menu.Title} ({menu.Help}) ", hotColor, normalColor);