fixed da bug; also fixed pwsh clipboard tests

This commit is contained in:
Tig Kindel
2023-02-24 20:31:04 +13:00
committed by BDisp
parent abf07fbbf9
commit 43221327ee
2 changed files with 5 additions and 5 deletions

View File

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

View File

@@ -159,8 +159,8 @@ else Assert.NotEqual (clipText, Clipboard.Contents);
output.WriteLine ($"Pasting to OS clipboard: {clipText}...");
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 ();
} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
@@ -231,8 +231,8 @@ else Assert.NotEqual (clipText, Clipboard.Contents);
output.WriteLine ($"Getting OS clipboard...");
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)) {
(exitCode, clipReadText) = ClipboardProcessRunner.Process ("pbpaste", "");