Skip to content

correctly presenting progressbar when buffer scrolls and clearing at end #3362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzybkr merged 1 commit into from
Mar 19, 2017
+25 −14
Merged

correctly presenting progressbar when buffer scrolls and clearing at end #3362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,32 +91,43 @@ class ProgressPane

int rows = tempProgressRegion.GetLength(0);
int cols = tempProgressRegion.GetLength(1);
_location = _rawui.WindowPosition;

// We have to show the progress pane in the first column, as the screen buffer at any point might contain
// a CJK double-cell characters, which makes it impractical to try to find a position where the pane would
// not slice a character. Column 0 is the only place where we know for sure we can place the pane.

_location.X = 0;
_location.Y = Math.Min(_location.Y + 2, _bufSize.Height);

#if UNIX
// replace the saved region in the screen buffer with our progress display
_location = _rawui.CursorPosition;
_location.Y = _rawui.CursorPosition.Y;

//set the cursor position back to the beginning of the region to overwrite write-progress
//if the cursor is at the bottom, back it up to overwrite the previous write progress
if (_location.Y >= _rawui.BufferSize.Height - rows)
//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++)
Copy link
Contributor

@lzybkr lzybkr Mar 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In rare cases, there may be junk on the screen below the prompt. Maybe we should be writing out spaces to make sure it's clear.

Copy link
Member Author

@SteveL-MSFT SteveL-MSFT Mar 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there's junk, it'll get overwritten anyways with tempProgressRegion where every cell has a character including spaces

{
Console.Out.Write('\n');
if (_location.Y >= rows)
}
if (scrollRows > 0)
{
_location.Y -= scrollRows;
}

//create cleared region to clear progress bar later
_savedRegion = tempProgressRegion;
for(int row = 0; row < rows; row++)
{
for(int col = 0; col < cols; col++)
{
_location.Y -= rows;
_savedRegion[row, col].Character = ' ';
}
}

//put cursor back to where output should be
_rawui.CursorPosition = _location;
#else
_location = _rawui.WindowPosition;

// We have to show the progress pane in the first column, as the screen buffer at any point might contain
// a CJK double-cell characters, which makes it impractical to try to find a position where the pane would
// not slice a character. Column 0 is the only place where we know for sure we can place the pane.

_location.Y = Math.Min(_location.Y + 2, _bufSize.Height);

// Save off the current contents of the screen buffer in the region that we will occupy
_savedRegion =
_rawui.GetBufferContents(
Expand Down