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

Always create title field in SettingsRow constructor

Browse source 
- Use title field for HelpText
- Issue MatterHackers/MCCentral#3038
Fix mentioned issue
This commit is contained in:
John Lewin 2018-04-06 13:11:50 -07:00
parent 985afc587c
commit e33406aca0
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SlicerConfiguration/SettingsRow.cs
View file

@ -40,17 +40,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class SettingsRow : FlowLayoutWidget
{
protected GuiWidget overrideIndicator;
public GuiWidget NameArea { get; }
protected const bool debugLayout = false;
protected ThemeConfig theme;
private bool mouseInBounds = false;
private Color hoverColor;
private bool fullRowSelect;
private GuiWidget settingsLabel;
public GuiWidget ActionWidget { get; set; }
public SettingsRow(ThemeConfig theme, ImageBuffer icon = null, bool enforceGutter = false, bool fullRowSelect = false)
public SettingsRow(string title, string helpText, Color textColor, ThemeConfig theme, ImageBuffer icon = null, bool enforceGutter = false, bool fullRowSelect = false)
{
this.theme = theme;
this.MinimumSize = new Vector2(0, 28);
@ -85,13 +85,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Margin = new BorderDouble(right: 6)
});
this.AddChild(this.NameArea = new GuiWidget()
GuiWidget nameArea;
this.AddChild(nameArea = new GuiWidget()
{
MinimumSize = new Vector2(50, 0),
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit | VAnchor.Center,
DebugShowBounds = debugLayout
});
nameArea.AddChild(settingsLabel = SettingsRow.CreateSettingsLabel(title, helpText, textColor));
if (fullRowSelect)
{
@ -109,13 +111,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
};
}
// HACK: ******** Remove dynamic lookup in favor of a known label/title widget *************************************************
public override string ToolTipText
{
get => NameArea.Children.FirstOrDefault()?.ToolTipText;
set
{
}
get => settingsLabel.ToolTipText;
set => settingsLabel.ToolTipText = value;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)

4
SlicerConfiguration/SliceSettingsRow.cs
View file

@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private Button restoreButton = null;
public SliceSettingsRow(PrinterConfig printer, SettingsContext settingsContext, SliceSettingData settingData, Color textColor, ThemeConfig theme, bool fullRowSelect = false)
: base (theme, fullRowSelect: fullRowSelect)
: base (settingData.PresentationName.Localize(), settingData.HelpText, textColor, theme, fullRowSelect: fullRowSelect)
{
this.printer = printer;
this.settingData = settingData;
@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
restoreButton.ToolTipText = "Restore Default".Localize();
restoreButton.Click += (sender, e) =>
{
// Revert the user override
// Revert the user override
settingsContext.ClearValue(settingData.SlicerConfigName);
};