h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 20:42:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into skin-editor-undo-support

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-02-08 18:43:59 +01:00 committed by GitHub
commit 0a5c4e04bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -12,7 +12,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Overlays.Profile.Header.Components; using osu.Game.Overlays.Profile.Header.Components;
@ -104,13 +103,7 @@ namespace osu.Game.Overlays.Profile.Header
Colour = Colour4.Black.Opacity(0.25f), Colour = Colour4.Black.Opacity(0.25f),
} }
}, },
new OsuContextMenuContainer new FillFlowContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Child = new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
@ -174,7 +167,6 @@ namespace osu.Game.Overlays.Profile.Header
}, },
} }
}, },
},
} }
}, },
coverToggle = new ToggleCoverButton coverToggle = new ToggleCoverButton

8
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Input.Events;
using osu.Game.Extensions; using osu.Game.Extensions;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online; using osu.Game.Online;
@ -100,7 +101,10 @@ namespace osu.Game.Overlays
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
}; };
Add(sectionsContainer = new ProfileSectionsContainer Add(new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
Child = sectionsContainer = new ProfileSectionsContainer
{ {
ExpandableHeader = Header, ExpandableHeader = Header,
FixedHeader = tabs, FixedHeader = tabs,
@ -110,7 +114,9 @@ namespace osu.Game.Overlays
Colour = ColourProvider.Background5, Colour = ColourProvider.Background5,
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}, },
}
}); });
sectionsContainer.SelectedSection.ValueChanged += section => sectionsContainer.SelectedSection.ValueChanged += section =>
{ {
if (lastSection != section.NewValue) if (lastSection != section.NewValue)