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

Merge pull request #24356 from peppy/fix-scheduler-screen-selection-alignment

Browse Source 
Fix misalignment of selection box on schedule screen
This commit is contained in:
Bartłomiej Dach 2023-07-25 19:21:56 +02:00 committed by GitHub
commit a6da45a99b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
private readonly bool editor; private readonly bool editor;
protected readonly FillFlowContainer<DrawableMatchTeam> Flow; protected readonly FillFlowContainer<DrawableMatchTeam> Flow;
private readonly Drawable selectionBox; private readonly Drawable selectionBox;
protected readonly Drawable CurrentMatchSelectionBox; private readonly Drawable currentMatchSelectionBox;
private Bindable<TournamentMatch> globalSelection; private Bindable<TournamentMatch> globalSelection;
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
Padding = new MarginPadding(-(spacing + border_thickness)), Padding = new MarginPadding(-(spacing + border_thickness)),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Child = CurrentMatchSelectionBox = new Container Child = currentMatchSelectionBox = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
@ -151,9 +151,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
private void updateCurrentMatch() private void updateCurrentMatch()
{ {
if (Match.Current.Value) if (Match.Current.Value)
CurrentMatchSelectionBox.Show(); currentMatchSelectionBox.Show();
else else
CurrentMatchSelectionBox.Hide(); currentMatchSelectionBox.Hide();
} }
private bool selected; private bool selected;

2
osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
View File

@ -218,8 +218,6 @@ namespace osu.Game.Tournament.Screens.Schedule
Scale = new Vector2(0.8f); Scale = new Vector2(0.8f);
CurrentMatchSelectionBox.Scale = new Vector2(1.02f, 1.15f);
bool conditional = match is ConditionalTournamentMatch; bool conditional = match is ConditionalTournamentMatch;
if (conditional) if (conditional)