diff --git a/CustomWidgets/DropDownMenuWidget.cs b/CustomWidgets/DropDownMenuWidget.cs index 252386e9e..9d474d89c 100644 --- a/CustomWidgets/DropDownMenuWidget.cs +++ b/CustomWidgets/DropDownMenuWidget.cs @@ -246,10 +246,12 @@ namespace MatterHackers.Agg.UI MenuItem menuItem = new MenuItem(new MenuItemColorStatesView(name) { NormalBackgroundColor = MenuItemsBackgroundColor, - NormalTextColor = mainControlText.TextColor, OverBackgroundColor = MenuItemsBackgroundHoverColor, - OverTextColor = mainControlText.TextColor, + + NormalTextColor = MenuItemsTextColor, + OverTextColor = MenuItemsTextHoverColor, DisabledTextColor = RGBA_Bytes.Gray, + PointSize = pointSize, Padding = MenuItemsPadding, }, value); diff --git a/CustomWidgets/StyledDropDownList.cs b/CustomWidgets/StyledDropDownList.cs index 4d232d9cb..b71b55140 100644 --- a/CustomWidgets/StyledDropDownList.cs +++ b/CustomWidgets/StyledDropDownList.cs @@ -46,7 +46,8 @@ namespace MatterHackers.MatterControl this.MenuItemsBorderColor = ActiveTheme.Instance.SecondaryTextColor; this.MenuItemsPadding = new BorderDouble(10, 8, 10, 12); this.MenuItemsBackgroundHoverColor = ActiveTheme.Instance.PrimaryAccentColor; - this.MenuItemsTextHoverColor = ActiveTheme.Instance.PrimaryTextColor; + this.MenuItemsTextHoverColor = RGBA_Bytes.Black; + this.MenuItemsTextColor = RGBA_Bytes.Black; this.BorderWidth = 1; this.BorderColor = ActiveTheme.Instance.SecondaryTextColor; this.HoverColor = whiteSemiTransparent; diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs index 275115728..703b231f4 100644 --- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs +++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs @@ -493,6 +493,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.MenuItemsPadding = new BorderDouble(10, 4, 10, 6); this.MenuItemsBackgroundHoverColor = ActiveTheme.Instance.PrimaryAccentColor; this.MenuItemsTextHoverColor = ActiveTheme.Instance.PrimaryTextColor; + this.MenuItemsTextColor = RGBA_Bytes.Black; this.BorderWidth = 1; this.BorderColor = ActiveTheme.Instance.SecondaryTextColor; this.HoverColor = whiteSemiTransparent; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ab0dc31ca..4ed1bebc9 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ab0dc31ca55218fdc2d10b987310f8b7eaba5b76 +Subproject commit 4ed1bebc9e5a07f0bc7d16c0be1496992a66d052