Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build warnings and ensured tests run

Browse Source
This commit is contained in:
Charlie Kindel
2020-10-21 08:49:34 -06:00
parent be7febc604
commit 9c0a8529a6
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Core/Toplevel.cs
View File

@@ -386,7 +386,7 @@ namespace Terminal.Gui {
Application.CurrentView = this; Application.CurrentView = this;
if (IsCurrentTop || this == Application.Top) { if (IsCurrentTop || this == Application.Top) {
if (NeedDisplay != null && !NeedDisplay.IsEmpty) { if (!NeedDisplay.IsEmpty) {
Driver.SetAttribute (Colors.TopLevel.Normal); Driver.SetAttribute (Colors.TopLevel.Normal);
// This is the Application.Top. Clear just the region we're being asked to redraw // This is the Application.Top. Clear just the region we're being asked to redraw

4
Terminal.Gui/Core/View.cs
View File

@@ -672,7 +672,7 @@ namespace Terminal.Gui {
/// <param name="region">The view-relative region that must be flagged for repaint.</param> /// <param name="region">The view-relative region that must be flagged for repaint.</param>
public void SetNeedsDisplay (Rect region) public void SetNeedsDisplay (Rect region)
{ {
if (NeedDisplay == null || NeedDisplay.IsEmpty) if (NeedDisplay.IsEmpty)
NeedDisplay = region; NeedDisplay = region;
else { else {
var x = Math.Min (NeedDisplay.X, region.X); var x = Math.Min (NeedDisplay.X, region.X);
@@ -1290,7 +1290,7 @@ namespace Terminal.Gui {
if (subviews != null) { if (subviews != null) {
foreach (var view in subviews) { foreach (var view in subviews) {
if (view.NeedDisplay != null && (!view.NeedDisplay.IsEmpty || view.childNeedsDisplay)) { if (!view.NeedDisplay.IsEmpty || view.childNeedsDisplay) {
if (view.Frame.IntersectsWith (clipRect) && (view.Frame.IntersectsWith (bounds) || bounds.X < 0 || bounds.Y < 0)) { if (view.Frame.IntersectsWith (clipRect) && (view.Frame.IntersectsWith (bounds) || bounds.X < 0 || bounds.Y < 0)) {
if (view.layoutNeeded) if (view.layoutNeeded)
view.LayoutSubviews (); view.LayoutSubviews ();

2
Terminal.Gui/Core/Window.cs
View File

@@ -173,7 +173,7 @@ namespace Terminal.Gui {
var scrRect = ViewToScreen (new Rect (0, 0, Frame.Width, Frame.Height)); var scrRect = ViewToScreen (new Rect (0, 0, Frame.Width, Frame.Height));
// BUGBUG: Why do we draw the frame twice? This call is here to clear the content area, I think. Why not just clear that area? // BUGBUG: Why do we draw the frame twice? This call is here to clear the content area, I think. Why not just clear that area?
if (NeedDisplay != null && !NeedDisplay.IsEmpty) { if (!NeedDisplay.IsEmpty) {
Driver.SetAttribute (ColorScheme.Normal); Driver.SetAttribute (ColorScheme.Normal);
Driver.DrawWindowFrame (scrRect, padding + 1, padding + 1, padding + 1, padding + 1, border: true, fill: true); Driver.DrawWindowFrame (scrRect, padding + 1, padding + 1, padding + 1, padding + 1, border: true, fill: true);
} }

2
Terminal.Gui/Views/FrameView.cs
View File

@@ -150,7 +150,7 @@ namespace Terminal.Gui {
Application.CurrentView = this; Application.CurrentView = this;
var scrRect = ViewToScreen (new Rect (0, 0, Frame.Width, Frame.Height)); var scrRect = ViewToScreen (new Rect (0, 0, Frame.Width, Frame.Height));
if (NeedDisplay != null && !NeedDisplay.IsEmpty) { if (!NeedDisplay.IsEmpty) {
Driver.SetAttribute (ColorScheme.Normal); Driver.SetAttribute (ColorScheme.Normal);
Driver.DrawWindowFrame (scrRect, padding + 1, padding + 1, padding + 1, padding + 1, border: true, fill: true); Driver.DrawWindowFrame (scrRect, padding + 1, padding + 1, padding + 1, padding + 1, border: true, fill: true);
} }

4
UnitTests/UnitTests.csproj
View File

@@ -14,10 +14,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="System.Collections" Version="4.3.0" /> <PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>