RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 10:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master with conflicts resolved

Browse Source
This commit is contained in:
Andrei Zavatski 2019-12-27 05:17:53 +03:00
commit 3ae0564db7
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
View File

@ -67,9 +67,7 @@ namespace osu.Game.Tests.Visual.UserInterface
AddRepeatStep(@"add many simple", sendManyNotifications, 3);
AddWaitStep("wait some", 5);
checkProgressingCount(0);
waitForCompletion();
AddStep(@"progress #3", sendUploadProgress);
@ -77,9 +75,7 @@ namespace osu.Game.Tests.Visual.UserInterface
checkDisplayedCount(33);
AddWaitStep("wait some", 10);
checkProgressingCount(0);
waitForCompletion();
}
[Test]
@ -109,9 +105,9 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep(@"background progress #1", sendBackgroundUploadProgress);
AddWaitStep("wait some", 5);
checkProgressingCount(1);
checkProgressingCount(0);
waitForCompletion();
checkDisplayedCount(2);
@ -190,6 +186,8 @@ namespace osu.Game.Tests.Visual.UserInterface
private void checkProgressingCount(int expected) => AddAssert($"progressing count is {expected}", () => progressingNotifications.Count == expected);
private void waitForCompletion() => AddUntilStep("wait for notification progress completion", () => progressingNotifications.Count == 0);
private void sendBarrage()
{
switch (RNG.Next(0, 4))

9
osu.Game/Graphics/UserInterface/ScreenTitle.cs
View File

@ -80,17 +80,12 @@ namespace osu.Game.Graphics.UserInterface
Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
Margin = new MarginPadding { Bottom = text_offset }
},
new CircularContainer
new Circle
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Masking = true,
Size = new Vector2(4),
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Gray,
}
Colour = Color4.Gray,
},
pageText = new OsuSpriteText
{