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

Use tooltip and context menu containers as newly required

Browse Source
This commit is contained in:
Thomas Müller
2017-07-06 15:15:12 +03:00
parent 7162de09f9
commit d68f17b697
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 672e318d54...47ad455b71

2
osu-resources

Submodule osu-resources updated: 900f47563f...76656c51f2

4
osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
View File

@ -10,9 +10,5 @@ namespace osu.Game.Graphics.Cursor
public class OsuContextMenuContainer : ContextMenuContainer public class OsuContextMenuContainer : ContextMenuContainer
{ {
protected override ContextMenu<ContextMenuItem> CreateContextMenu() => new OsuContextMenu<ContextMenuItem>(); protected override ContextMenu<ContextMenuItem> CreateContextMenu() => new OsuContextMenu<ContextMenuItem>();
public OsuContextMenuContainer(CursorContainer cursor) : base(cursor)
{
}
} }
} }

22
osu.Game/OsuGameBase.cs
View File

@ -37,9 +37,9 @@ namespace osu.Game
public APIAccess API; public APIAccess API;
protected override Container<Drawable> Content => ratioContainer; private Container content;
private RatioAdjust ratioContainer; protected override Container<Drawable> Content => content;
protected MenuCursor Cursor; protected MenuCursor Cursor;
@ -146,22 +146,20 @@ namespace osu.Game
{ {
base.LoadComplete(); base.LoadComplete();
base.Content.Add(ratioContainer = new RatioAdjust base.Content.Add(new RatioAdjust
{ {
Children = new Drawable[]
{
new Container
{
RelativeSizeAxes = Axes.Both,
Depth = float.MinValue,
Children = new Drawable[] Children = new Drawable[]
{ {
Cursor = new MenuCursor(), Cursor = new MenuCursor(),
new OsuContextMenuContainer(Cursor) { Depth = -2 }, new OsuTooltipContainer(Cursor)
new OsuTooltipContainer(Cursor) { Depth = -1 }, {
} RelativeSizeAxes = Axes.Both,
Child = content = new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
}, },
} }
}
}); });
// TODO: This is temporary until we reimplement the local FPS display. // TODO: This is temporary until we reimplement the local FPS display.