diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropDown.cs index 51fb335698..a921be1a1d 100644 --- a/osu.Game/Graphics/UserInterface/OsuDropDown.cs +++ b/osu.Game/Graphics/UserInterface/OsuDropDown.cs @@ -35,6 +35,6 @@ namespace osu.Game.Graphics.UserInterface AccentColour = colours.PinkDarker; } - protected override DropDownMenuItem CreateMenuItem(string key, T value) => new OsuDropDownMenuItem(key, value) { AccentColour = AccentColour }; + protected override DropDownMenuItem CreateMenuItem(string text, T value) => new OsuDropDownMenuItem(text, value) { AccentColour = AccentColour }; } } \ No newline at end of file diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs index 4e80e1502a..95df3be9bf 100644 --- a/osu.Game/Graphics/UserInterface/OsuMenu.cs +++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs @@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface public OsuMenu() { CornerRadius = 4; - ContentBackground.Colour = Color4.Black.Opacity(0.5f); + Background.Colour = Color4.Black.Opacity(0.5f); ItemsContainer.Padding = new MarginPadding(5); } diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs index 947b39f621..84f3125ca4 100644 --- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs +++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs @@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface { public class OsuTabControl : TabControl { - protected override DropDown CreateDropDownMenu() => new OsuTabDropDown(); + protected override DropDown CreateDropDown() => new OsuTabDropDown(); protected override TabItem CreateTabItem(T value) => new OsuTabItem { Value = value }; @@ -62,9 +62,9 @@ namespace osu.Game.Graphics.UserInterface Origin = Anchor.TopRight, }; - protected override DropDownMenuItem CreateMenuItem(string key, T value) + protected override DropDownMenuItem CreateMenuItem(string text, T value) { - var item = base.CreateMenuItem(key, value); + var item = base.CreateMenuItem(text, value); item.ForegroundColourHover = Color4.Black; return item; } @@ -76,7 +76,7 @@ namespace osu.Game.Graphics.UserInterface RelativeSizeAxes = Axes.X; - DropDownMenu.Colour = Color4.Black.Opacity(0.7f); + DropDownMenu.Background.Colour = Color4.Black.Opacity(0.7f); DropDownMenu.MaxHeight = 400; }