RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove new override in DialogButton

This commit is contained in:
DrabWeb 2017-02-27 21:38:25 -04:00
parent 164f205ee5
commit e8cae3b45e
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Graphics/UserInterface/DialogButton.cs
View File

@ -22,16 +22,16 @@ public class DialogButton : ClickableContainer
private const float glow_fade_duration = 250;
private const float click_duration = 200;
private Color4 colour;
public new Color4 Colour
private Color4 buttonColour;
public Color4 ButtonColour
{
get
{
return colour;
return buttonColour;
}
set
{
colour = value;
buttonColour = value;
updateGlow();
colourContainer.Colour = value;
}
@ -139,7 +139,7 @@ private void flash()
colourContainer.Add(flash);
flash.Colour = Colour;
flash.Colour = ButtonColour;
flash.BlendingMode = BlendingMode.Additive;
flash.Alpha = 0.3f;
flash.FadeOutFromOne(click_duration);
@ -148,9 +148,9 @@ private void flash()
private void updateGlow()
{
leftGlow.ColourInfo = ColourInfo.GradientHorizontal(new Color4(Colour.R, Colour.G, Colour.B, 0f), Colour);
centerGlow.Colour = Colour;
rightGlow.ColourInfo = ColourInfo.GradientHorizontal(Colour, new Color4(Colour.R, Colour.G, Colour.B, 0f));
leftGlow.ColourInfo = ColourInfo.GradientHorizontal(new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f), ButtonColour);
centerGlow.Colour = ButtonColour;
rightGlow.ColourInfo = ColourInfo.GradientHorizontal(ButtonColour, new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f));
}
public DialogButton()
@ -224,7 +224,7 @@ public DialogButton()
Colour = Color4.Black.Opacity(0.2f),
Radius = 5,
},
Colour = Colour,
Colour = ButtonColour,
Shear = new Vector2(0.2f, 0),
Children = new Drawable[]
{

2
osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
View File

@ -12,7 +12,7 @@ public class PopupDialogCancelButton : PopupDialogButton
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)
{
Colour = colours.Blue;
ButtonColour = colours.Blue;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback");
}

2
osu.Game/Overlays/Dialog/PopupDialogOKButton.cs
View File

@ -12,7 +12,7 @@ public class PopupDialogOkButton : PopupDialogButton
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)
{
Colour = colours.Pink;
ButtonColour = colours.Pink;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
}

2
osu.Game/Overlays/Pause/QuitButton.cs
View File

@ -14,7 +14,7 @@ public class QuitButton : DialogButton
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
Colour = new Color4(170, 27, 39, 255); // The red from the design isn't in the palette so it's used directly
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");
}

2
osu.Game/Overlays/Pause/ResumeButton.cs
View File

@ -13,7 +13,7 @@ public class ResumeButton : DialogButton
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
Colour = colours.Green;
ButtonColour = colours.Green;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback");
}

2
osu.Game/Overlays/Pause/RetryButton.cs
View File

@ -13,7 +13,7 @@ public class RetryButton : DialogButton
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
Colour = colours.YellowDark;
ButtonColour = colours.YellowDark;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
}