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

Fix pairing line being incorrectly offset when scrolled

Browse Source
This commit is contained in:
Dean Herbert 2018-09-25 03:55:35 +09:00
parent fdccec06b3
commit 2bba426622
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Tournament/Screens/Ladder/LadderEditorInfo.cs Normal file
View File

@ -0,0 +1,18 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Configuration;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
namespace osu.Game.Tournament.Screens.Ladder
{
public class LadderEditorInfo
{
public readonly BindableBool EditingEnabled = new BindableBool();
public List<TournamentTeam> Teams = new List<TournamentTeam>();
public List<TournamentGrouping> Groupings = new List<TournamentGrouping>();
public readonly Bindable<MatchPairing> Selected = new Bindable<MatchPairing>();
}
}

24
osu.Game.Tournament/Screens/Ladder/LadderManager.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Caching; using osu.Framework.Caching;
using osu.Framework.Configuration;
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.Cursor;
@ -13,18 +12,12 @@ using osu.Framework.Input.States;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components; using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components; using osu.Game.Tournament.Screens.Ladder.Components;
using OpenTK;
using OpenTK.Graphics;
using SixLabors.Primitives; using SixLabors.Primitives;
namespace osu.Game.Tournament.Screens.Ladder namespace osu.Game.Tournament.Screens.Ladder
{ {
public class LadderEditorInfo
{
public readonly BindableBool EditingEnabled = new BindableBool();
public List<TournamentTeam> Teams = new List<TournamentTeam>();
public List<TournamentGrouping> Groupings = new List<TournamentGrouping>();
public readonly Bindable<MatchPairing> Selected = new Bindable<MatchPairing>();
}
public class LadderManager : CompositeDrawable, IHasContextMenu public class LadderManager : CompositeDrawable, IHasContextMenu
{ {
public readonly List<TournamentTeam> Teams; public readonly List<TournamentTeam> Teams;
@ -32,6 +25,8 @@ namespace osu.Game.Tournament.Screens.Ladder
private readonly Container<Path> paths; private readonly Container<Path> paths;
private readonly Container headings; private readonly Container headings;
private readonly ScrollableContainer scrollContent;
[Cached] [Cached]
private readonly LadderEditorInfo editorInfo = new LadderEditorInfo(); private readonly LadderEditorInfo editorInfo = new LadderEditorInfo();
@ -47,7 +42,7 @@ namespace osu.Game.Tournament.Screens.Ladder
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new ScrollableContainer scrollContent = new ScrollableContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
@ -202,7 +197,7 @@ namespace osu.Game.Tournament.Screens.Ladder
layout.Validate(); layout.Validate();
} }
public void RequestJoin(MatchPairing pairing, bool losers) => AddInternal(new JoinRequestHandler(pairingsContainer, pairing, losers)); public void RequestJoin(MatchPairing pairing, bool losers) => scrollContent.Add(new JoinRequestHandler(pairingsContainer, pairing, losers));
private class JoinRequestHandler : CompositeDrawable private class JoinRequestHandler : CompositeDrawable
{ {
@ -227,6 +222,8 @@ namespace osu.Game.Tournament.Screens.Ladder
private DrawableMatchPairing findTarget(InputState state) => pairingsContainer.FirstOrDefault(d => d.ReceiveMouseInputAt(state.Mouse.NativeState.Position)); private DrawableMatchPairing findTarget(InputState state) => pairingsContainer.FirstOrDefault(d => d.ReceiveMouseInputAt(state.Mouse.NativeState.Position));
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
protected override bool OnMouseMove(InputState state) protected override bool OnMouseMove(InputState state)
{ {
var found = findTarget(state); var found = findTarget(state);
@ -240,7 +237,10 @@ namespace osu.Game.Tournament.Screens.Ladder
if (found == null) if (found == null)
return false; return false;
AddInternal(path = new ProgressionPath(pairingsContainer.First(c => c.Pairing == Source), found) { Alpha = 0.4f }); AddInternal(path = new ProgressionPath(pairingsContainer.First(c => c.Pairing == Source), found)
{
Colour = Color4.Yellow,
});
return base.OnMouseMove(state); return base.OnMouseMove(state);
} }