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

Reduce font sizes, remove caps from preset labels

Browse source
This commit is contained in:
John Lewin 2017-10-31 14:37:28 -07:00
parent d6a54f880b
commit 0de97fe0bf
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/PresetSelectorWidget.cs
View file

@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
};
// Section Label
this.AddChild(new TextWidget(label.Localize().ToUpper())
this.AddChild(new TextWidget(label.Localize())
{
TextColor = whiteBackground ? Color.Black : ActiveTheme.Instance.PrimaryTextColor,
HAnchor = HAnchor.Left,

2
SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
View file

@ -155,7 +155,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
},
presetsContext.LayerType);
return new SliceSettingsWidget(printer, settingsContext)
return new SliceSettingsWidget(printer, settingsContext, ApplicationController.Instance.Theme)
{
ShowControlBar = false
};

9
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -50,9 +50,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private EventHandler unregisterEvents;
public SliceSettingsWidget(PrinterConfig printer, SettingsContext settingsContext)
private ThemeConfig theme;
public SliceSettingsWidget(PrinterConfig printer, SettingsContext settingsContext, ThemeConfig theme)
: base (FlowDirection.TopToBottom)
{
this.theme = theme;
this.printer = printer;
this.BackgroundColor = ApplicationController.Instance.Theme.TabBodyBackground;
@ -114,7 +117,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
primaryTabControl.AddTab(new TextTab(
categoryPage,
category.Name + " Tab",
14,
theme.DefaultFontSize,
ActiveTheme.Instance.TabLabelSelected,
new Color(),
ActiveTheme.Instance.TabLabelUnselected,
@ -257,7 +260,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var groupTabWidget = new TextTab(
groupTabPage,
group.Name + " Tab",
14,
theme.DefaultFontSize,
ActiveTheme.Instance.TabLabelSelected,
ActiveTheme.Instance.TertiaryBackgroundColor,
ActiveTheme.Instance.TabLabelUnselected,