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

Extract button factory options to new class

Browse source
This commit is contained in:
John Lewin 2017-08-03 12:40:10 -07:00
parent 836ec72300
commit 4abea0ab0c
29 changed files with 459 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
View file

@ -84,14 +84,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
textColor = ActiveTheme.Instance.SecondaryAccentColor
};
var buttonFactory = new TextImageButtonFactory()
var buttonFactory = new TextImageButtonFactory(new ButtonFactoryOptions()
{
normalTextColor = ActiveTheme.Instance.PrimaryTextColor,
hoverTextColor = ActiveTheme.Instance.PrimaryTextColor,
disabledTextColor = ActiveTheme.Instance.PrimaryTextColor,
pressedTextColor = ActiveTheme.Instance.PrimaryTextColor,
borderWidth = 0
};
Normal = new ButtonOptionSection() { TextColor = ActiveTheme.Instance.PrimaryTextColor },
Hover = new ButtonOptionSection() { TextColor = ActiveTheme.Instance.PrimaryTextColor },
Disabled = new ButtonOptionSection() { TextColor = ActiveTheme.Instance.PrimaryTextColor },
Pressed = new ButtonOptionSection() { TextColor = ActiveTheme.Instance.PrimaryTextColor },
BorderWidth = 0
});
FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
{

28
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -102,22 +102,22 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
persistenceLayer = layerCascade?.First() ?? ActiveSliceSettings.Instance.UserLayer;
textImageButtonFactory = new TextImageButtonFactory();
textImageButtonFactory.normalFillColor = RGBA_Bytes.Transparent;
textImageButtonFactory.FixedHeight = 15 * GuiWidget.DeviceScale;
textImageButtonFactory.fontSize = 8;
textImageButtonFactory.borderWidth = 1;
textImageButtonFactory.normalBorderColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 200);
textImageButtonFactory.hoverBorderColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 200);
textImageButtonFactory.Options.Normal.FillColor = RGBA_Bytes.Transparent;
textImageButtonFactory.Options.FixedHeight = 15 * GuiWidget.DeviceScale;
textImageButtonFactory.Options.FontSize = 8;
textImageButtonFactory.Options.BorderWidth = 1;
textImageButtonFactory.Options.Normal.BorderColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 200);
textImageButtonFactory.Options.Hover.BorderColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 200);
this.textImageButtonFactory.disabledTextColor = RGBA_Bytes.Gray;
this.textImageButtonFactory.hoverTextColor = ActiveTheme.Instance.PrimaryTextColor;
this.textImageButtonFactory.normalTextColor = ActiveTheme.Instance.SecondaryTextColor;
this.textImageButtonFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor;
this.textImageButtonFactory.Options.Disabled.TextColor = RGBA_Bytes.Gray;
this.textImageButtonFactory.Options.Hover.TextColor = ActiveTheme.Instance.PrimaryTextColor;
this.textImageButtonFactory.Options.Normal.TextColor = ActiveTheme.Instance.SecondaryTextColor;
this.textImageButtonFactory.Options.Pressed.TextColor = ActiveTheme.Instance.PrimaryTextColor;
buttonFactory.FixedHeight = 20 * GuiWidget.DeviceScale;
buttonFactory.fontSize = 10;
buttonFactory.normalFillColor = RGBA_Bytes.White;
buttonFactory.normalTextColor = RGBA_Bytes.DarkGray;
buttonFactory.Options.FixedHeight = 20 * GuiWidget.DeviceScale;
buttonFactory.Options.FontSize = 10;
buttonFactory.Options.Normal.FillColor = RGBA_Bytes.White;
buttonFactory.Options.Normal.TextColor = RGBA_Bytes.DarkGray;
pageTopToBottomLayout = new FlowLayoutWidget(FlowDirection.TopToBottom)
{