mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 07:42:57 +08:00
Move PopoverContainer
into OnlineOverlay
to ensure correct colours
This commit is contained in:
parent
e6c45b8ab5
commit
56ef519cc2
@ -18,7 +18,6 @@ using osu.Framework.Development;
|
||||
using osu.Framework.Extensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Cursor;
|
||||
using osu.Framework.Graphics.Textures;
|
||||
using osu.Framework.Input;
|
||||
using osu.Framework.Input.Handlers;
|
||||
@ -358,13 +357,9 @@ namespace osu.Game
|
||||
(GlobalCursorDisplay = new GlobalCursorDisplay
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both
|
||||
}).WithChild(new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
|
||||
}).WithChild(content = new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Child = content = new PopoverContainer
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
}
|
||||
RelativeSizeAxes = Axes.Both
|
||||
}),
|
||||
// to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
|
||||
globalBindings = new GlobalActionContainer(this)
|
||||
|
@ -6,6 +6,7 @@
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Cursor;
|
||||
using osu.Game.Graphics.UserInterface;
|
||||
using osu.Game.Online;
|
||||
|
||||
@ -45,7 +46,7 @@ namespace osu.Game.Overlays
|
||||
Children = new Drawable[]
|
||||
{
|
||||
Header.With(h => h.Depth = float.MinValue),
|
||||
content = new Container
|
||||
content = new PopoverContainer
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y
|
||||
|
Loading…
Reference in New Issue
Block a user