From a5009558f63952ffbf69a04cb4e2cc1f4d56c098 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 16 Aug 2020 12:12:24 -0700 Subject: [PATCH] Fixing scaling issues --- MatterControlLib/EeProm/EePromMarlinWindow.cs | 2 +- .../PrinterControls/ControlWidgets/FanControlsRow.cs | 2 +- MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs | 2 +- MatterControlLib/PrinterControls/MovementSpeedsPage.cs | 2 +- MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs | 3 --- Submodules/agg-sharp | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/MatterControlLib/EeProm/EePromMarlinWindow.cs b/MatterControlLib/EeProm/EePromMarlinWindow.cs index 633833850..c2f42e9eb 100644 --- a/MatterControlLib/EeProm/EePromMarlinWindow.cs +++ b/MatterControlLib/EeProm/EePromMarlinWindow.cs @@ -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, diff --git a/MatterControlLib/PrinterControls/ControlWidgets/FanControlsRow.cs b/MatterControlLib/PrinterControls/ControlWidgets/FanControlsRow.cs index 66b4b21fe..6381ad02b 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/FanControlsRow.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/FanControlsRow.cs @@ -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, diff --git a/MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs b/MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs index 596d06d48..fb9b91c20 100644 --- a/MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs +++ b/MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs @@ -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}" }; diff --git a/MatterControlLib/PrinterControls/MovementSpeedsPage.cs b/MatterControlLib/PrinterControls/MovementSpeedsPage.cs index f6142f258..661859cf4 100644 --- a/MatterControlLib/PrinterControls/MovementSpeedsPage.cs +++ b/MatterControlLib/PrinterControls/MovementSpeedsPage.cs @@ -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 }; diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs index f10604371..81183c2e8 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs @@ -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; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index b9327e84f..6f3ac0155 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit b9327e84ffd0338f59ccebb61a46629811fb478e +Subproject commit 6f3ac0155a72b28c396421cd4cc8d0b0a10aa73a