Browse Source

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

Tig Kindel 3 years ago
parent
commit
29f55db243

+ 1 - 1
ReactiveExample/ReactiveExample.csproj

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

+ 6 - 0
Terminal.Gui/Core/Application.cs

@@ -1022,6 +1022,12 @@ namespace Terminal.Gui {
 			if (state.Toplevel != Top
 			if (state.Toplevel != Top
 				&& (!Top.NeedDisplay.IsEmpty || Top.ChildNeedsDisplay || Top.LayoutNeeded)) {
 				&& (!Top.NeedDisplay.IsEmpty || Top.ChildNeedsDisplay || Top.LayoutNeeded)) {
 				Top.Redraw (Top.Bounds);
 				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);
 				state.Toplevel.SetNeedsDisplay (state.Toplevel.Bounds);
 			}
 			}
 			if (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.ChildNeedsDisplay || state.Toplevel.LayoutNeeded
 			if (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.ChildNeedsDisplay || state.Toplevel.LayoutNeeded

+ 3 - 1
Terminal.Gui/Windows/Wizard.cs

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