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

Set the menu colors correctly.

Browse source
This commit is contained in:
Lars Brubaker 2016-05-03 10:57:30 -07:00
parent 55b9570d9d
commit 754ae7db2a
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CustomWidgets/DropDownMenuWidget.cs
View file

@ -246,10 +246,12 @@ namespace MatterHackers.Agg.UI
MenuItem menuItem = new MenuItem(new MenuItemColorStatesView(name) MenuItem menuItem = new MenuItem(new MenuItemColorStatesView(name)
{ {
NormalBackgroundColor = MenuItemsBackgroundColor, NormalBackgroundColor = MenuItemsBackgroundColor,
NormalTextColor = mainControlText.TextColor,
OverBackgroundColor = MenuItemsBackgroundHoverColor, OverBackgroundColor = MenuItemsBackgroundHoverColor,
OverTextColor = mainControlText.TextColor,
NormalTextColor = MenuItemsTextColor,
OverTextColor = MenuItemsTextHoverColor,
DisabledTextColor = RGBA_Bytes.Gray, DisabledTextColor = RGBA_Bytes.Gray,
PointSize = pointSize, PointSize = pointSize,
Padding = MenuItemsPadding, Padding = MenuItemsPadding,
}, value); }, value);

3
CustomWidgets/StyledDropDownList.cs
View file

@ -46,7 +46,8 @@ namespace MatterHackers.MatterControl
this.MenuItemsBorderColor = ActiveTheme.Instance.SecondaryTextColor; this.MenuItemsBorderColor = ActiveTheme.Instance.SecondaryTextColor;
this.MenuItemsPadding = new BorderDouble(10, 8, 10, 12); this.MenuItemsPadding = new BorderDouble(10, 8, 10, 12);
this.MenuItemsBackgroundHoverColor = ActiveTheme.Instance.PrimaryAccentColor; this.MenuItemsBackgroundHoverColor = ActiveTheme.Instance.PrimaryAccentColor;
this.MenuItemsTextHoverColor = ActiveTheme.Instance.PrimaryTextColor; this.MenuItemsTextHoverColor = RGBA_Bytes.Black;
this.MenuItemsTextColor = RGBA_Bytes.Black;
this.BorderWidth = 1; this.BorderWidth = 1;
this.BorderColor = ActiveTheme.Instance.SecondaryTextColor; this.BorderColor = ActiveTheme.Instance.SecondaryTextColor;
this.HoverColor = whiteSemiTransparent; this.HoverColor = whiteSemiTransparent;

1
SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
View file

@ -493,6 +493,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.MenuItemsPadding = new BorderDouble(10, 4, 10, 6); this.MenuItemsPadding = new BorderDouble(10, 4, 10, 6);
this.MenuItemsBackgroundHoverColor = ActiveTheme.Instance.PrimaryAccentColor; this.MenuItemsBackgroundHoverColor = ActiveTheme.Instance.PrimaryAccentColor;
this.MenuItemsTextHoverColor = ActiveTheme.Instance.PrimaryTextColor; this.MenuItemsTextHoverColor = ActiveTheme.Instance.PrimaryTextColor;
this.MenuItemsTextColor = RGBA_Bytes.Black;
this.BorderWidth = 1; this.BorderWidth = 1;
this.BorderColor = ActiveTheme.Instance.SecondaryTextColor; this.BorderColor = ActiveTheme.Instance.SecondaryTextColor;
this.HoverColor = whiteSemiTransparent; this.HoverColor = whiteSemiTransparent;

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit ab0dc31ca55218fdc2d10b987310f8b7eaba5b76 Subproject commit 4ed1bebc9e5a07f0bc7d16c0be1496992a66d052