sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix vertical offset not being handled correctly during score panel detach process

Browse Source
This commit is contained in:
Dean Herbert
2021-08-13 16:14:23 +09:00
parent 732dcd30c7
commit f9f3339885
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerTeamResultsScreen.cs
View File

@ -46,9 +46,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{ {
const float winner_background_half_height = 250; const float winner_background_half_height = 250;
ScorePanelList.Anchor = ScorePanelList.Origin = Anchor.TopCentre; VerticalScrollContent.Anchor = VerticalScrollContent.Origin = Anchor.TopCentre;
ScorePanelList.Scale = new Vector2(0.9f); VerticalScrollContent.Scale = new Vector2(0.9f);
ScorePanelList.Y = 75; VerticalScrollContent.Y = 75;
var redScore = teamScores.First().Value; var redScore = teamScores.First().Value;
var blueScore = teamScores.Last().Value; var blueScore = teamScores.Last().Value;

8
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@ -40,6 +40,8 @@ namespace osu.Game.Screens.Ranking
protected ScorePanelList ScorePanelList { get; private set; } protected ScorePanelList ScorePanelList { get; private set; }
protected VerticalScrollContainer VerticalScrollContent { get; private set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private Player player { get; set; } private Player player { get; set; }
@ -77,7 +79,7 @@ namespace osu.Game.Screens.Ranking
{ {
new Drawable[] new Drawable[]
{ {
new VerticalScrollContainer VerticalScrollContent = new VerticalScrollContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
ScrollbarVisible = false, ScrollbarVisible = false,
@ -343,7 +345,7 @@ namespace osu.Game.Screens.Ranking
{ {
} }
private class VerticalScrollContainer : OsuScrollContainer protected class VerticalScrollContainer : OsuScrollContainer
{ {
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
@ -351,6 +353,8 @@ namespace osu.Game.Screens.Ranking
public VerticalScrollContainer() public VerticalScrollContainer()
{ {
Masking = false;
base.Content.Add(content = new Container { RelativeSizeAxes = Axes.X }); base.Content.Add(content = new Container { RelativeSizeAxes = Axes.X });
} }