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

Refactoring VAnchor and HAnchore names

Browse source 
Making more debug info for show bounds
This commit is contained in:
Lars Brubaker 2017-08-07 15:47:27 -07:00
parent 0e641e98b9
commit f7d4163125
113 changed files with 865 additions and 859 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PartPreviewWindow/ColorGradientWidget.cs
View file

@ -88,14 +88,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
TextWidget speedTextBox = new TextWidget(layerSpeed, pointSize: 12);
speedTextBox.TextColor = RGBA_Bytes.White;
speedTextBox.VAnchor = VAnchor.ParentCenter;
speedTextBox.VAnchor = VAnchor.Center;
speedTextBox.Margin = new BorderDouble(5, 0);
this.AddChild(colorWidget);
this.AddChild(new HorizontalSpacer());
this.AddChild(speedTextBox);
this.HAnchor |= HAnchor.ParentLeftRight;
this.HAnchor |= HAnchor.Stretch;
}
}
}

4
PartPreviewWindow/GCodeDetailsView.cs
View file

@ -77,8 +77,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
conditionalCostPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.FitToChildren,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Visible = gcodeDetails.TotalCost > 0
};

8
PartPreviewWindow/OverflowDropdown.cs
View file

@ -63,11 +63,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
return new MenuItem(new GuiWidget()
{
HAnchor = HAnchor.ParentLeftRight,
HAnchor = HAnchor.Stretch,
Height = 1,
BackgroundColor = RGBA_Bytes.LightGray,
Margin = new BorderDouble(10, 1),
VAnchor = VAnchor.ParentCenter,
VAnchor = VAnchor.Center,
}, "HorizontalLine");
}
@ -116,8 +116,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public PopupButton(GuiWidget buttonView)
{
this.Margin = 3;
this.HAnchor = HAnchor.FitToChildren;
this.VAnchor = VAnchor.FitToChildren;
this.HAnchor = HAnchor.Fit;
this.VAnchor = VAnchor.Fit;
this.buttonView = buttonView;
this.AddChild(buttonView);

16
PartPreviewWindow/PlusTabPage.cs
View file

@ -44,8 +44,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
: base(FlowDirection.TopToBottom)
{
this.Name = "+";
this.HAnchor = HAnchor.ParentLeftRight;
this.VAnchor = VAnchor.ParentBottomTop;
this.HAnchor = HAnchor.Stretch;
this.VAnchor = VAnchor.Stretch;
this.Padding = 20;
var theme = ApplicationController.Instance.Theme;
@ -57,12 +57,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var createPart = theme.ButtonFactory.Generate("Create Part".Localize());
createPart.Margin = buttonSpacing;
createPart.HAnchor = HAnchor.ParentLeft;
createPart.HAnchor = HAnchor.Left;
createItemsSection.AddChild(createPart);
var createPrinter = theme.ButtonFactory.Generate("Create Printer".Localize());
createPrinter.Margin = buttonSpacing;
createPrinter.HAnchor = HAnchor.ParentLeft;
createPrinter.HAnchor = HAnchor.Left;
createPrinter.Click += (s, e) =>
{
if (PrinterConnection.Instance.PrinterIsPrinting
@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var redeemDesignCode = theme.ButtonFactory.Generate("Redeem Design Code".Localize());
redeemDesignCode.Margin = buttonSpacing;
redeemDesignCode.HAnchor = HAnchor.ParentLeft;
redeemDesignCode.HAnchor = HAnchor.Left;
redeemDesignCode.Click += (s, e) =>
{
// Implementation already does RunOnIdle
@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var redeemShareCode = theme.ButtonFactory.Generate("Enter Share Code".Localize());
redeemShareCode.Margin = buttonSpacing;
redeemShareCode.HAnchor = HAnchor.ParentLeft;
redeemShareCode.HAnchor = HAnchor.Left;
redeemShareCode.Click += (s, e) =>
{
// Implementation already does RunOnIdle
@ -151,8 +151,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Add container
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.FitToChildren,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Margin = new BorderDouble(10, 10, 10, 8),
};
this.AddChild(container);

10
PartPreviewWindow/PrinterTabPage.cs
View file

@ -83,8 +83,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
viewControls3D = new ViewControls3D(ApplicationController.Instance.Theme.ViewControlsButtonFactory)
{
PartSelectVisible = false,
VAnchor = VAnchor.ParentTop | VAnchor.FitToChildren | VAnchor.AbsolutePosition,
HAnchor = HAnchor.ParentLeft | HAnchor.FitToChildren,
VAnchor = VAnchor.Top | VAnchor.Fit | VAnchor.Absolute,
HAnchor = HAnchor.Left | HAnchor.Fit,
Visible = true,
Margin = new BorderDouble(11, 0, 0, 50)
};
@ -381,7 +381,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
sideBar.AddPage("Controls".Localize(), new ManualPrinterControls());
var terminalControls = new TerminalControls();
terminalControls.VAnchor |= VAnchor.ParentBottomTop;
terminalControls.VAnchor |= VAnchor.Stretch;
sideBar.AddPage("Terminal".Localize(), terminalControls);
}
@ -532,7 +532,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var popupContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.ParentLeftRight,
HAnchor = HAnchor.Stretch,
Padding = 12,
BackgroundColor = RGBA_Bytes.White
};
@ -590,7 +590,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
Checked = gcodeOptions.TransparentExtrusion,
Margin = new BorderDouble(5, 0, 0, 0),
HAnchor = HAnchor.ParentLeft,
HAnchor = HAnchor.Left,
};
transparentExtrusion.CheckedStateChanged += (sender, e) =>
{

20
PartPreviewWindow/SaveAsWindow.cs
View file

@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl
// Creates Header
FlowLayoutWidget headerRow = new FlowLayoutWidget(FlowDirection.LeftToRight)
{
HAnchor = HAnchor.ParentLeftRight,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(0, 3, 0, 0),
Padding = new BorderDouble(0, 3, 0, 3)
};
@ -80,8 +80,8 @@ namespace MatterHackers.MatterControl
TextWidget elementHeader = new TextWidget("Save New Design".Localize() + ":", pointSize: 14)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
HAnchor = HAnchor.ParentLeftRight,
VAnchor = Agg.UI.VAnchor.ParentBottom
HAnchor = HAnchor.Stretch,
VAnchor = Agg.UI.VAnchor.Bottom
};
headerRow.AddChild(elementHeader);
@ -90,8 +90,8 @@ namespace MatterHackers.MatterControl
//Creates container in the middle of window
FlowLayoutWidget middleRowContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.ParentBottomTop,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch,
Padding = new BorderDouble(5),
BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor
};
@ -120,8 +120,8 @@ namespace MatterHackers.MatterControl
// Adds text box and check box to the above container
GuiWidget chooseWindow = new GuiWidget(10, 30)
{
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.ParentBottomTop,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch,
Margin = new BorderDouble(5),
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor,
Padding = new BorderDouble(3),
@ -136,13 +136,13 @@ namespace MatterHackers.MatterControl
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
Margin = new BorderDouble(5),
HAnchor = HAnchor.ParentLeft
HAnchor = HAnchor.Left
};
//Adds text box and check box to the above container
textToAddWidget = new MHTextEditWidget("", pixelWidth: 300, messageWhenEmptyAndNotSelected: "Enter a Design Name Here".Localize())
{
HAnchor = HAnchor.ParentLeftRight,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(5)
};
textToAddWidget.ActualTextEditWidget.EnterPressed += new KeyEventHandler(ActualTextEditWidget_EnterPressed);
@ -158,7 +158,7 @@ namespace MatterHackers.MatterControl
FlowLayoutWidget buttonRow = new FlowLayoutWidget(FlowDirection.LeftToRight);
{
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
buttonRow.HAnchor = HAnchor.ParentLeftRight;
buttonRow.HAnchor = HAnchor.Stretch;
buttonRow.Padding = new BorderDouble(0, 3);
}

4
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -42,8 +42,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public SelectedObjectPanel() : base(FlowDirection.TopToBottom)
{
HAnchor |= HAnchor.ParentRight;
VAnchor = VAnchor.ParentTop | VAnchor.FitToChildren;
HAnchor |= HAnchor.Right;
VAnchor = VAnchor.Top | VAnchor.Fit;
}
}
}

