Ver código fonte

Remove some debug messages

miguel 7 anos atrás
pai
commit
b759fa9a62

+ 1 - 1
Terminal.Gui/Drivers/WindowsDriver.cs

@@ -827,7 +827,7 @@ namespace Terminal.Gui {
 
 
 			UpdateCursor();
 			UpdateCursor();
 			winConsole.WriteToConsole (OutputBuffer, bufferCoords, damageRegion);
 			winConsole.WriteToConsole (OutputBuffer, bufferCoords, damageRegion);
-			System.Diagnostics.Debugger.Log(0, "debug", $"Region={damageRegion.Right - damageRegion.Left},{damageRegion.Bottom - damageRegion.Top}\n");
+//			System.Diagnostics.Debugger.Log(0, "debug", $"Region={damageRegion.Right - damageRegion.Left},{damageRegion.Bottom - damageRegion.Top}\n");
 			WindowsConsole.SmallRect.MakeEmpty (ref damageRegion);
 			WindowsConsole.SmallRect.MakeEmpty (ref damageRegion);
 		}
 		}
 
 

+ 4 - 2
Terminal.Gui/Terminal.Gui.csproj

@@ -10,7 +10,7 @@
   <PropertyGroup>
   <PropertyGroup>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <PackageId>Terminal.Gui</PackageId>
     <PackageId>Terminal.Gui</PackageId>
-    <PackageVersion>0.11</PackageVersion>
+    <PackageVersion>0.12</PackageVersion>
     <Authors>Miguel de Icaza</Authors>
     <Authors>Miguel de Icaza</Authors>
     <PackageLicenseUrl>https://github.com/migueldeicaza/gui.cs/blob/master/LICENSE</PackageLicenseUrl>
     <PackageLicenseUrl>https://github.com/migueldeicaza/gui.cs/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/migueldeicaza/gui.cs/</PackageProjectUrl>
     <PackageProjectUrl>https://github.com/migueldeicaza/gui.cs/</PackageProjectUrl>
@@ -19,7 +19,9 @@
     <Owners>Miguel de Icaza</Owners>
     <Owners>Miguel de Icaza</Owners>
     <Summary>Application framework for creating modern console applications using .NET </Summary>
     <Summary>Application framework for creating modern console applications using .NET </Summary>
     <Title>Gui.cs is a framework for creating console user interfaces</Title>
     <Title>Gui.cs is a framework for creating console user interfaces</Title>
-    <PackageReleaseNotes>0.11: Simplify TextField implementation, fixes a couple of editing bugs.
+    <PackageReleaseNotes>0.12: Fixes the text editor merge line command.
+
+0.11: Simplify TextField implementation, fixes a couple of editing bugs.
 
 
 0.10: Fix unicode rendering for TextField, and bring F# example
 0.10: Fix unicode rendering for TextField, and bring F# example
 
 

+ 1 - 0
Terminal.Gui/Views/TextView.cs

@@ -778,6 +778,7 @@ namespace Terminal.Gui {
 					var prevRow = model.GetLine (prowIdx);
 					var prevRow = model.GetLine (prowIdx);
 					var prevCount = prevRow.Count;
 					var prevCount = prevRow.Count;
 					model.GetLine (prowIdx).AddRange (GetCurrentLine ());
 					model.GetLine (prowIdx).AddRange (GetCurrentLine ());
+					model.RemoveLine (currentRow);
 					currentRow--;
 					currentRow--;
 					currentColumn = prevCount;
 					currentColumn = prevCount;
 					leftColumn = currentColumn - Frame.Width + 1;
 					leftColumn = currentColumn - Frame.Width + 1;