浏览代码

fixed da bug; also fixed pwsh clipboard tests

Tig Kindel 2 年之前
父节点
当前提交
121941497e
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      Terminal.Gui/Core/View.cs
  2. 4 4
      UnitTests/Drivers/ClipboardTests.cs

+ 1 - 1
Terminal.Gui/Core/View.cs

@@ -2206,7 +2206,7 @@ namespace Terminal.Gui {
 					if (dim == null) {
 					if (dim == null) {
 						newDimension = AutoSize ? autosizeDimension : superviewDimension;
 						newDimension = AutoSize ? autosizeDimension : superviewDimension;
 					} else {
 					} else {
-						newDimension = width.Anchor (superviewDimension);
+						newDimension = dim.Anchor (superviewDimension);
 						newDimension = AutoSize && autosizeDimension > newDimension ? autosizeDimension : newDimension;
 						newDimension = AutoSize && autosizeDimension > newDimension ? autosizeDimension : newDimension;
 					}
 					}
 					newLocation = pos.Anchor (superviewDimension - newDimension);
 					newLocation = pos.Anchor (superviewDimension - newDimension);

+ 4 - 4
UnitTests/Drivers/ClipboardTests.cs

@@ -159,8 +159,8 @@ else 				Assert.NotEqual (clipText, Clipboard.Contents);
 				output.WriteLine ($"Pasting to OS clipboard: {clipText}...");
 				output.WriteLine ($"Pasting to OS clipboard: {clipText}...");
 
 
 				if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) {
 				if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) {
-					(exitCode, result) = ClipboardProcessRunner.Process ("pwsh", $"-command \"Set-Clipboard -Value \\\"{clipText}\\\"\"");
-					output.WriteLine ($"  Windows: pwsh Set-Clipboard: exitCode = {exitCode}, result = {result}");
+					(exitCode, result) = ClipboardProcessRunner.Process ("powershell.exe", $"-command \"Set-Clipboard -Value \\\"{clipText}\\\"\"");
+					output.WriteLine ($"  Windows: powershell.exe Set-Clipboard: exitCode = {exitCode}, result = {result}");
 					getClipText = Clipboard.Contents.ToString ();
 					getClipText = Clipboard.Contents.ToString ();
 
 
 				} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
 				} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
@@ -231,8 +231,8 @@ else 				Assert.NotEqual (clipText, Clipboard.Contents);
 				output.WriteLine ($"Getting OS clipboard...");
 				output.WriteLine ($"Getting OS clipboard...");
 
 
 				if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) {
 				if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) {
-					(exitCode, clipReadText) = ClipboardProcessRunner.Process ("pwsh", "-noprofile -command \"Get-Clipboard\"");
-					output.WriteLine ($"  Windows: pwsh Get-Clipboard: exitCode = {exitCode}, result = {clipReadText}");
+					(exitCode, clipReadText) = ClipboardProcessRunner.Process ("powershell.exe", "-noprofile -command \"Get-Clipboard\"");
+					output.WriteLine ($"  Windows: powershell.exe Get-Clipboard: exitCode = {exitCode}, result = {clipReadText}");
 
 
 				} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
 				} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
 					(exitCode, clipReadText) = ClipboardProcessRunner.Process ("pbpaste", "");
 					(exitCode, clipReadText) = ClipboardProcessRunner.Process ("pbpaste", "");