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

Fixing scaling issues

Browse source
This commit is contained in:
LarsBrubaker 2020-08-16 12:12:24 -07:00
parent bbdfe12506
commit a5009558f6
6 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/EeProm/EePromMarlinWindow.cs
View file

@ -249,7 +249,7 @@ namespace MatterHackers.MatterControl.EeProm
private GuiWidget CreateMHNumEdit(ref MHNumberEdit numberEditToCreate)
{
numberEditToCreate = new MHNumberEdit(0, theme, pixelWidth: 80, allowNegatives: true, allowDecimals: true)
numberEditToCreate = new MHNumberEdit(0, theme, pixelWidth: 80 * GuiWidget.DeviceScale, allowNegatives: true, allowDecimals: true)
{
SelectAllOnFocus = true,
VAnchor = VAnchor.Center,

2
MatterControlLib/PrinterControls/ControlWidgets/FanControlsRow.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PrinterControls
this.AddChild(container);
this.BorderColor = Color.Transparent;
fanSpeedDisplay = new MHNumberEdit(0, theme, minValue: 0, maxValue: 100, pixelWidth: 30)
fanSpeedDisplay = new MHNumberEdit(0, theme, minValue: 0, maxValue: 100, pixelWidth: 30 * GuiWidget.DeviceScale)
{
Value = printer.Connection.GetFanSpeed0To255(fanIndex) * 100 / 255,
VAnchor = VAnchor.Center | VAnchor.Fit,

2
MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs
View file

@ -116,7 +116,7 @@ namespace MatterHackers.MatterControl
int linkCompatibleRow = row;
int linkCompatibleAxis = axis;
MHNumberEdit valueEdit = new MHNumberEdit(positions[linkCompatibleRow][linkCompatibleAxis], theme, allowNegatives: true, allowDecimals: true, pixelWidth: 60, tabIndex: tab_index++)
MHNumberEdit valueEdit = new MHNumberEdit(positions[linkCompatibleRow][linkCompatibleAxis], theme, allowNegatives: true, allowDecimals: true, pixelWidth: 60 * GuiWidget.DeviceScale, tabIndex: tab_index++)
{
Name = $"{axisName} Position {row}"
};

2
MatterControlLib/PrinterControls/MovementSpeedsPage.cs
View file

@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl
movementSpeed = movementSpeed / 60.0; // Convert from mm/min to mm/s
}
var valueEdit = new MHNumberEdit(movementSpeed, theme, minValue: 0, pixelWidth: 60, tabIndex: tab_index++, allowDecimals: true)
var valueEdit = new MHNumberEdit(movementSpeed, theme, minValue: 0, pixelWidth: 60 * GuiWidget.DeviceScale, tabIndex: tab_index++, allowDecimals: true)
{
Margin = 3
};

3
MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs
View file

@ -10,9 +10,6 @@ using Markdig.Helpers;
using Markdig.Renderers.Agg;
using Markdig.Renderers.Agg.Inlines;
using Markdig.Syntax;
using MatterHackers.Agg;
using MatterHackers.Agg.Font;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl;

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit b9327e84ffd0338f59ccebb61a46629811fb478e
Subproject commit 6f3ac0155a72b28c396421cd4cc8d0b0a10aa73a