4
PartPreviewWindow/View3D/GeneralObject3DEditor.cs
View file

@ -72,8 +72,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
AlignToRightEdge = true,
PopupContent = new ColorSwatchSelector(item, view3DWidget, ApplicationController.Instance.Theme.MenuButtonFactory)
{
HAnchor = HAnchor.FitToChildren,
VAnchor = VAnchor.FitToChildren,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
BackgroundColor = RGBA_Bytes.White
},
Margin = buttonMargin

2
PartPreviewWindow/View3D/GridOptionsPanel.cs
View file

@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public GridOptionsPanel(InteractionLayer interactionLayer) : base(FlowDirection.TopToBottom)
{
this.HAnchor = HAnchor.ParentLeftRight;
this.HAnchor = HAnchor.Stretch;
this.Padding = 10;
this.AddChild(new TextWidget("Snap Grid".Localize())

12
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -667,7 +667,7 @@ namespace MatterHackers.MeshVisualizer
for (int i = 0; i < 3; i++)
{
GLHelper.Render3DLineNoPrep(frustum, World, transformed1, transformed2, RGBA_Bytes.White, 15);
GLHelper.Render3DLineNoPrep(frustum, World, transformed1, transformed2, RGBA_Bytes.White, 5);
}
}
}
@ -770,7 +770,7 @@ namespace MatterHackers.MeshVisualizer
: base(FlowDirection.TopToBottom)
{
progressControl = new ProgressControl("", RGBA_Bytes.Black, RGBA_Bytes.Black);
progressControl.HAnchor = HAnchor.ParentCenter;
progressControl.HAnchor = HAnchor.Center;
AddChild(progressControl);
progressControl.Visible = false;
progressControl.ProgressChanged += (sender, e) =>
@ -779,17 +779,17 @@ namespace MatterHackers.MeshVisualizer
};
centeredInfoText = new TextWidget(startingTextMessage);
centeredInfoText.HAnchor = HAnchor.ParentCenter;
centeredInfoText.HAnchor = HAnchor.Center;
centeredInfoText.AutoExpandBoundsToText = true;
AddChild(centeredInfoText);
centeredInfoDescription = new TextWidget("");
centeredInfoDescription.HAnchor = HAnchor.ParentCenter;
centeredInfoDescription.HAnchor = HAnchor.Center;
centeredInfoDescription.AutoExpandBoundsToText = true;
AddChild(centeredInfoDescription);
VAnchor |= VAnchor.ParentCenter;
HAnchor |= HAnchor.ParentCenter;
VAnchor |= VAnchor.Center;
HAnchor |= HAnchor.Center;
}
}
}

