sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'HollyHacker/master' into abstract-menu

Browse Source
This commit is contained in:
smoogipoo
2019-06-28 13:37:58 +09:00
parent 4d8f49b9bc e8ea0594b4
commit 23df1a5d42
85 changed files with 1834 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Graphics/UserInterface/OsuDropdown.cs
View File

@ -98,10 +98,10 @@ namespace osu.Game.Graphics.UserInterface
protected override Menu CreateSubMenu() => new OsuMenu(Direction.Vertical);
protected override ScrollContainer<Drawable> CreateScrollContainer(Direction direction) => new OsuScrollContainer(direction);
protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour };
protected override ScrollContainer<Drawable> CreateScrollContainer(Direction direction) => new OsuScrollContainer(direction);
#region DrawableOsuDropdownMenuItem
public class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour
@ -252,8 +252,8 @@ namespace osu.Game.Graphics.UserInterface
Icon = FontAwesome.Solid.ChevronDown,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Margin = new MarginPadding { Right = 4 },
Size = new Vector2(20),
Margin = new MarginPadding { Right = 5 },
Size = new Vector2(12),
},
};