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

Use initializer syntax

Browse source
This commit is contained in:
John Lewin 2017-06-30 22:40:43 -07:00
parent 290eb8bedb
commit 2f13959f0e
2 changed files with 18 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PartPreviewWindow/ColorGradientWidget.cs
View file

@ -72,10 +72,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ColorToSpeedWidget colorToSpeedWidget = new ColorToSpeedWidget(colorWidget, feedRateToMMPerSecond);
this.AddChild(colorToSpeedWidget);
}
Margin = new BorderDouble(5, 5, 200, 50);
HAnchor |= Agg.UI.HAnchor.ParentLeft;
VAnchor = Agg.UI.VAnchor.ParentTop;
}
public class ColorToSpeedWidget : FlowLayoutWidget

50
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -112,14 +112,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.bedCenter = bedCenter;
this.windowMode = windowMode;
if (UserSettings.Instance.IsTouchScreen)
{
sliderWidth = 20;
}
else
{
sliderWidth = 10;
}
sliderWidth = (UserSettings.Instance.IsTouchScreen) ? 20 : 10;
RenderOpenGl.GLHelper.WireframeColor = ActiveTheme.Instance.PrimaryAccentColor;
@ -208,31 +201,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gcode2DWidget = null;
gcodeProcessingStateInfoText = null;
FlowLayoutWidget mainContainerTopToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
mainContainerTopToBottom.HAnchor = HAnchor.Max_FitToChildren_ParentWidth;
mainContainerTopToBottom.VAnchor = VAnchor.Max_FitToChildren_ParentHeight;
buttonBottomPanel = new FlowLayoutWidget(FlowDirection.LeftToRight);
buttonBottomPanel.HAnchor = HAnchor.ParentLeftRight;
buttonBottomPanel.Padding = new BorderDouble(3, 3);
buttonBottomPanel.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
layerSelectionButtonsPanel = new FlowLayoutWidget(FlowDirection.RightToLeft);
layerSelectionButtonsPanel.HAnchor = HAnchor.ParentLeftRight;
layerSelectionButtonsPanel.Padding = new BorderDouble(0);
GuiWidget holdPanelOpen = new GuiWidget(1, 40);
layerSelectionButtonsPanel.AddChild(holdPanelOpen);
if (windowMode == WindowMode.StandAlone)
var mainContainerTopToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
Button closeButton = buttonFactory.Generate("Close".Localize());
layerSelectionButtonsPanel.AddChild(closeButton);
closeButton.Click += (sender, e) =>
{
CloseOnIdle();
};
}
HAnchor = HAnchor.Max_FitToChildren_ParentWidth,
VAnchor = VAnchor.Max_FitToChildren_ParentHeight
};
buttonBottomPanel = new FlowLayoutWidget(FlowDirection.LeftToRight)
{
HAnchor = HAnchor.ParentLeftRight,
Padding = new BorderDouble(3, 3),
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor
};
layerSelectionButtonsPanel = new FlowLayoutWidget(FlowDirection.RightToLeft)
{
HAnchor = HAnchor.ParentLeftRight,
Padding = 0,
};
gcodeDisplayWidget = new GuiWidget()
{