h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 15:43:21 +08:00
Code Issues Releases Wiki Activity

Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses

Browse Source
This commit is contained in:
DrabWeb 2017-01-30 08:04:39 -04:00
parent dcb02eff65
commit ed3ed8251f
6 changed files with 105 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
osu.Game/Overlays/Pause/PauseButton.cs
View File

@ -1,13 +1,10 @@
using System;
using OpenTK;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Containers;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
@ -21,37 +18,41 @@ namespace osu.Game.Overlays.Pause
private const float colourExpandTime = 500;
private Vector2 colourShear = new Vector2(0.2f, 0);
private Color4 buttonColour;
private Color4 backgroundColour = OsuColour.Gray(34);
private AudioSample sampleClick;
private AudioSample sampleHover;
public PauseButtonType Type;
private Color4 buttonColour;
public Color4 ButtonColour
{
get
{
return buttonColour;
}
set
{
buttonColour = value;
if (colourContainer == null) return;
colourContainer.Colour = ButtonColour;
}
}
private string text;
public string Text
{
get
{
switch (Type)
{
case PauseButtonType.Resume:
return "Continue";
case PauseButtonType.Retry:
return "Retry";
case PauseButtonType.Quit:
return "Quit to Main Menu";
default:
return "Unknown";
}
return text;
}
set
{
text = value;
if (spriteText == null) return;
spriteText.Text = Text;
}
}
private Container backgroundContainer, colourContainer, glowContainer;
public AudioSample SampleClick, SampleHover;
private Container backgroundContainer, colourContainer, glowContainer;
private SpriteText spriteText;
private bool didClick; // Used for making sure that the OnMouseDown animation can call instead of OnHoverLost's
@ -62,7 +63,7 @@ namespace osu.Game.Overlays.Pause
{
didClick = true;
colourContainer.ResizeTo(new Vector2(1.5f, 1f), 200, EasingTypes.In);
sampleClick?.Play();
SampleClick?.Play();
Action?.Invoke();
Delay(200);
@ -82,7 +83,7 @@ namespace osu.Game.Overlays.Pause
colourContainer.ResizeTo(new Vector2(colourExpandedWidth, 1f), colourExpandTime, EasingTypes.OutElastic);
spriteText.TransformSpacingTo(new Vector2(3f, 0f), colourExpandTime, EasingTypes.OutElastic);
glowContainer.FadeTo(1f, colourExpandTime / 2, EasingTypes.Out);
sampleHover?.Play();
SampleHover?.Play();
return true;
}
@ -98,30 +99,8 @@ namespace osu.Game.Overlays.Pause
didClick = false;
}
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
public PauseButton()
{
switch (Type)
{
case PauseButtonType.Resume:
buttonColour = colours.Green;
sampleClick = audio.Sample.Get(@"Menu/menuback");
break;
case PauseButtonType.Retry:
buttonColour = colours.YellowDark;
sampleClick = audio.Sample.Get(@"Menu/menu-play-click");
break;
case PauseButtonType.Quit:
// The red from the design isn't in the palette so it's used directly
buttonColour = new Color4(170, 27, 39, 255);
sampleClick = audio.Sample.Get(@"Menu/menuback");
break;
}
sampleHover = audio.Sample.Get(@"Menu/menuclick");
Add(new Drawable[]
{
backgroundContainer = new Container
@ -150,7 +129,7 @@ namespace osu.Game.Overlays.Pause
Origin = Anchor.TopLeft,
Anchor = Anchor.TopLeft,
Width = 0.125f,
ColourInfo = ColourInfo.GradientHorizontal(new Color4(buttonColour.R, buttonColour.G, buttonColour.B, 0f), buttonColour)
ColourInfo = ColourInfo.GradientHorizontal(new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f), ButtonColour)
},
new Box
{
@ -158,7 +137,7 @@ namespace osu.Game.Overlays.Pause
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Width = 0.75f,
Colour = buttonColour
Colour = ButtonColour
},
new Box
{
@ -166,7 +145,7 @@ namespace osu.Game.Overlays.Pause
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
Width = 0.125f,
ColourInfo = ColourInfo.GradientHorizontal(buttonColour, new Color4(buttonColour.R, buttonColour.G, buttonColour.B, 0f))
ColourInfo = ColourInfo.GradientHorizontal(ButtonColour, new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f))
}
}
},
@ -191,7 +170,7 @@ namespace osu.Game.Overlays.Pause
Colour = Color4.Black.Opacity(0.2f),
Radius = 5
},
Colour = buttonColour,
Colour = ButtonColour,
Shear = colourShear,
Children = new Drawable[]
{
@ -225,17 +204,5 @@ namespace osu.Game.Overlays.Pause
}
});
}
public PauseButton()
{
}
}
public enum PauseButtonType
{
Resume,
Retry,
Quit
}
}

9
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -109,9 +109,8 @@ namespace osu.Game.Overlays.Pause
},
Children = new Drawable[]
{
new PauseButton
new ResumeButton
{
Type = PauseButtonType.Resume,
RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
@ -122,9 +121,8 @@ namespace osu.Game.Overlays.Pause
Task.Delay(fadeDuration * 2).ContinueWith(task => OnResume?.Invoke());
}),
},
new PauseButton
new RetryButton
{
Type = PauseButtonType.Retry,
RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
@ -135,9 +133,8 @@ namespace osu.Game.Overlays.Pause
OnRetry?.Invoke();
}),
},
new PauseButton
new QuitButton
{
Type = PauseButtonType.Quit,
RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,

23
osu.Game/Overlays/Pause/QuitButton.cs Normal file
View File

@ -0,0 +1,23 @@
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Pause
{
public class QuitButton : PauseButton
{
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
ButtonColour = new Color4(170, 27, 39, 255); // The red from the design isn't in the palette so it's used directly
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback");
}
public QuitButton()
{
Text = @"Quit to Main Menu";
}
}
}

22
osu.Game/Overlays/Pause/ResumeButton.cs Normal file
View File

@ -0,0 +1,22 @@
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Pause
{
public class ResumeButton : PauseButton
{
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
ButtonColour = colours.Green;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback");
}
public ResumeButton()
{
Text = @"Continue";
}
}
}

22
osu.Game/Overlays/Pause/RetryButton.cs Normal file
View File

@ -0,0 +1,22 @@
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Pause
{
public class RetryButton : PauseButton
{
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
ButtonColour = colours.YellowDark;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
}
public RetryButton()
{
Text = @"Retry";
}
}
}

3
osu.Game/osu.Game.csproj
View File

@ -240,6 +240,9 @@
<Compile Include="Overlays\Pause\PauseOverlay.cs" />
<Compile Include="Overlays\Pause\PauseProgressBar.cs" />
<Compile Include="Overlays\Pause\PauseProgressGraph.cs" />
<Compile Include="Overlays\Pause\ResumeButton.cs" />
<Compile Include="Overlays\Pause\RetryButton.cs" />
<Compile Include="Overlays\Pause\QuitButton.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">