12
PartPreviewWindow/View3D/PrinterActionsBar.cs
View file

@ -88,8 +88,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
sliceProgressReporter = new SliceProgressReporter(modelViewer.meshViewerWidget);
this.HAnchor = HAnchor.ParentLeftRight;
this.VAnchor = VAnchor.FitToChildren;
this.HAnchor = HAnchor.Stretch;
this.VAnchor = VAnchor.Fit;
this.AddChild(new PrinterConnectButton(buttonFactory, defaultMargin));
@ -171,7 +171,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
undoBuffer.Undo();
};
this.AddChild(undoButton);
undoButton.VAnchor = VAnchor.ParentCenter;
undoButton.VAnchor = VAnchor.Center;
Button redoButton = smallMarginFactory.Generate("", StaticData.Instance.LoadIcon("Redo_grey_16x.png", 16, 16));
redoButton.Name = "3D View Redo";
@ -182,7 +182,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
undoBuffer.Redo();
};
this.AddChild(redoButton);
redoButton.VAnchor = VAnchor.ParentCenter;
redoButton.VAnchor = VAnchor.Center;
undoBuffer.Changed += (sender, e) =>
{
@ -220,8 +220,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var widgetToPop = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.FitToChildren,
VAnchor = VAnchor.FitToChildren,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
};
var menuActions = new NamedAction[]

2
PartPreviewWindow/View3D/SideBar/MirrorControls.cs
View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
List<GuiWidget> mirrorControls = new List<GuiWidget>();
FlowLayoutWidget buttonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
buttonContainer.HAnchor = HAnchor.FitToChildren;
buttonContainer.HAnchor = HAnchor.Fit;
Button mirrorXButton = buttonFactory.Generate("X", centerText: true);
buttonContainer.AddChild(mirrorXButton);

