RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-05 19:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conform to naming conventions

Browse Source
This commit is contained in:
DrabWeb 2017-02-27 20:55:10 -04:00
parent 34ba3129a3
commit b3a231185b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Desktop.VisualTests/Tests/TestCasePopupDialog.cs
View File

@ -26,7 +26,7 @@ namespace osu.Desktop.VisualTests.Tests
BodyText = @"Ayase Rie - Yuima-ru*World TVver.",
Buttons = new PopupDialogButton[]
{
new PopupDialogOKButton
new PopupDialogOkButton
{
Text = @"I never want to see this again.",
Action = () => System.Console.WriteLine(@"OK"),
@ -46,23 +46,23 @@ namespace osu.Desktop.VisualTests.Tests
BodyText = "Camellia as \"Bang Riot\" - Blastix Riotz",
Buttons = new PopupDialogButton[]
{
new PopupDialogOKButton
new PopupDialogOkButton
{
Text = @"Manage collections",
},
new PopupDialogOKButton
new PopupDialogOkButton
{
Text = @"Delete...",
},
new PopupDialogOKButton
new PopupDialogOkButton
{
Text = @"Remove from unplayed",
},
new PopupDialogOKButton
new PopupDialogOkButton
{
Text = @"Clear local scores",
},
new PopupDialogOKButton
new PopupDialogOkButton
{
Text = @"Edit",
},

16
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -21,9 +21,9 @@ namespace osu.Game.Overlays.Dialog
{
private const float enter_duration = 500;
private const float exit_duration = 200;
private readonly Vector2 ring_size = new Vector2(100f);
private readonly Vector2 ring_minified_size = new Vector2(20f);
private readonly Vector2 buttons_spacing = new Vector2(0f, 50f);
private readonly Vector2 ringSize = new Vector2(100f);
private readonly Vector2 ringMinifiedSize = new Vector2(20f);
private readonly Vector2 buttonsEnterSpacing = new Vector2(0f, 50f);
private Container content, ring;
private FlowContainer<PopupDialogButton> buttonsContainer;
@ -92,13 +92,13 @@ namespace osu.Game.Overlays.Dialog
// Reset various animations but only if the dialog animation fully completed
if (content.Alpha == 0)
{
buttonsContainer.TransformSpacingTo(buttons_spacing);
buttonsContainer.MoveToY(buttons_spacing.Y);
ring.ResizeTo(ring_minified_size);
buttonsContainer.TransformSpacingTo(buttonsEnterSpacing);
buttonsContainer.MoveToY(buttonsEnterSpacing.Y);
ring.ResizeTo(ringMinifiedSize);
}
content.FadeIn(enter_duration, EasingTypes.OutQuint);
ring.ResizeTo(ring_size, enter_duration, EasingTypes.OutQuint);
ring.ResizeTo(ringSize, enter_duration, EasingTypes.OutQuint);
buttonsContainer.TransformSpacingTo(Vector2.Zero, enter_duration, EasingTypes.OutQuint);
buttonsContainer.MoveToY(0, enter_duration, EasingTypes.OutQuint);
}
@ -161,7 +161,7 @@ namespace osu.Game.Overlays.Dialog
{
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Size = ring_size,
Size = ringSize,
Margin = new MarginPadding
{
Bottom = 30,

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

@ -7,7 +7,7 @@ using osu.Game.Graphics;
namespace osu.Game.Overlays.Dialog
{
public class PopupDialogOKButton : PopupDialogButton
public class PopupDialogOkButton : PopupDialogButton
{
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)