1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 04:12:57 +08:00

Merge branch 'master' into dont-retry-on-replay-results

This commit is contained in:
Dan Balasescu 2020-03-30 22:30:15 +09:00 committed by GitHub
commit 250bdbef6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,16 +26,16 @@ namespace osu.Game.Tests.Visual
protected OsuManualInputManagerTestScene() protected OsuManualInputManagerTestScene()
{ {
MenuCursorContainer cursorContainer;
base.Content.AddRange(new Drawable[] base.Content.AddRange(new Drawable[]
{ {
InputManager = new ManualInputManager InputManager = new ManualInputManager
{ {
UseParentInput = true, UseParentInput = true,
Child = new GlobalActionContainer(null) Child = new GlobalActionContainer(null)
{ .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
RelativeSizeAxes = Axes.Both, .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
Child = content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
},
}, },
new Container new Container
{ {