From f6cf34eac7c28c7a6f957ea0e6e80233a0659fe7 Mon Sep 17 00:00:00 2001
From: LarsBrubaker <larsbrubaker@gmail.com>
Date: Thu, 13 Aug 2020 11:17:48 -0700
Subject: [PATCH] Make the add printer page scale correctly

issue: MatterHackers/MCCentral#6000
add printer screen is small when in hi-rez
---
 MatterControlLib/Library/Widgets/HardwareTreeView.cs        | 2 +-
 .../PrinterConnections/SetupStepMakeModelName.cs            | 5 +----
 MatterControlLib/SettingsManagement/OemSettings.cs          | 6 ++++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/MatterControlLib/Library/Widgets/HardwareTreeView.cs b/MatterControlLib/Library/Widgets/HardwareTreeView.cs
index 4780324bf..789a1c652 100644
--- a/MatterControlLib/Library/Widgets/HardwareTreeView.cs
+++ b/MatterControlLib/Library/Widgets/HardwareTreeView.cs
@@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
 			};
 			printersNode.TreeView = this;
 
-			var forcedHeight = 20;
+			var forcedHeight = 20 * GuiWidget.DeviceScale;
 			var mainRow = printersNode.Children.FirstOrDefault();
 			mainRow.HAnchor = HAnchor.Stretch;
 			mainRow.AddChild(new HorizontalSpacer());
diff --git a/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
index 1079ceedc..f594b770c 100644
--- a/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
+++ b/MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
@@ -43,7 +43,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 	{
 		private TextButton nextButton;
 		private AddPrinterWidget printerPanel;
-		private bool usingDefaultName;
 
 		private static BorderDouble elementMargin = new BorderDouble(top: 3);
 
@@ -55,7 +54,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			bool userIsLoggedIn = !ApplicationController.GuestUserActive?.Invoke() ?? false;
 
 			this.HeaderText = this.WindowTitle = "Printer Setup".Localize();
-			this.WindowSize = new VectorMath.Vector2(800, 600);
+			this.WindowSize = new VectorMath.Vector2(800 * GuiWidget.DeviceScale, 600 * GuiWidget.DeviceScale);
 
 			contentRow.BackgroundColor = theme.SectionBackgroundColor;
 			nextButton = theme.CreateDialogButton("Next".Localize());
@@ -143,8 +142,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 
 			this.AddPageAction(nextButton);
 
-			usingDefaultName = true;
-
 			SetElementVisibility();
 		}
 
diff --git a/MatterControlLib/SettingsManagement/OemSettings.cs b/MatterControlLib/SettingsManagement/OemSettings.cs
index 5ae1c5ba2..7bd7b3bba 100644
--- a/MatterControlLib/SettingsManagement/OemSettings.cs
+++ b/MatterControlLib/SettingsManagement/OemSettings.cs
@@ -35,6 +35,7 @@ using System.Threading.Tasks;
 using MatterHackers.Agg;
 using MatterHackers.Agg.Image;
 using MatterHackers.Agg.Platform;
+using MatterHackers.Agg.UI;
 using MatterHackers.MatterControl.SlicerConfiguration;
 using Newtonsoft.Json;
 
@@ -76,13 +77,14 @@ namespace MatterHackers.MatterControl.SettingsManagement
 
 		public ImageBuffer GetIcon(string oemName)
 		{
-			var imageBuffer = new ImageBuffer(16, 16);
+			var size = (int)(16 * GuiWidget.DeviceScale);
+			var imageBuffer = new ImageBuffer(size, size);
 
 			string oemUrl = ApplicationController.Instance.GetFavIconUrl(oemName);
 
 			if (!string.IsNullOrWhiteSpace(oemUrl))
 			{
-				WebCache.RetrieveImageAsync(imageBuffer, oemUrl, scaleToImageX: false);
+				WebCache.RetrieveImageAsync(imageBuffer, oemUrl, scaleToImageX: true);
 			}
 			else
 			{