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

Use dedicated theme for menus, prefer theme colors over explicit refs

Browse source 
- Revise icon loader to take an Invert bool instead of custom enum
- Remove icon loader static ref to ActiveTheme.Instance
- Pass contextual theme.InvertIcons for theme specific invert behavior
This commit is contained in:
John Lewin 2018-04-12 08:42:10 -07:00
parent d3ef1d354e
commit 37a0b64b02
54 changed files with 231 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SlicerConfiguration/SliceSettingsRow.cs
View file

@ -50,8 +50,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private GuiWidget restoreArea;
private Button restoreButton = null;
public SliceSettingsRow(PrinterConfig printer, SettingsContext settingsContext, SliceSettingData settingData, Color textColor, ThemeConfig theme, bool fullRowSelect = false)
: base (settingData.PresentationName.Localize(), settingData.HelpText.Localize(), textColor, theme, fullRowSelect: fullRowSelect)
public SliceSettingsRow(PrinterConfig printer, SettingsContext settingsContext, SliceSettingData settingData, ThemeConfig theme, bool fullRowSelect = false)
: base (settingData.PresentationName.Localize(), settingData.HelpText.Localize(), theme, fullRowSelect: fullRowSelect)
{
this.printer = printer;
this.settingData = settingData;
@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
&& settingData.DataEditType != SliceSettingData.DataEditTypes.HARDWARE_PRESENT)
{
unitsArea.AddChild(
new WrappedTextWidget(settingData.Units.Localize(), pointSize: 8, textColor: textColor)
new WrappedTextWidget(settingData.Units.Localize(), pointSize: 8, textColor: theme.Colors.PrimaryTextColor)
{
Margin = new BorderDouble(5, 0),
});