h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 00:47:24 +08:00
Code Issues Releases Wiki Activity

CI fixes

Browse Source
This commit is contained in:
Andrei Zavatski 2019-08-19 21:25:14 +03:00
parent 6d84523bc0
commit 1bff103d32
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorDisplay.cs
View File

@ -13,6 +13,7 @@ using System.Collections.Generic;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Scoring;
using osu.Framework.MathUtils;
using osu.Framework.Graphics;
namespace osu.Game.Tests.Visual.Gameplay
{
@ -95,7 +96,11 @@ namespace osu.Game.Tests.Visual.Gameplay
private void recreateDisplay(HitWindows hitWindows, float overallDifficulty)
{
Clear();
Add(display = new DefaultHitErrorDisplay(overallDifficulty, hitWindows));
Add(display = new DefaultHitErrorDisplay(overallDifficulty, hitWindows)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
});
}
private void newJudgement(float offset = 0)

1
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;

2
osu.Game/Screens/Play/HitErrorDisplay/DefaultHitErrorDisplay.cs
View File

@ -37,8 +37,6 @@ namespace osu.Game.Screens.Play.HitErrorDisplay
: base(overallDifficulty, hitWindows)
{
AutoSizeAxes = Axes.Both;
Anchor = reversed ? Anchor.CentreRight : Anchor.CentreLeft;
Origin = reversed ? Anchor.CentreRight : Anchor.CentreLeft;
AddInternal(new FillFlowContainer
{

2
osu.Game/Screens/Play/HitErrorDisplay/HitErrorDisplay.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Screens.Play.HitErrorDisplay
{
protected readonly HitWindows HitWindows;
public HitErrorDisplay(float overallDifficulty, HitWindows hitWindows)
protected HitErrorDisplay(float overallDifficulty, HitWindows hitWindows)
{
HitWindows = hitWindows;
HitWindows.SetDifficulty(overallDifficulty);

9
osu.Game/Screens/Play/HitErrorDisplay/HitErrorDisplayOverlay.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Bindables;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Framework.Extensions.IEnumerableExtensions;
using System.Linq;
namespace osu.Game.Screens.Play.HitErrorDisplay
{
@ -29,11 +28,15 @@ namespace osu.Game.Screens.Play.HitErrorDisplay
{
new DefaultHitErrorDisplay(overallDifficulty, processor.CreateHitWindows())
{
Margin = new MarginPadding { Left = margin }
Margin = new MarginPadding { Left = margin },
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
},
new DefaultHitErrorDisplay(overallDifficulty, processor.CreateHitWindows(), true)
{
Margin = new MarginPadding { Right = margin }
Margin = new MarginPadding { Right = margin },
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
},
};