Skip to content

Commit

Permalink
Fix progress bar display when cursor not at left edge
Browse files Browse the repository at this point in the history
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 PowerShell#3453.
  • Loading branch information
SteveL-MSFT authored and lzybkr committed Mar 31, 2017
1 parent 544e466 commit 2cfe3d5
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,20 @@ class ProgressPane

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++)
Expand All @@ -105,6 +114,7 @@ class ProgressPane
if (scrollRows > 0)
{
_location.Y -= scrollRows;
_savedCursor.Y -= scrollRows;
}

//create cleared region to clear progress bar later
Expand Down Expand Up @@ -161,6 +171,7 @@ class ProgressPane

_rawui.SetBufferContents(_location, _savedRegion);
_savedRegion = null;
_rawui.CursorPosition = _savedCursor;
}
}

Expand Down Expand Up @@ -249,6 +260,7 @@ class ProgressPane


private Coordinates _location = new Coordinates(0, 0);
private Coordinates _savedCursor;
private Size _bufSize;
private BufferCell[,] _savedRegion;
private BufferCell[,] _progressRegion;
Expand Down

0 comments on commit 2cfe3d5

Please sign in to comment.