From 33b53f29befcb0a810bd6549bea56ce2a42ac166 Mon Sep 17 00:00:00 2001 From: jlewin Date: Tue, 11 Jun 2019 16:33:09 -0700 Subject: [PATCH] Revise column styling to match SettingsRow defaults - Issue MatterHackers/MCCentral#5667 Inconsistent styling --- .../DesignTools/PublicPropertyEditor.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs index fc619765e..2bc811c4b 100644 --- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs +++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs @@ -236,15 +236,15 @@ namespace MatterHackers.MatterControl.DesignTools var column = new FlowLayoutWidget(FlowDirection.TopToBottom) { HAnchor = HAnchor.Stretch, - Padding = new BorderDouble(5), + Padding = new BorderDouble(9, 5, 5, 5), // Use hard-coded 9 pixel left margin to match SettingsRow ToolTipText = toolTipText }; - column.AddChild(new TextWidget(labelText, pointSize: theme.DefaultFontSize, textColor: theme.TextColor) - { - Margin = new BorderDouble(0, 3, 0, 0), - HAnchor = HAnchor.Left - }); + var label = SettingsRow.CreateSettingsLabel(labelText, toolTipText, theme.TextColor); + label.VAnchor = VAnchor.Absolute; + label.HAnchor = HAnchor.Left; + + column.AddChild(label); return column; } @@ -406,7 +406,8 @@ namespace MatterHackers.MatterControl.DesignTools var field2 = new Vector3Field(theme); field2.Initialize(0); field2.Vector3 = directionAxis.Origin - property.Item.Children.First().GetAxisAlignedBoundingBox().Center; - var row2 = CreateSettingsColumn("Offset", field2); + + var row2 = CreateSettingsColumn("Offset".Localize(), field2); // update this when changed void UpdateData(object s, InvalidateArgs e)