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

Add dedicated popup border color, add or tune theme border color

Browse source
This commit is contained in:
John Lewin 2019-03-09 13:32:55 -08:00
parent dcffcb050f
commit 6d06758754
14 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControlLib/ApplicationView/Themes/ThemeConfig.cs
View file

@ -211,6 +211,7 @@ namespace MatterHackers.MatterControl
public Color BedBackgroundColor { get; set; }
public Color PrimaryAccentColor { get; set; }
public Color SectionBackgroundColor { get; set; }
public Color PopupBorderColor { get; set; }
public GuiWidget CreateSearchButton()
{

2
MatterControlLib/ApplicationView/Themes/ThemeSet.cs
View file

@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl
{
public class ThemeSet
{
public static int LatestSchemeVersion { get; } = 20181103;
public static int LatestSchemeVersion { get; } = 20190309;
/// <summary>
/// The identifier to use for this combination of accent colors, theme and menu theme

2
MatterControlLib/ControlElements/MHDropDownList.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl
this.MenuItemsBorderColor = menuTheme.DropList.Open.BackgroundColor;
// Popup border color
this.PopupBorderColor = AppContext.MenuTheme.BorderColor40;
this.PopupBorderColor = theme.PopupBorderColor;
this.theme = theme;

4
MatterControlLib/PartPreviewWindow/PopupMenuButton.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.DisabledColor = theme.DisabledColor;
this.HoverColor = theme.SlightShade;
this.MouseDownColor = theme.MinimalShade;
this.PopupBorderColor = AppContext.MenuTheme.BorderColor40;
this.PopupBorderColor = theme.PopupBorderColor;
}
public PopupMenuButton(ImageBuffer imageBuffer, ThemeConfig theme)
@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.HoverColor = theme.ToolbarButtonHover;
this.BackgroundColor = theme.ToolbarButtonBackground;
this.MouseDownColor = theme.ToolbarButtonDown;
this.PopupBorderColor = AppContext.MenuTheme.BorderColor40;
this.PopupBorderColor = theme.PopupBorderColor;
}
public PopupMenuButton(string text, ThemeConfig theme)

2
MatterControlLib/PartPreviewWindow/SystemWindowExtension.cs
View file

@ -209,7 +209,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
new Stroke(
new RoundedRect(popup.Widget.LocalBounds, 0),
borderWidth * 2),
AppContext.MenuTheme.BorderColor40);
AppContext.Theme.PopupBorderColor);
}
void widgetRelativeTo_PositionChanged(object sender, EventArgs e)