h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 05:39:53 +08:00
Code Issues Releases Wiki Activity

Rename RestoreDefaultValueButton to RevertToDefaultButton

Browse Source 
Because I can't find it every time I search.
This commit is contained in:
Dean Herbert
2023-07-13 13:46:50 +09:00
Unverified
parent a891dcd9e6
commit 1bfe5a18cb
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+5 -5
View File
@@ -195,16 +195,16 @@ namespace osu.Game.Tests.Visual.Settings
InputManager.ReleaseKey(Key.P); InputManager.ReleaseKey(Key.P);
}); });
AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha > 0); AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha > 0);
AddStep("click reset button for bindings", () => AddStep("click reset button for bindings", () =>
{ {
var resetButton = settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First(); var resetButton = settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First();
resetButton.TriggerClick(); resetButton.TriggerClick();
}); });
AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha == 0); AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha == 0);
AddAssert("binding cleared", AddAssert("binding cleared",
() => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0))); () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
@@ -225,7 +225,7 @@ namespace osu.Game.Tests.Visual.Settings
InputManager.ReleaseKey(Key.P); InputManager.ReleaseKey(Key.P);
}); });
AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha > 0); AddUntilStep("restore button shown", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha > 0);
AddStep("click reset button for bindings", () => AddStep("click reset button for bindings", () =>
{ {
@@ -234,7 +234,7 @@ namespace osu.Game.Tests.Visual.Settings
resetButton.TriggerClick(); resetButton.TriggerClick();
}); });
AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RestoreDefaultValueButton<bool>>().First().Alpha == 0); AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha == 0);
AddAssert("binding cleared", AddAssert("binding cleared",
() => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0))); () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
osu.Game.Tests/Visual/Settings/TestSceneRestoreDefaultValueButton.cs → osu.Game.Tests/Visual/Settings/TestSceneRevertToDefaultButton.cs
+5 -5
View File
@@ -15,7 +15,7 @@ using osuTK;
namespace osu.Game.Tests.Visual.Settings namespace osu.Game.Tests.Visual.Settings
{ {
public partial class TestSceneRestoreDefaultValueButton : OsuTestScene public partial class TestSceneRevertToDefaultButton : OsuTestScene
{ {
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Settings
[Test] [Test]
public void TestBasic() public void TestBasic()
{ {
RestoreDefaultValueButton<float> restoreDefaultValueButton = null; RevertToDefaultButton<float> revertToDefaultButton = null;
AddStep("create button", () => Child = new Container AddStep("create button", () => Child = new Container
{ {
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Settings
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colours.GreySeaFoam Colour = colours.GreySeaFoam
}, },
restoreDefaultValueButton = new RestoreDefaultValueButton<float> revertToDefaultButton = new RevertToDefaultButton<float>
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@@ -55,8 +55,8 @@ namespace osu.Game.Tests.Visual.Settings
AddSliderStep("set scale", 1, 4, 1, scale => AddSliderStep("set scale", 1, 4, 1, scale =>
{ {
this.scale = scale; this.scale = scale;
if (restoreDefaultValueButton != null) if (revertToDefaultButton != null)
restoreDefaultValueButton.Scale = new Vector2(scale); revertToDefaultButton.Scale = new Vector2(scale);
}); });
AddToggleStep("toggle default state", state => current.Value = state ? default : 1); AddToggleStep("toggle default state", state => current.Value = state ? default : 1);
AddToggleStep("toggle disabled state", state => current.Disabled = state); AddToggleStep("toggle disabled state", state => current.Disabled = state);
osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
+17 -17
View File
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Settings
public void TestRestoreDefaultValueButtonVisibility() public void TestRestoreDefaultValueButtonVisibility()
{ {
SettingsTextBox textBox = null; SettingsTextBox textBox = null;
RestoreDefaultValueButton<string> restoreDefaultValueButton = null; RevertToDefaultButton<string> revertToDefaultButton = null;
AddStep("create settings item", () => AddStep("create settings item", () =>
{ {
@@ -33,22 +33,22 @@ namespace osu.Game.Tests.Visual.Settings
}; };
}); });
AddUntilStep("wait for loaded", () => textBox.IsLoaded); AddUntilStep("wait for loaded", () => textBox.IsLoaded);
AddStep("retrieve restore default button", () => restoreDefaultValueButton = textBox.ChildrenOfType<RestoreDefaultValueButton<string>>().Single()); AddStep("retrieve restore default button", () => revertToDefaultButton = textBox.ChildrenOfType<RevertToDefaultButton<string>>().Single());
AddAssert("restore button hidden", () => restoreDefaultValueButton.Alpha == 0); AddAssert("restore button hidden", () => revertToDefaultButton.Alpha == 0);
AddStep("change value from default", () => textBox.Current.Value = "non-default"); AddStep("change value from default", () => textBox.Current.Value = "non-default");
AddUntilStep("restore button shown", () => restoreDefaultValueButton.Alpha > 0); AddUntilStep("restore button shown", () => revertToDefaultButton.Alpha > 0);
AddStep("restore default", () => textBox.Current.SetDefault()); AddStep("restore default", () => textBox.Current.SetDefault());
AddUntilStep("restore button hidden", () => restoreDefaultValueButton.Alpha == 0); AddUntilStep("restore button hidden", () => revertToDefaultButton.Alpha == 0);
} }
[Test] [Test]
public void TestSetAndClearLabelText() public void TestSetAndClearLabelText()
{ {
SettingsTextBox textBox = null; SettingsTextBox textBox = null;
RestoreDefaultValueButton<string> restoreDefaultValueButton = null; RevertToDefaultButton<string> revertToDefaultButton = null;
OsuTextBox control = null; OsuTextBox control = null;
AddStep("create settings item", () => AddStep("create settings item", () =>
@@ -61,25 +61,25 @@ namespace osu.Game.Tests.Visual.Settings
AddUntilStep("wait for loaded", () => textBox.IsLoaded); AddUntilStep("wait for loaded", () => textBox.IsLoaded);
AddStep("retrieve components", () => AddStep("retrieve components", () =>
{ {
restoreDefaultValueButton = textBox.ChildrenOfType<RestoreDefaultValueButton<string>>().Single(); revertToDefaultButton = textBox.ChildrenOfType<RevertToDefaultButton<string>>().Single();
control = textBox.ChildrenOfType<OsuTextBox>().Single(); control = textBox.ChildrenOfType<OsuTextBox>().Single();
}); });
AddStep("set non-default value", () => restoreDefaultValueButton.Current.Value = "non-default"); AddStep("set non-default value", () => revertToDefaultButton.Current.Value = "non-default");
AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, control.DrawHeight, 1)); AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
AddStep("set label", () => textBox.LabelText = "label text"); AddStep("set label", () => textBox.LabelText = "label text");
AddAssert("default value button centre aligned to label size", () => AddAssert("default value button centre aligned to label size", () =>
{ {
var label = textBox.ChildrenOfType<OsuSpriteText>().Single(spriteText => spriteText.Text == "label text"); var label = textBox.ChildrenOfType<OsuSpriteText>().Single(spriteText => spriteText.Text == "label text");
return Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, label.DrawHeight, 1); return Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, label.DrawHeight, 1);
}); });
AddStep("clear label", () => textBox.LabelText = default); AddStep("clear label", () => textBox.LabelText = default);
AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, control.DrawHeight, 1)); AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
AddStep("set warning text", () => textBox.SetNoticeText("This is some very important warning text! Hopefully it doesn't break the alignment of the default value indicator...", true)); AddStep("set warning text", () => textBox.SetNoticeText("This is some very important warning text! Hopefully it doesn't break the alignment of the default value indicator...", true));
AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(restoreDefaultValueButton.Parent.DrawHeight, control.DrawHeight, 1)); AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
} }
/// <summary> /// <summary>
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Settings
{ {
BindableFloat current = null; BindableFloat current = null;
SettingsSlider<float> sliderBar = null; SettingsSlider<float> sliderBar = null;
RestoreDefaultValueButton<float> restoreDefaultValueButton = null; RevertToDefaultButton<float> revertToDefaultButton = null;
AddStep("create settings item", () => AddStep("create settings item", () =>
{ {
@@ -107,15 +107,15 @@ namespace osu.Game.Tests.Visual.Settings
}; };
}); });
AddUntilStep("wait for loaded", () => sliderBar.IsLoaded); AddUntilStep("wait for loaded", () => sliderBar.IsLoaded);
AddStep("retrieve restore default button", () => restoreDefaultValueButton = sliderBar.ChildrenOfType<RestoreDefaultValueButton<float>>().Single()); AddStep("retrieve restore default button", () => revertToDefaultButton = sliderBar.ChildrenOfType<RevertToDefaultButton<float>>().Single());
AddAssert("restore button hidden", () => restoreDefaultValueButton.Alpha == 0); AddAssert("restore button hidden", () => revertToDefaultButton.Alpha == 0);
AddStep("change value to next closest", () => sliderBar.Current.Value += current.Precision * 0.6f); AddStep("change value to next closest", () => sliderBar.Current.Value += current.Precision * 0.6f);
AddUntilStep("restore button shown", () => restoreDefaultValueButton.Alpha > 0); AddUntilStep("restore button shown", () => revertToDefaultButton.Alpha > 0);
AddStep("restore default", () => sliderBar.Current.SetDefault()); AddStep("restore default", () => sliderBar.Current.SetDefault());
AddUntilStep("restore button hidden", () => restoreDefaultValueButton.Alpha == 0); AddUntilStep("restore button hidden", () => revertToDefaultButton.Alpha == 0);
} }
[Test] [Test]
osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+1 -1
View File
@@ -793,7 +793,7 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick()); AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick());
AddStep("reset half time speed to default", () => modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single() AddStep("reset half time speed to default", () => modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single()
.ChildrenOfType<RestoreDefaultValueButton<double>>().Single().TriggerClick()); .ChildrenOfType<RevertToDefaultButton<double>>().Single().TriggerClick());
AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7)); AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
} }
osu.Game/Overlays/RestoreDefaultValueButton.cs → osu.Game/Overlays/RevertToDefaultButton.cs
+2 -2
View File
@@ -22,7 +22,7 @@ using osu.Game.Localisation;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public partial class RestoreDefaultValueButton<T> : OsuClickableContainer, IHasCurrentValue<T> public partial class RevertToDefaultButton<T> : OsuClickableContainer, IHasCurrentValue<T>
{ {
public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks; public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays
private CircularContainer circle = null!; private CircularContainer circle = null!;
private Box background = null!; private Box background = null!;
public RestoreDefaultValueButton() public RevertToDefaultButton()
: base(HoverSampleSet.Button) : base(HoverSampleSet.Button)
{ {
} }
osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+1 -1
View File
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = SettingsPanel.CONTENT_MARGINS, Width = SettingsPanel.CONTENT_MARGINS,
Child = new RestoreDefaultValueButton<bool> Child = new RevertToDefaultButton<bool>
{ {
Current = isDefault, Current = isDefault,
Action = RestoreDefaults, Action = RestoreDefaults,
osu.Game/Overlays/Settings/SettingsItem.cs
+1 -1
View File
@@ -217,7 +217,7 @@ namespace osu.Game.Overlays.Settings
// intentionally done before LoadComplete to avoid overhead. // intentionally done before LoadComplete to avoid overhead.
if (ShowsDefaultIndicator) if (ShowsDefaultIndicator)
{ {
defaultValueIndicatorContainer.Add(new RestoreDefaultValueButton<T> defaultValueIndicatorContainer.Add(new RevertToDefaultButton<T>
{ {
Current = controlWithCurrent.Current, Current = controlWithCurrent.Current,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,