From 83e0dee7a91fa86be22e233df96b8678a307bbb7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sun, 1 Oct 2017 10:38:36 -0700 Subject: [PATCH] Move common control size into base --- SlicerConfiguration/UIFields/NumberField.cs | 2 -- SlicerConfiguration/UIFields/TextField.cs | 2 -- SlicerConfiguration/UIFields/UIField.cs | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SlicerConfiguration/UIFields/NumberField.cs b/SlicerConfiguration/UIFields/NumberField.cs index c564f381f..334904405 100644 --- a/SlicerConfiguration/UIFields/NumberField.cs +++ b/SlicerConfiguration/UIFields/NumberField.cs @@ -35,8 +35,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { protected MHNumberEdit numberEdit; - public static readonly int ControlWidth = (int)(60 * GuiWidget.DeviceScale + .5); - protected bool AllowNegatives { get; set; } = true; protected bool AllowDecimals { get; set; } = true; diff --git a/SlicerConfiguration/UIFields/TextField.cs b/SlicerConfiguration/UIFields/TextField.cs index 7c48edbbb..225abfcc4 100644 --- a/SlicerConfiguration/UIFields/TextField.cs +++ b/SlicerConfiguration/UIFields/TextField.cs @@ -35,8 +35,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { protected MHTextEditWidget textEditWidget; - private readonly int ControlWidth = (int)(60 * GuiWidget.DeviceScale + .5); - public override void Initialize(int tabIndex) { textEditWidget = new MHTextEditWidget("", pixelWidth: ControlWidth, tabIndex: tabIndex) diff --git a/SlicerConfiguration/UIFields/UIField.cs b/SlicerConfiguration/UIFields/UIField.cs index c384ce40a..7106029ff 100644 --- a/SlicerConfiguration/UIFields/UIField.cs +++ b/SlicerConfiguration/UIFields/UIField.cs @@ -36,6 +36,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { public event EventHandler ValueChanged; + protected readonly int ControlWidth = (int)(60 * GuiWidget.DeviceScale + .5); + public void SetValue(string newValue, bool userInitiated) { string convertedValue = this.ConvertValue(newValue);