Fixes #3839, #3922 - CM Glyphs not working (#3923)

* fixed

* Moved Glyphs to ThemeScope

* Removed test code
This commit is contained in:
Tig
2025-02-26 15:24:58 -07:00
committed by GitHub
parent 7ba6d638bc
commit f3697a99f4
36 changed files with 980 additions and 898 deletions

View File

@@ -107,7 +107,7 @@ public class MenuBarTests (ITestOutputHelper output)
@$"
Nullable Checked
┌──────────────────────┐
│ {CM.Glyphs.CheckStateNone} Check this out 你 │
│ {Glyphs.CheckStateNone} Check this out 你 │
└──────────────────────┘",
output
);
@@ -3771,11 +3771,11 @@ Edit
public string ExpectedBottomRow (int i)
{
return $"{CM.Glyphs.LLCorner}{new (CM.Glyphs.HLine.ToString () [0], Menus [i].Children [0].TitleLength + 3)}{CM.Glyphs.LRCorner} \n";
return $"{Glyphs.LLCorner}{new (Glyphs.HLine.ToString () [0], Menus [i].Children [0].TitleLength + 3)}{Glyphs.LRCorner} \n";
}
// The 3 spaces at end are a result of Menu.cs line 1062 where `pos` is calculated (` + spacesAfterTitle`)
public string ExpectedMenuItemRow (int i) { return $"{CM.Glyphs.VLine} {Menus [i].Children [0].Title} {CM.Glyphs.VLine} \n"; }
public string ExpectedMenuItemRow (int i) { return $"{Glyphs.VLine} {Menus [i].Children [0].Title} {Glyphs.VLine} \n"; }
// The full expected string for an open sub menu
public string ExpectedSubMenuOpen (int i)
@@ -3800,7 +3800,7 @@ Edit
// 1 space before the Title and 2 spaces after the Title/Check/Help
public string ExpectedTopRow (int i)
{
return $"{CM.Glyphs.ULCorner}{new (CM.Glyphs.HLine.ToString () [0], Menus [i].Children [0].TitleLength + 3)}{CM.Glyphs.URCorner} \n";
return $"{Glyphs.ULCorner}{new (Glyphs.HLine.ToString () [0], Menus [i].Children [0].TitleLength + 3)}{Glyphs.URCorner} \n";
}
// Each MenuBar title has a 1 space pad on each side