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

Use theme border colors

Browse source 
- Issue MatterHackers/MCCentral#4507
This commit is contained in:
John Lewin 2018-11-06 09:06:06 -08:00
parent 64dbc1ac0d
commit 6f36eb7ab0
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/PartPreviewWindow/ItemColorButton.cs
View file

@ -51,15 +51,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Width = 30 * GuiWidget.DeviceScale;
Height = 30 * GuiWidget.DeviceScale;
var menuTheme = AppContext.MenuTheme;
this.DynamicPopupContent = () =>
{
return new ColorSwatchSelector(theme,
return new ColorSwatchSelector(menuTheme,
buttonSize: 16,
buttonSpacing: new BorderDouble(1, 1, 0, 0),
colorNotifier: (newColor) => colorButton.BackgroundColor = newColor)
{
Padding = theme.DefaultContainerPadding,
BackgroundColor = theme.BackgroundColor,
BackgroundColor = menuTheme.BackgroundColor,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit
};
@ -72,8 +74,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
HAnchor = HAnchor.Center,
VAnchor = VAnchor.Center,
DisabledColor = theme.MinimalShade,
Border = new BorderDouble(1),
BorderColor = theme.DropList.Inactive.BorderColor,
Border = 1,
BorderColor = theme.BorderColor20,
Selectable = false
};

8
MatterControlLib/PartPreviewWindow/ItemMaterialButton.cs
View file

@ -54,12 +54,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Width = 30 * GuiWidget.DeviceScale;
Height = 30 * GuiWidget.DeviceScale;
var menuTheme = AppContext.MenuTheme;
this.DynamicPopupContent = () =>
{
var materialControl = new MaterialControls(AppContext.MenuTheme, currentIndex)
var materialControl = new MaterialControls(menuTheme, currentIndex)
{
Padding = theme.DefaultContainerPadding,
BackgroundColor = AppContext.MenuTheme.BackgroundColor,
BackgroundColor = menuTheme.BackgroundColor,
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
};
@ -82,6 +84,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Center,
DrawGrid = true,
DisabledColor = theme.MinimalShade,
Border = 1,
BorderColor = theme.BorderColor20,
Selectable = false,
};

2
MatterControlLib/SlicerConfiguration/UIFields/ColorField.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
var container = new FlowLayoutWidget();
colorWidget = new ItemColorButton(AppContext.MenuTheme, initialColor);
colorWidget = new ItemColorButton(theme, initialColor);
colorWidget.ColorChanged += (s, e) =>
{
base.OnValueChanged(new FieldChangedEventArgs(true));