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

Make the add printer page scale correctly

Browse source 
issue: MatterHackers/MCCentral#6000
add printer screen is small when in hi-rez
This commit is contained in:
LarsBrubaker 2020-08-13 11:17:48 -07:00
parent d8375572ba
commit f6cf34eac7
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/Library/Widgets/HardwareTreeView.cs
View file

@ -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());

5
MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -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();
}

6
MatterControlLib/SettingsManagement/OemSettings.cs
View file

@ -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
{