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

Fix line rendering quirks

Browse source
This commit is contained in:
John Lewin 2019-02-17 23:03:27 -08:00 • committed by jlewin
parent ecaaabcc92
commit 5709caff91
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/CustomWidgets/CalibrationLine.cs
View file

@ -131,7 +131,7 @@ namespace MatterHackers.MatterControl
{
graphics2D.Render(
glyph,
verticalLine ? new Vector2(this.LocalBounds.XCenter, 11) : new Vector2(this.Width - 11, this.LocalBounds.YCenter),
verticalLine ? new Vector2(centerX, 11) : new Vector2(this.Width - 11, centerY),
theme.TextColor);
}

8
MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs
View file

@ -55,11 +55,15 @@ namespace MatterHackers.MatterControl
contentRow.AddChild(new TextWidget("Printing Guide...".Localize(), pointSize: theme.DefaultFontSize, textColor: theme.TextColor));
contentRow.AddChild(xOffsetWidget = new NozzleOffsetTemplateWidget(templatePrinter.ActiveOffsets, FlowDirection.LeftToRight, theme));
contentRow.AddChild(xOffsetWidget = new NozzleOffsetTemplateWidget(templatePrinter.ActiveOffsets, FlowDirection.LeftToRight, theme)
{
Padding = new BorderDouble(left: 4)
});
contentRow.AddChild(yOffsetWidget = new NozzleOffsetTemplateWidget(templatePrinter.ActiveOffsets, FlowDirection.TopToBottom, theme)
{
Margin = new BorderDouble(top: 15)
Margin = new BorderDouble(top: 15),
Padding = new BorderDouble(top: 4)
});
this.NextButton.Enabled = false;

4
MatterControlLib/CustomWidgets/NozzleOffsetTemplateWidget.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl
{
var calibrationLine = new CalibrationLine(direction, (i % 5 == 0) ? i : -1, theme)
{
Margin = 1,
// Margin = 1,
IsNegative = i < 20,
OffsetIndex = i,
};
@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl
rect = new RectangleDouble(0, 0, this.LocalBounds.Width - 20, this.LocalBounds.Height);
}
rect.Inflate(-2);
rect.Inflate(-1);
var center = rect.Center;