sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove new override in DialogButton

Browse Source
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 @@ namespace osu.Game.Graphics.UserInterface
private const float glow_fade_duration = 250; private const float glow_fade_duration = 250;
private const float click_duration = 200; private const float click_duration = 200;
private Color4 colour; private Color4 buttonColour;
public new Color4 Colour public Color4 ButtonColour
{ {
get get
{ {
return colour; return buttonColour;
} }
set set
{ {
colour = value; buttonColour = value;
updateGlow(); updateGlow();
colourContainer.Colour = value; colourContainer.Colour = value;
} }
@ -139,7 +139,7 @@ namespace osu.Game.Graphics.UserInterface
colourContainer.Add(flash); colourContainer.Add(flash);
flash.Colour = Colour; flash.Colour = ButtonColour;
flash.BlendingMode = BlendingMode.Additive; flash.BlendingMode = BlendingMode.Additive;
flash.Alpha = 0.3f; flash.Alpha = 0.3f;
flash.FadeOutFromOne(click_duration); flash.FadeOutFromOne(click_duration);
@ -148,9 +148,9 @@ namespace osu.Game.Graphics.UserInterface
private void updateGlow() private void updateGlow()
{ {
leftGlow.ColourInfo = ColourInfo.GradientHorizontal(new Color4(Colour.R, Colour.G, Colour.B, 0f), Colour); leftGlow.ColourInfo = ColourInfo.GradientHorizontal(new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f), ButtonColour);
centerGlow.Colour = Colour; centerGlow.Colour = ButtonColour;
rightGlow.ColourInfo = ColourInfo.GradientHorizontal(Colour, new Color4(Colour.R, Colour.G, Colour.B, 0f)); rightGlow.ColourInfo = ColourInfo.GradientHorizontal(ButtonColour, new Color4(ButtonColour.R, ButtonColour.G, ButtonColour.B, 0f));
} }
public DialogButton() public DialogButton()
@ -224,7 +224,7 @@ namespace osu.Game.Graphics.UserInterface
Colour = Color4.Black.Opacity(0.2f), Colour = Color4.Black.Opacity(0.2f),
Radius = 5, Radius = 5,
}, },
Colour = Colour, Colour = ButtonColour,
Shear = new Vector2(0.2f, 0), Shear = new Vector2(0.2f, 0),
Children = new Drawable[] Children = new Drawable[]
{ {

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

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Dialog
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio) private void load(OsuColour colours, AudioManager audio)
{ {
Colour = colours.Blue; ButtonColour = colours.Blue;
SampleHover = audio.Sample.Get(@"Menu/menuclick"); SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback"); SampleClick = audio.Sample.Get(@"Menu/menuback");
} }

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

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Dialog
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio) private void load(OsuColour colours, AudioManager audio)
{ {
Colour = colours.Pink; ButtonColour = colours.Pink;
SampleHover = audio.Sample.Get(@"Menu/menuclick"); SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menu-play-click"); SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
} }

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

@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Pause
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours) 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"); SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback"); SampleClick = audio.Sample.Get(@"Menu/menuback");
} }

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

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Pause
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours) private void load(AudioManager audio, OsuColour colours)
{ {
Colour = colours.Green; ButtonColour = colours.Green;
SampleHover = audio.Sample.Get(@"Menu/menuclick"); SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback"); SampleClick = audio.Sample.Get(@"Menu/menuback");
} }

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

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Pause
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours) private void load(AudioManager audio, OsuColour colours)
{ {
Colour = colours.YellowDark; ButtonColour = colours.YellowDark;
SampleHover = audio.Sample.Get(@"Menu/menuclick"); SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menu-play-click"); SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
} }