nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4932 from larsbrubaker/master

Browse source 
Fixing crash bug
This commit is contained in:
Lars Brubaker 2020-12-10 11:59:11 -08:00 • committed by GitHub
commit c0374c92e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

72
MatterControlLib/PrinterControls/TerminalWindow/TextScrollWidget.cs
View file

@ -120,7 +120,10 @@ namespace MatterHackers.MatterControl
if (!string.IsNullOrEmpty(line)) if (!string.IsNullOrEmpty(line))
{ {
visibleLines.Add(line); lock (locker)
{
visibleLines.Add(line);
}
return true; return true;
} }
@ -142,7 +145,10 @@ namespace MatterHackers.MatterControl
public void RebuildFilteredList() public void RebuildFilteredList()
{ {
visibleLines.Clear(); lock (locker)
{
visibleLines.Clear();
}
foreach (var lineData in terminalLog.AllTerminalLines()) foreach (var lineData in terminalLog.AllTerminalLines())
{ {
ConditionalyAddToVisible(lineData); ConditionalyAddToVisible(lineData);
@ -170,44 +176,41 @@ namespace MatterHackers.MatterControl
int numLinesToDraw = NumVisibleLines; int numLinesToDraw = NumVisibleLines;
double y = LocalBounds.Bottom + typeFacePrinter.TypeFaceStyle.EmSizeInPixels * numLinesToDraw; double y = LocalBounds.Bottom + typeFacePrinter.TypeFaceStyle.EmSizeInPixels * numLinesToDraw;
lock (visibleLines) lock (locker)
{ {
lock (locker) int startLineIndex = visibleLines.Count - numLinesToDraw;
if (forceStartLine != -1)
{ {
int startLineIndex = visibleLines.Count - numLinesToDraw; y = LocalBounds.Top;
if (forceStartLine != -1)
{
y = LocalBounds.Top;
if (forceStartLine > visibleLines.Count - numLinesToDraw) if (forceStartLine > visibleLines.Count - numLinesToDraw)
{
forceStartLine = -1;
}
else
{
// make sure we show all the lines we can
startLineIndex = Math.Min(forceStartLine, startLineIndex);
}
}
int endLineIndex = visibleLines.Count;
for (int lineIndex = startLineIndex; lineIndex < endLineIndex; lineIndex++)
{
if (lineIndex >= 0)
{
if (visibleLines[lineIndex] != null)
{ {
forceStartLine = -1; typeFacePrinter.Text = visibleLines[lineIndex];
} typeFacePrinter.Origin = new Vector2(bounds.Left + 2, y);
else typeFacePrinter.Render(graphics2D, TextColor);
{
// make sure we show all the lines we can
startLineIndex = Math.Min(forceStartLine, startLineIndex);
} }
} }
int endLineIndex = visibleLines.Count; y -= typeFacePrinter.TypeFaceStyle.EmSizeInPixels;
for (int lineIndex = startLineIndex; lineIndex < endLineIndex; lineIndex++) if (y < -typeFacePrinter.TypeFaceStyle.EmSizeInPixels)
{ {
if (lineIndex >= 0) break;
{
if (visibleLines[lineIndex] != null)
{
typeFacePrinter.Text = visibleLines[lineIndex];
typeFacePrinter.Origin = new Vector2(bounds.Left + 2, y);
typeFacePrinter.Render(graphics2D, TextColor);
}
}
y -= typeFacePrinter.TypeFaceStyle.EmSizeInPixels;
if (y < -typeFacePrinter.TypeFaceStyle.EmSizeInPixels)
{
break;
}
} }
} }
} }
@ -218,7 +221,8 @@ namespace MatterHackers.MatterControl
public override void OnMouseWheel(MouseEventArgs mouseEvent) public override void OnMouseWheel(MouseEventArgs mouseEvent)
{ {
base.OnMouseWheel(mouseEvent); base.OnMouseWheel(mouseEvent);
double scrollDelta = mouseEvent.WheelDelta / (visibleLines.Count * 60.0); var count = visibleLines.Count;
double scrollDelta = mouseEvent.WheelDelta / (count * 60.0);
if (scrollDelta < 0) // Rounding seems to favor scrolling up, compensating scroll down to feel as smooth if (scrollDelta < 0) // Rounding seems to favor scrolling up, compensating scroll down to feel as smooth
{ {
@ -226,7 +230,7 @@ namespace MatterHackers.MatterControl
} }
else if (Position0To1 == 0) // If we scroll up at the bottom get pop out from the "on screen" chunk else if (Position0To1 == 0) // If we scroll up at the bottom get pop out from the "on screen" chunk
{ {
scrollDelta = NumVisibleLines / (double)visibleLines.Count; scrollDelta = NumVisibleLines / (double)count;
} }
double newPos = Position0To1 + scrollDelta; double newPos = Position0To1 + scrollDelta;

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 7cb01f7eda7ceba8f5f31134173e893fc9f42ec7 Subproject commit de9c91f7986348b0b891c6614bf7af279e540cbc