maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix progress bar display when cursor not at left edge

Browse source 
Fix by saving the cursor position, displaying the progress, and restoring the cursor back to the original position so normal formatting (e.g. table output) can continue.

Closes #3453.
This commit is contained in:
Steve Lee 2017-03-31 11:38:01 -07:00 committed by Jason Shirk
parent 544e466e15
commit 2cfe3d57a6
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
View file

@ -91,11 +91,20 @@ namespace Microsoft.PowerShell
int rows = tempProgressRegion.GetLength(0);
int cols = tempProgressRegion.GetLength(1);
_savedCursor = _rawui.CursorPosition;
_location.X = 0;
#if UNIX
_location.Y = _rawui.CursorPosition.Y;
// if cursor is not on left edge already move down one line
if (_rawui.CursorPosition.X != 0)
{
_location.Y++;
_rawui.CursorPosition = _location;
}
//if the cursor is at the bottom, create screen buffer space by scrolling
int scrollRows = rows - ((_rawui.BufferSize.Height - 1) - _location.Y);
for (int i = 0; i < rows; i++)
@ -105,6 +114,7 @@ namespace Microsoft.PowerShell
if (scrollRows > 0)
{
_location.Y -= scrollRows;
_savedCursor.Y -= scrollRows;
}
//create cleared region to clear progress bar later
@ -161,6 +171,7 @@ namespace Microsoft.PowerShell
_rawui.SetBufferContents(_location, _savedRegion);
_savedRegion = null;
_rawui.CursorPosition = _savedCursor;
}
}
@ -249,6 +260,7 @@ namespace Microsoft.PowerShell
private Coordinates _location = new Coordinates(0, 0);
private Coordinates _savedCursor;
private Size _bufSize;
private BufferCell[,] _savedRegion;
private BufferCell[,] _progressRegion;