h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:12:56 +08:00
Code Issues Releases Wiki Activity

Move PopoverContainer into OnlineOverlay to ensure correct colours

Browse Source
This commit is contained in:
Dean Herbert 2022-11-03 15:43:06 +09:00
parent e6c45b8ab5
commit 56ef519cc2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/OsuGameBase.cs
View File

@ -18,7 +18,6 @@ using osu.Framework.Development;
using osu.Framework.Extensions; using osu.Framework.Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Handlers; using osu.Framework.Input.Handlers;
@ -358,13 +357,9 @@ namespace osu.Game
(GlobalCursorDisplay = new GlobalCursorDisplay (GlobalCursorDisplay = new GlobalCursorDisplay
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}).WithChild(new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor) }).WithChild(content = new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both
Child = content = new PopoverContainer
{
RelativeSizeAxes = Axes.Both,
}
}), }),
// to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything. // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
globalBindings = new GlobalActionContainer(this) globalBindings = new GlobalActionContainer(this)

3
osu.Game/Overlays/OnlineOverlay.cs
View File

@ -6,6 +6,7 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online; using osu.Game.Online;
@ -45,7 +46,7 @@ namespace osu.Game.Overlays
Children = new Drawable[] Children = new Drawable[]
{ {
Header.With(h => h.Depth = float.MinValue), Header.With(h => h.Depth = float.MinValue),
content = new Container content = new PopoverContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y AutoSizeAxes = Axes.Y