Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop

This commit is contained in:
Tig Kindel
2022-07-27 22:44:08 -06:00
3 changed files with 10 additions and 2 deletions

View File

@@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Fody" Version="18.0.10" />
<PackageReference Include="ReactiveUI" Version="18.2.5" />
<PackageReference Include="ReactiveUI" Version="18.3.1" />
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.1.4" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>

View File

@@ -1022,6 +1022,12 @@ namespace Terminal.Gui {
if (state.Toplevel != Top
&& (!Top.NeedDisplay.IsEmpty || Top.ChildNeedsDisplay || Top.LayoutNeeded)) {
Top.Redraw (Top.Bounds);
foreach (var top in toplevels.Reverse ()) {
if (top != Top && top != state.Toplevel) {
top.SetNeedsDisplay ();
top.Redraw (top.Bounds);
}
}
state.Toplevel.SetNeedsDisplay (state.Toplevel.Bounds);
}
if (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.ChildNeedsDisplay || state.Toplevel.LayoutNeeded

View File

@@ -203,7 +203,9 @@ namespace Terminal.Gui {
base.Add (contentView);
helpTextView.ColorScheme = Colors.TopLevel;
helpTextView.ColorScheme = new ColorScheme () {
Normal = new Attribute(Color.Gray, Color.DarkGray)
};
helpTextView.ReadOnly = true;
helpTextView.WordWrap = true;
base.Add (helpTextView);