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

18
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.settingsContext = settingsContext;
settingsControlBar = new PresetsToolbar(printer)
settingsControlBar = new PresetsToolbar(printer, theme)
{
HAnchor = HAnchor.Stretch,
Padding = new BorderDouble(8, 12, 8, 8)
@ -597,10 +597,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
internal GuiWidget CreateItemRow(SliceSettingData settingData)
{
return CreateItemRow(settingData, settingsContext, printer, theme.Colors.PrimaryTextColor, theme, ref tabIndexForItem, allUiFields);
return CreateItemRow(settingData, settingsContext, printer, theme, ref tabIndexForItem, allUiFields);
}
public static GuiWidget CreateItemRow(SliceSettingData settingData, SettingsContext settingsContext, PrinterConfig printer, Color textColor, ThemeConfig theme, ref int tabIndexForItem, Dictionary<string, UIField> fieldCache = null)
public static GuiWidget CreateItemRow(SliceSettingData settingData, SettingsContext settingsContext, PrinterConfig printer, ThemeConfig theme, ref int tabIndexForItem, Dictionary<string, UIField> fieldCache = null)
{
string sliceSettingValue = settingsContext.GetValue(settingData.SlicerConfigName);
@ -610,7 +610,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
bool placeFieldInDedicatedRow = false;
bool fullRowSelect = settingData.DataEditType == SliceSettingData.DataEditTypes.CHECK_BOX;
var settingsRow = new SliceSettingsRow(printer, settingsContext, settingData, textColor, theme, fullRowSelect: fullRowSelect);
var settingsRow = new SliceSettingsRow(printer, settingsContext, settingData, theme, fullRowSelect: fullRowSelect);
switch (settingData.DataEditType)
{
@ -652,7 +652,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case SliceSettingData.DataEditTypes.CHECK_BOX:
uiField = new ToggleboxField(textColor);
uiField = new ToggleboxField(theme);
useDefaultSavePattern = false;
uiField.ValueChanged += (s, e) =>
{
@ -712,7 +712,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case SliceSettingData.DataEditTypes.HARDWARE_PRESENT:
uiField = new ToggleboxField(textColor);
uiField = new ToggleboxField(theme);
break;
case SliceSettingData.DataEditTypes.VECTOR2:
@ -721,7 +721,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
case SliceSettingData.DataEditTypes.OFFSET2:
placeFieldInDedicatedRow = true;
uiField = new ExtruderOffsetField(settingsContext, settingData.SlicerConfigName, textColor);
uiField = new ExtruderOffsetField(settingsContext, settingData.SlicerConfigName, theme.Colors.PrimaryTextColor);
break;
#if !__ANDROID__
case SliceSettingData.DataEditTypes.IP_LIST:
@ -733,7 +733,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// Missing Setting
settingsRow.AddContent(new TextWidget($"Missing the setting for '{settingData.DataEditType}'.")
{
TextColor = textColor,
TextColor = theme.Colors.PrimaryTextColor,
BackgroundColor = Color.Red
});
break;
@ -774,7 +774,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (settingData.QuickMenuSettings.Count > 0
&& settingData.SlicerConfigName == "baud_rate")
{
var dropMenu = new DropMenuWrappedField(uiField, settingData, textColor);
var dropMenu = new DropMenuWrappedField(uiField, settingData, theme.Colors.PrimaryTextColor);
dropMenu.Initialize(tabIndexForItem);
settingsRow.AddContent(dropMenu.Content);