Kaynağa Gözat

Merge pull request #989 from BDisp/nstack-update

Fixes #988. Update NStack.Core to version 0.15.0.
Charlie Kindel 4 yıl önce
ebeveyn
işleme
da59db3474

+ 1 - 1
Example/Example.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NStack.Core" Version="0.14.0" />
+    <PackageReference Include="NStack.Core" Version="0.15.0" />
   </ItemGroup>
 
   <ItemGroup>

+ 16 - 16
Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs

@@ -681,22 +681,22 @@ namespace Terminal.Gui {
 			if (reportableMouseEvents.HasFlag (Curses.Event.ReportMousePosition))
 				StartReportingMouseMoves ();
 
-			HLine = Curses.ACS_HLINE;
-			VLine = Curses.ACS_VLINE;
-			Stipple = Curses.ACS_CKBOARD;
-			Diamond = Curses.ACS_DIAMOND;
-			ULCorner = Curses.ACS_ULCORNER;
-			LLCorner = Curses.ACS_LLCORNER;
-			URCorner = Curses.ACS_URCORNER;
-			LRCorner = Curses.ACS_LRCORNER;
-			LeftTee = Curses.ACS_LTEE;
-			RightTee = Curses.ACS_RTEE;
-			TopTee = Curses.ACS_TTEE;
-			BottomTee = Curses.ACS_BTEE;
-			RightArrow = Curses.ACS_RARROW;
-			LeftArrow = Curses.ACS_LARROW;
-			UpArrow = Curses.ACS_UARROW;
-			DownArrow = Curses.ACS_DARROW;
+			//HLine = Curses.ACS_HLINE;
+			//VLine = Curses.ACS_VLINE;
+			//Stipple = Curses.ACS_CKBOARD;
+			//Diamond = Curses.ACS_DIAMOND;
+			//ULCorner = Curses.ACS_ULCORNER;
+			//LLCorner = Curses.ACS_LLCORNER;
+			//URCorner = Curses.ACS_URCORNER;
+			//LRCorner = Curses.ACS_LRCORNER;
+			//LeftTee = Curses.ACS_LTEE;
+			//RightTee = Curses.ACS_RTEE;
+			//TopTee = Curses.ACS_TTEE;
+			//BottomTee = Curses.ACS_BTEE;
+			//RightArrow = Curses.ACS_RARROW;
+			//LeftArrow = Curses.ACS_LARROW;
+			//UpArrow = Curses.ACS_UARROW;
+			//DownArrow = Curses.ACS_DARROW;
 
 			Colors.TopLevel = new ColorScheme ();
 			Colors.Base = new ColorScheme ();

+ 1 - 1
Terminal.Gui/Terminal.Gui.csproj

@@ -146,7 +146,7 @@
   </PropertyGroup>-->
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="true" />
-    <PackageReference Include="NStack.Core" Version="0.14.0" />
+    <PackageReference Include="NStack.Core" Version="0.15.0" />
   </ItemGroup>
   <!--<ItemGroup>
     <Reference Include="NStack">

+ 4 - 4
UnitTests/TextFormatterTests.cs

@@ -2272,13 +2272,13 @@ namespace Terminal.Gui {
 			Assert.Equal (3, ustring.Make (c).Length);
 
 			c = new System.Rune (31);
-			Assert.Equal (0, Rune.ColumnWidth (c));        // non printable character
-			Assert.Equal (0, ustring.Make (c).ConsoleWidth);
+			Assert.Equal (-1, Rune.ColumnWidth (c));        // non printable character
+			Assert.Equal (-1, ustring.Make (c).ConsoleWidth);
 			Assert.Equal (1, ustring.Make (c).Length);
 
 			c = new System.Rune (127);
-			Assert.Equal (0, Rune.ColumnWidth (c));       // non printable character
-			Assert.Equal (0, ustring.Make (c).ConsoleWidth);
+			Assert.Equal (-1, Rune.ColumnWidth (c));       // non printable character
+			Assert.Equal (-1, ustring.Make (c).ConsoleWidth);
 			Assert.Equal (1, ustring.Make (c).Length);
 		}