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

Alignment corrections.

Browse source
This commit is contained in:
Kevin Pope 2014-10-13 18:47:27 -07:00
parent e4a526b2aa
commit 4d9f5ce9f6
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PrintLibrary/PrintLibraryWidget.cs
View file

@ -87,8 +87,8 @@ namespace MatterHackers.MatterControl.PrintLibrary
FlowLayoutWidget allControls = new FlowLayoutWidget(FlowDirection.TopToBottom);
{
enterEditModeButton = editButtonFactory.Generate("Edit".Localize());
leaveEditModeButton = editButtonFactory.Generate("Done".Localize());
enterEditModeButton = editButtonFactory.Generate("Edit".Localize(), centerText:true);
leaveEditModeButton = editButtonFactory.Generate("Done".Localize(), centerText: true);
leaveEditModeButton.Visible = false;
FlowLayoutWidget searchPanel = new FlowLayoutWidget();
@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
searchPanel.Padding = new BorderDouble(0);
{
searchInput = new MHTextEditWidget(messageWhenEmptyAndNotSelected:"Search Library".Localize());
searchInput.Margin = new BorderDouble(6, 3, 0, 0);
searchInput.Margin = new BorderDouble(0, 3, 0, 0);
searchInput.HAnchor = HAnchor.ParentLeftRight;
searchInput.VAnchor = VAnchor.ParentCenter;

13
PrinterControls/ManualPrinterControls.cs
View file

@ -439,7 +439,7 @@ namespace MatterHackers.MatterControl
feedRateLeftToRight.HAnchor = HAnchor.ParentLeftRight;
feedRateDescription = new TextWidget(LocalizedString.Get("Speed Multiplier"));
feedRateDescription.MinimumSize = new Vector2(220, 0);
feedRateDescription.MinimumSize = new Vector2(140, 0) * TextWidget.GlobalPointSizeScaleRatio;
feedRateDescription.TextColor = ActiveTheme.Instance.PrimaryTextColor;
feedRateDescription.VAnchor = VAnchor.ParentCenter;
feedRateLeftToRight.AddChild(feedRateDescription);
@ -461,7 +461,7 @@ namespace MatterHackers.MatterControl
tuningRatiosLayout.AddChild(feedRateLeftToRight);
feedRateLeftToRight.AddChild(feedRateValue);
feedRateValue.Margin = new BorderDouble(0, 0, 5, 0)* TextWidget.GlobalPointSizeScaleRatio;
feedRateValue.Margin = new BorderDouble(0, 0, 5, 0);
feedRateValue.VAnchor = VAnchor.ParentCenter;
textImageButtonFactory.FixedHeight = (int)feedRateValue.Height + 1;
textImageButtonFactory.borderWidth = 1;
@ -484,13 +484,13 @@ namespace MatterHackers.MatterControl
leftToRight.Margin = new BorderDouble(top: 10)* TextWidget.GlobalPointSizeScaleRatio;
extrusionDescription = new TextWidget(LocalizedString.Get("Extrusion Multiplier"));
extrusionDescription.MinimumSize = new Vector2(220, 0);
extrusionDescription.MinimumSize = new Vector2(140, 0) * TextWidget.GlobalPointSizeScaleRatio;
extrusionDescription.TextColor = ActiveTheme.Instance.PrimaryTextColor;
extrusionDescription.VAnchor = VAnchor.ParentCenter;
leftToRight.AddChild(extrusionDescription);
extrusionRatioSlider = new SolidSlider(new Vector2(), sliderWidth, minExtrutionRatio, maxExtrusionRatio,Orientation.Horizontal);
extrusionRatioSlider.TotalWidthInPixels = 300;
extrusionRatioSlider.Margin = new BorderDouble(5, 0)* TextWidget.GlobalPointSizeScaleRatio;
extrusionRatioSlider.Margin = new BorderDouble(5, 0);
extrusionRatioSlider.Value = PrinterConnectionAndCommunication.Instance.ExtrusionRatio;
extrusionRatioSlider.View.BackgroundColor = new RGBA_Bytes();
extrusionRatioSlider.ValueChanged += (sender, e) =>
@ -505,16 +505,13 @@ namespace MatterHackers.MatterControl
leftToRight.AddChild(extrusionRatioSlider);
tuningRatiosLayout.AddChild(leftToRight);
leftToRight.AddChild(extrusionValue);
extrusionValue.Margin = new BorderDouble(0, 0, 5, 0)* TextWidget.GlobalPointSizeScaleRatio;
extrusionValue.Margin = new BorderDouble(0, 0, 5, 0);
extrusionValue.VAnchor = VAnchor.ParentCenter;
textImageButtonFactory.FixedHeight = (int)extrusionValue.Height + 1;
Button setExtrusionButton = textImageButtonFactory.Generate(LocalizedString.Get("Set"));
setExtrusionButton.VAnchor = VAnchor.ParentCenter;
leftToRight.AddChild(setExtrusionButton);
}
feedRateDescription.Width = extrusionDescription.Width;
feedRateDescription.MinimumSize = new Vector2(extrusionDescription.Width, feedRateDescription.MinimumSize.y);
feedRateLeftToRight.VAnchor = VAnchor.FitToChildren;
}

5
SlicerConfiguration/SettingsControlBar.cs
View file

@ -139,13 +139,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
saveButton = textImageButtonFactory.Generate(LocalizedString.Get("Save"));
saveButton.VAnchor = VAnchor.ParentTop;
saveButton.VAnchor = VAnchor.ParentCenter;
saveButton.Visible = false;
saveButton.Margin = new BorderDouble(0, 0, 0, 10);
saveButton.Click += new ButtonBase.ButtonEventHandler(saveButton_Click);
revertbutton = textImageButtonFactory.Generate(LocalizedString.Get("Revert"));
revertbutton.VAnchor = VAnchor.ParentTop;
revertbutton.VAnchor = VAnchor.ParentCenter;
revertbutton.Visible = false;
revertbutton.Margin = new BorderDouble(0,0,0,10);
revertbutton.Click += new ButtonBase.ButtonEventHandler(revertbutton_Click);
@ -175,6 +175,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
sliceOptionsMenuDropList.BorderColor = new RGBA_Bytes(0, 0, 0, 0);
sliceOptionsMenuDropList.BackgroundColor = new RGBA_Bytes(0, 0, 0, 0);
sliceOptionsMenuDropList.BorderWidth = 1;
sliceOptionsMenuDropList.VAnchor |= VAnchor.ParentCenter;
sliceOptionsMenuDropList.BorderColor = ActiveTheme.Instance.SecondaryTextColor;
sliceOptionsMenuDropList.SelectionChanged += new EventHandler(MenuDropList_SelectionChanged);