22
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -176,8 +176,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var mainContainerTopToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Max_FitToChildren_ParentWidth,
VAnchor = VAnchor.Max_FitToChildren_ParentHeight
HAnchor = HAnchor.MaxFitOrStretch,
VAnchor = VAnchor.MaxFitOrStretch
};
var smallMarginButtonFactory = ApplicationController.Instance.Theme.SmallMarginButtonFactory;
@ -203,7 +203,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var buttonBottomPanel = new FlowLayoutWidget(FlowDirection.LeftToRight)
{
HAnchor = HAnchor.ParentLeftRight,
HAnchor = HAnchor.Stretch,
Padding = 3,
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor,
};
@ -232,11 +232,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// add in the plater tools
{
selectionActionBar = new FlowLayoutWidget();
selectionActionBar.VAnchor |= VAnchor.ParentCenter;
selectionActionBar.VAnchor |= VAnchor.Center;
processingProgressControl = new ProgressControl("", ActiveTheme.Instance.PrimaryTextColor, ActiveTheme.Instance.PrimaryAccentColor)
{
VAnchor = VAnchor.ParentCenter,
VAnchor = VAnchor.Center,
Visible = false
};
@ -1485,8 +1485,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
FlowLayoutWidget buttonPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
VAnchor = VAnchor.FitToChildren,
HAnchor = HAnchor.FitToChildren,
VAnchor = VAnchor.Fit,
HAnchor = HAnchor.Fit,
BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor,
Padding = 15
};
@ -1496,7 +1496,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
for (int extruderIndex = 0; extruderIndex < extruderCount; extruderIndex++)
{
FlowLayoutWidget colorSelectionContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
colorSelectionContainer.HAnchor = HAnchor.FitToChildren;
colorSelectionContainer.HAnchor = HAnchor.Fit;
colorSelectionContainer.Padding = new BorderDouble(5);
string extruderLabelText = string.Format("{0} {1}", "Extruder".Localize(), extruderIndex + 1);
@ -1554,7 +1554,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
saveButtons = splitButtonFactory.Generate(buttonList, Direction.Up, imageName: "icon_save_32x32.png");
saveButtons.Visible = false;
saveButtons.Margin = margin;
saveButtons.VAnchor |= VAnchor.ParentCenter;
saveButtons.VAnchor |= VAnchor.Center;
flowToAddTo.AddChild(saveButtons);
}
@ -1670,7 +1670,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
editorPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
VAnchor = VAnchor.FitToChildren,
VAnchor = VAnchor.Fit,
};
if (mappedEditors != null)
@ -2285,7 +2285,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.ParentLeftRight,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(5, 5, 5, 0)
};

4
PartPreviewWindow/ViewControls3D.cs
View file

@ -135,8 +135,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public ViewControls3D(TextImageButtonFactory buttonFactory)
{
this.BackgroundColor = new RGBA_Bytes(0, 0, 0, overlayAlpha);
this.HAnchor |= HAnchor.ParentLeft;
this.VAnchor = VAnchor.ParentTop;
this.HAnchor |= HAnchor.Left;
this.VAnchor = VAnchor.Top;
string iconPath;

4
PartPreviewWindow/ViewControlsToggle.cs
View file

@ -83,8 +83,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
this.Margin = new BorderDouble(5, 5, 200, 5);
this.HAnchor |= HAnchor.ParentRight;
this.VAnchor = VAnchor.ParentTop;
this.HAnchor |= HAnchor.Right;
this.VAnchor = VAnchor.Top;
}
private void SwitchModes_Click(object sender, MouseEventArgs e)

20
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -103,14 +103,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var mainContainerTopToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Max_FitToChildren_ParentWidth,
VAnchor = VAnchor.Max_FitToChildren_ParentHeight
HAnchor = HAnchor.MaxFitOrStretch,
VAnchor = VAnchor.MaxFitOrStretch
};
gcodeDisplayWidget = new GuiWidget()
{
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.ParentBottomTop
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch
};
if (printItem != null)
@ -150,8 +150,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gradientWidget = new ColorGradientWidget(loadedGCode)
{
Margin = new BorderDouble(top: 55, left: 11),
HAnchor = HAnchor.FitToChildren | HAnchor.ParentLeft,
VAnchor = VAnchor.ParentTop,
HAnchor = HAnchor.Fit | HAnchor.Left,
VAnchor = VAnchor.Top,
Visible = printer.BedPlate.RendererOptions.RenderSpeeds
};
AddChild(gradientWidget);
@ -165,8 +165,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Margin = new BorderDouble(0, 0, 35, 5),
Padding = new BorderDouble(10),
BackgroundColor = new RGBA_Bytes(0, 0, 0, ViewControlsBase.overlayAlpha),
HAnchor = HAnchor.ParentRight | HAnchor.AbsolutePosition,
VAnchor = VAnchor.ParentTop | VAnchor.FitToChildren,
HAnchor = HAnchor.Right | HAnchor.Absolute,
VAnchor = VAnchor.Top | VAnchor.Fit,
Width = 150
});
}
@ -183,8 +183,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
gcodeProcessingStateInfoText = new TextWidget(message)
{
HAnchor = HAnchor.ParentCenter,
VAnchor = VAnchor.ParentCenter,
HAnchor = HAnchor.Center,
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true
};