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

Moved TextWidget.GlobalPointSizeScaleRatio -> GuiWidget.DeviceScale

Browse source 
Significantly improved the layout consistency when enlarging the device scale.
Created a DeviceMargin and DevicePadding on GuiWidget
Deleted dead code
Made many images have default larger disk sizes and scale in memory.
Made the menus have horizontal spacers rather than dashed lines
This commit is contained in:
Lars Brubaker 2016-05-06 17:56:27 -07:00
parent a225e69513
commit b51b38b249
62 changed files with 223 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -430,7 +430,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
buttonPanel.CloseAllChildren();
double oldWidth = textImageButtonFactory.FixedWidth;
textImageButtonFactory.FixedWidth = 44 * TextWidget.GlobalPointSizeScaleRatio;
textImageButtonFactory.FixedWidth = 44 * GuiWidget.DeviceScale;
FlowLayoutWidget modelInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
modelInfoContainer.HAnchor = HAnchor.ParentLeftRight;
@ -525,7 +525,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void AddLayerInfo(FlowLayoutWidget buttonPanel)
{
double oldWidth = textImageButtonFactory.FixedWidth;
textImageButtonFactory.FixedWidth = 44 * TextWidget.GlobalPointSizeScaleRatio;
textImageButtonFactory.FixedWidth = 44 * GuiWidget.DeviceScale;
FlowLayoutWidget layerInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
layerInfoContainer.HAnchor = HAnchor.ParentLeftRight;
@ -551,7 +551,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
buttonPanel.CloseAllChildren();
double oldWidth = textImageButtonFactory.FixedWidth;
textImageButtonFactory.FixedWidth = 44 * TextWidget.GlobalPointSizeScaleRatio;
textImageButtonFactory.FixedWidth = 44 * GuiWidget.DeviceScale;
FlowLayoutWidget layerInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
layerInfoContainer.HAnchor = HAnchor.ParentLeftRight;
@ -632,7 +632,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
CheckBox transparentExtrusion = new CheckBox(LocalizedString.Get("Transparent"), textColor: ActiveTheme.Instance.PrimaryTextColor)
{
Checked = gcodeViewWidget.TransparentExtrusion,
Margin = new BorderDouble(5, 0, 0, 0) * TextWidget.GlobalPointSizeScaleRatio,
Margin = new BorderDouble(5, 0, 0, 0),
HAnchor = HAnchor.ParentLeft,
};