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

Merge branch 'master' of https://github.com/ppy/osu into tourney-asset-refactor

Browse Source
This commit is contained in:
Shivam
2020-06-22 12:01:24 +02:00
parent f878388d57 12c3b086a4
commit 291dadf0b2
136 changed files with 2242 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Tournament/Components/IPCErrorDialog.cs Normal file
View File

@ -0,0 +1,26 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics.Sprites;
using osu.Game.Overlays.Dialog;
namespace osu.Game.Tournament.Components
{
public class IPCErrorDialog : PopupDialog
{
public IPCErrorDialog(string headerText, string bodyText)
{
Icon = FontAwesome.Regular.SadTear;
HeaderText = headerText;
BodyText = bodyText;
Buttons = new PopupDialogButton[]
{
new PopupDialogOkButton
{
Text = @"Alright.",
Action = () => Expire()
}
};
}
}
}

2
osu.Game.Tournament/Components/SongBar.cs
View File

@ -77,6 +77,8 @@ namespace osu.Game.Tournament.Components
flow = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
// Todo: This is a hack for https://github.com/ppy/osu-framework/issues/3617 since this container is at the very edge of the screen and potentially initially masked away.
Height = 1,
AutoSizeAxes = Axes.Y,
LayoutDuration = 500,
LayoutEasing = Easing.OutQuint,