Use explicit cast to OsuGame rather than in-between derived classes.

# Conflicts:
#	osu.Game/GameModes/Menu/MainMenu.cs
This commit is contained in:
Dean Herbert
2016-10-01 15:02:38 +09:00
parent 40e5a449bf
commit 5afb038025
8 changed files with 12 additions and 47 deletions

View File

@ -19,7 +19,7 @@ using OpenTK.Input;
namespace osu.Game.GameModes.Menu
{
public class ButtonSystem : OsuLargeContainer
public class ButtonSystem : LargeContainer
{
public Action OnEdit;
public Action OnExit;
@ -272,7 +272,7 @@ namespace osu.Game.GameModes.Menu
/// <summary>
/// osu! logo and its attachments (pulsing, visualiser etc.)
/// </summary>
class OsuLogo : OsuContainer
class OsuLogo : AutoSizeContainer
{
private Sprite logo;
private Container logoBounceContainer;
@ -392,7 +392,7 @@ namespace osu.Game.GameModes.Menu
/// Button designed specifically for the osu!next main menu.
/// In order to correctly flow, we have to use a negative margin on the parent container (due to the parallelogram shape).
/// </summary>
private class Button : OsuContainer
private class Button : AutoSizeContainer
{
private Container iconText;
private WedgedBox box;