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

Use more generic wording for future-proofing

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-02-19 15:06:40 +01:00
parent 8b25598d82
commit d9ca7102f0
No known key found for this signature in database
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Mania.Tests/Editor/TestSceneObjectPlacement.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
double? initialTime = null; double? initialTime = null;
AddStep("store initial time", () => initialTime = EditorClock.CurrentTime); AddStep("store initial time", () => initialTime = EditorClock.CurrentTime);
AddStep("change seek setting to true", () => config.SetValue(OsuSetting.EditorSeekToHitObject, true)); AddStep("change seek setting to true", () => config.SetValue(OsuSetting.EditorAutoSeekOnPlacement, true));
placeObject(); placeObject();
AddUntilStep("wait for seek to complete", () => !EditorClock.IsSeeking); AddUntilStep("wait for seek to complete", () => !EditorClock.IsSeeking);
AddAssert("seeked forward to object", () => EditorClock.CurrentTime, () => Is.GreaterThan(initialTime)); AddAssert("seeked forward to object", () => EditorClock.CurrentTime, () => Is.GreaterThan(initialTime));
@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
double? initialTime = null; double? initialTime = null;
AddStep("store initial time", () => initialTime = EditorClock.CurrentTime); AddStep("store initial time", () => initialTime = EditorClock.CurrentTime);
AddStep("change seek setting to false", () => config.SetValue(OsuSetting.EditorSeekToHitObject, false)); AddStep("change seek setting to false", () => config.SetValue(OsuSetting.EditorAutoSeekOnPlacement, false));
placeObject(); placeObject();
AddAssert("not seeking", () => !EditorClock.IsSeeking); AddAssert("not seeking", () => !EditorClock.IsSeeking);
AddAssert("time is unchanged", () => EditorClock.CurrentTime, () => Is.EqualTo(initialTime)); AddAssert("time is unchanged", () => EditorClock.CurrentTime, () => Is.EqualTo(initialTime));

4
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -178,7 +178,7 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.EditorDim, 0.25f, 0f, 0.75f, 0.25f); SetDefault(OsuSetting.EditorDim, 0.25f, 0f, 0.75f, 0.25f);
SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f, 0f, 1f, 0.25f); SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f, 0f, 1f, 0.25f);
SetDefault(OsuSetting.EditorShowHitMarkers, true); SetDefault(OsuSetting.EditorShowHitMarkers, true);
SetDefault(OsuSetting.EditorSeekToHitObject, true); SetDefault(OsuSetting.EditorAutoSeekOnPlacement, true);
SetDefault(OsuSetting.LastProcessedMetadataId, -1); SetDefault(OsuSetting.LastProcessedMetadataId, -1);
@ -375,7 +375,7 @@ namespace osu.Game.Configuration
SeasonalBackgroundMode, SeasonalBackgroundMode,
EditorWaveformOpacity, EditorWaveformOpacity,
EditorShowHitMarkers, EditorShowHitMarkers,
EditorSeekToHitObject, EditorAutoSeekOnPlacement,
DiscordRichPresence, DiscordRichPresence,
AutomaticallyDownloadWhenSpectating, AutomaticallyDownloadWhenSpectating,
ShowOnlineExplicitContent, ShowOnlineExplicitContent,

4
osu.Game/Localisation/EditorStrings.cs
View File

@ -20,9 +20,9 @@ namespace osu.Game.Localisation
public static LocalisableString ShowHitMarkers => new TranslatableString(getKey(@"show_hit_markers"), @"Show hit markers"); public static LocalisableString ShowHitMarkers => new TranslatableString(getKey(@"show_hit_markers"), @"Show hit markers");
/// <summary> /// <summary>
/// "Seek to object after placement" /// "Automatically seek after placing objects"
/// </summary> /// </summary>
public static LocalisableString SeekToHitObject => new TranslatableString(getKey(@"seek_to_hit_object"), @"Seek to object after placement"); public static LocalisableString AutoSeekOnPlacement => new TranslatableString(getKey(@"auto_seek_on_placement"), @"Automatically seek after placing objects");
/// <summary> /// <summary>
/// "Timing" /// "Timing"

6
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Edit
private FillFlowContainer togglesCollection; private FillFlowContainer togglesCollection;
private IBindable<bool> hasTiming; private IBindable<bool> hasTiming;
private Bindable<bool> seekToHitObject; private Bindable<bool> autoSeekOnPlacement;
protected HitObjectComposer(Ruleset ruleset) protected HitObjectComposer(Ruleset ruleset)
: base(ruleset) : base(ruleset)
@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Edit
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuConfigManager config) private void load(OverlayColourProvider colourProvider, OsuConfigManager config)
{ {
seekToHitObject = config.GetBindable<bool>(OsuSetting.EditorSeekToHitObject); autoSeekOnPlacement = config.GetBindable<bool>(OsuSetting.EditorAutoSeekOnPlacement);
Config = Dependencies.Get<IRulesetConfigCache>().GetConfigFor(Ruleset); Config = Dependencies.Get<IRulesetConfigCache>().GetConfigFor(Ruleset);
@ -369,7 +369,7 @@ namespace osu.Game.Rulesets.Edit
{ {
EditorBeatmap.Add(hitObject); EditorBeatmap.Add(hitObject);
if (seekToHitObject.Value && EditorClock.CurrentTime < hitObject.StartTime) if (autoSeekOnPlacement.Value && EditorClock.CurrentTime < hitObject.StartTime)
EditorClock.SeekSmoothlyTo(hitObject.StartTime); EditorClock.SeekSmoothlyTo(hitObject.StartTime);
} }
} }

8
osu.Game/Screens/Edit/Editor.cs
View File

@ -185,7 +185,7 @@ namespace osu.Game.Screens.Edit
private Bindable<float> editorBackgroundDim; private Bindable<float> editorBackgroundDim;
private Bindable<bool> editorHitMarkers; private Bindable<bool> editorHitMarkers;
private Bindable<bool> editorSeekToHitObject; private Bindable<bool> editorAutoSeekOnPlacement;
public Editor(EditorLoader loader = null) public Editor(EditorLoader loader = null)
{ {
@ -273,7 +273,7 @@ namespace osu.Game.Screens.Edit
editorBackgroundDim = config.GetBindable<float>(OsuSetting.EditorDim); editorBackgroundDim = config.GetBindable<float>(OsuSetting.EditorDim);
editorHitMarkers = config.GetBindable<bool>(OsuSetting.EditorShowHitMarkers); editorHitMarkers = config.GetBindable<bool>(OsuSetting.EditorShowHitMarkers);
editorSeekToHitObject = config.GetBindable<bool>(OsuSetting.EditorSeekToHitObject); editorAutoSeekOnPlacement = config.GetBindable<bool>(OsuSetting.EditorAutoSeekOnPlacement);
AddInternal(new OsuContextMenuContainer AddInternal(new OsuContextMenuContainer
{ {
@ -332,9 +332,9 @@ namespace osu.Game.Screens.Edit
{ {
State = { BindTarget = editorHitMarkers }, State = { BindTarget = editorHitMarkers },
}, },
new ToggleMenuItem(EditorStrings.SeekToHitObject) new ToggleMenuItem(EditorStrings.AutoSeekOnPlacement)
{ {
State = { BindTarget = editorSeekToHitObject }, State = { BindTarget = editorAutoSeekOnPlacement },
} }
} }
}, },