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

Cleaning up icon scaling issues

Browse source
This commit is contained in:
LarsBrubaker 2020-08-05 10:07:40 -07:00
parent 9df2078d0d
commit 7ac7a295f2
11 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MatterControlLib/AboutPage/AboutPage.cs
View file

@ -89,18 +89,7 @@ namespace MatterHackers.MatterControl
altHeadingRow.AddChild(spinnerPanel);
var accentColor = theme.PrimaryAccentColor;
var spinner = new LogoSpinner(spinnerPanel, 4, 0.2, 0, rotateX: 0)
{
/*
MeshColor = new Color(175, 175, 175, 255),
AmbientColor = new float[]
{
accentColor.Red0To1,
accentColor.Green0To1,
accentColor.Blue0To1,
0
}*/
};
var spinner = new LogoSpinner(spinnerPanel, 4, 0.2, 0, rotateX: 0);
productInfo.AddChild(
new TextWidget("Version".Localize() + " " + VersionInfo.Instance.BuildVersion, textColor: theme.TextColor, pointSize: theme.DefaultFontSize)

4
MatterControlLib/ApplicationView/Application.cs
View file

@ -150,8 +150,8 @@ namespace MatterHackers.MatterControl
{
FillColor = mutedAccentColor,
BorderColor = Color.Gray, // theme.BorderColor75,
Height = 11,
Width = 230,
Height = 11 * GuiWidget.DeviceScale,
Width = 230 * GuiWidget.DeviceScale,
HAnchor = HAnchor.Center,
VAnchor = VAnchor.Absolute
});

2
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/LoadFilamentWizard.cs
View file

@ -257,7 +257,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
var progressBar = new ProgressBar(150 * GuiWidget.DeviceScale, 15 * GuiWidget.DeviceScale)
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,

2
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/UnloadFilamentWizard.cs
View file

@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
var progressBar = new ProgressBar(150 * GuiWidget.DeviceScale, 15 * GuiWidget.DeviceScale)
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,

4
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
View file

@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
});
// put in the progress bar
var hotEndProgressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
var hotEndProgressBar = new ProgressBar(150 * GuiWidget.DeviceScale, 15 * GuiWidget.DeviceScale)
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,
@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
});
// put in progress bar
bedProgressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
bedProgressBar = new ProgressBar(150 * GuiWidget.DeviceScale, 15 * GuiWidget.DeviceScale)
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,

2
MatterControlLib/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.AddChild(extruderName);
progressBar = new ProgressBar(200, 6)
progressBar = new ProgressBar(200 * GuiWidget.DeviceScale, 6 * GuiWidget.DeviceScale)
{
FillColor = theme.PrimaryAccentColor,
Margin = new BorderDouble(right: 10),

4
MatterControlLib/Library/Providers/GitHub/GitHubContainer.cs
View file

@ -105,8 +105,8 @@ namespace MatterHackers.MatterControl.Library
AddCromeHeaders(request);
// parse result
HttpResponseMessage response = await client.SendAsync(request);
string jsonStr = await response.Content.ReadAsStringAsync();
HttpResponseMessage response = client.SendAsync(request).Result;
string jsonStr = response.Content.ReadAsStringAsync().Result;
response.Dispose();
FileInfo[] dirContents = JsonConvert.DeserializeObject<FileInfo[]>(jsonStr);

2
MatterControlLib/PartPreviewWindow/RunningTaskRow.cs
View file

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
progressBar = new ProgressBar()
{
HAnchor = HAnchor.Stretch,
Height = 2,
Height = 2 * GuiWidget.DeviceScale,
VAnchor = VAnchor.Absolute | VAnchor.Bottom,
FillColor = theme.PrimaryAccentColor,
BorderColor = Color.Transparent,

2
MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs
View file

@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Absolute | VAnchor.Center,
Height = 2,
Height = 2 * GuiWidget.DeviceScale,
FillColor = theme.PrimaryAccentColor,
BorderColor = Color.Transparent,
Margin = new BorderDouble(left: 16, bottom: 3, top: 15)

2
MatterControlLib/PartPreviewWindow/View3D/DragDropLoadProgress.cs
View file

@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.TrackingObject = trackingObject;
this.view3DWidget = view3DWidget;
view3DWidget.AfterDraw += View3DWidget_AfterDraw;
progressBar = new ProgressBar(80, 15)
progressBar = new ProgressBar(80 * GuiWidget.DeviceScale, 15 * GuiWidget.DeviceScale)
{
FillColor = theme.PrimaryAccentColor,
};