h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-10 15:32:56 +08:00
Code Issues Releases Wiki Activity

Remove hide sample toggle

Browse Source 
In line with feedback from
https://github.com/ppy/osu/pull/29896#issuecomment-2378676851.
This commit is contained in:
Bartłomiej Dach 2024-11-01 18:36:01 +01:00
parent eb61da4232
commit 8f48682d0a
No known key found for this signature in database
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,6 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.EditorTimelineShowTimingChanges, true); SetDefault(OsuSetting.EditorTimelineShowTimingChanges, true);
SetDefault(OsuSetting.EditorTimelineShowTicks, true); SetDefault(OsuSetting.EditorTimelineShowTicks, true);
SetDefault(OsuSetting.EditorTimelineShowSamples, true);
SetDefault(OsuSetting.AlwaysShowHoldForMenuButton, false); SetDefault(OsuSetting.AlwaysShowHoldForMenuButton, false);
} }
@ -433,6 +432,5 @@ namespace osu.Game.Configuration
EditorTimelineShowTimingChanges, EditorTimelineShowTimingChanges,
EditorTimelineShowTicks, EditorTimelineShowTicks,
AlwaysShowHoldForMenuButton, AlwaysShowHoldForMenuButton,
EditorTimelineShowSamples
} }
} }

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

@ -139,11 +139,6 @@ namespace osu.Game.Localisation
/// </summary> /// </summary>
public static LocalisableString TimelineShowTicks => new TranslatableString(getKey(@"timeline_show_ticks"), @"Show ticks"); public static LocalisableString TimelineShowTicks => new TranslatableString(getKey(@"timeline_show_ticks"), @"Show ticks");
/// <summary>
/// "Show samples"
/// </summary>
public static LocalisableString TimelineShowSamples => new TranslatableString(getKey(@"timeline_show_samples"), @"Show samples");
private static string getKey(string key) => $@"{prefix}:{key}"; private static string getKey(string key) => $@"{prefix}:{key}";
} }
} }

5
osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
View File

@ -44,8 +44,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
[Resolved] [Resolved]
private TimelineBlueprintContainer? timelineBlueprintContainer { get; set; } private TimelineBlueprintContainer? timelineBlueprintContainer { get; set; }
private Bindable<bool> samplesVisible = null!;
public SamplePointPiece(HitObject hitObject) public SamplePointPiece(HitObject hitObject)
{ {
HitObject = hitObject; HitObject = hitObject;
@ -68,8 +66,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (editor != null) if (editor != null)
editor.ShowSampleEditPopoverRequested += onShowSampleEditPopoverRequested; editor.ShowSampleEditPopoverRequested += onShowSampleEditPopoverRequested;
samplesVisible = config.GetBindable<bool>(OsuSetting.EditorTimelineShowSamples);
} }
private readonly Bindable<bool> contracted = new Bindable<bool>(); private readonly Bindable<bool> contracted = new Bindable<bool>();
@ -97,7 +93,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
} }
}, true); }, true);
samplesVisible.BindValueChanged(visible => this.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
FinishTransforms(); FinishTransforms();
} }

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

@ -215,7 +215,6 @@ namespace osu.Game.Screens.Edit
private Bindable<bool> editorLimitedDistanceSnap; private Bindable<bool> editorLimitedDistanceSnap;
private Bindable<bool> editorTimelineShowTimingChanges; private Bindable<bool> editorTimelineShowTimingChanges;
private Bindable<bool> editorTimelineShowTicks; private Bindable<bool> editorTimelineShowTicks;
private Bindable<bool> editorTimelineShowSamples;
/// <summary> /// <summary>
/// This controls the opacity of components like the timelines, sidebars, etc. /// This controls the opacity of components like the timelines, sidebars, etc.
@ -324,7 +323,6 @@ namespace osu.Game.Screens.Edit
editorLimitedDistanceSnap = config.GetBindable<bool>(OsuSetting.EditorLimitedDistanceSnap); editorLimitedDistanceSnap = config.GetBindable<bool>(OsuSetting.EditorLimitedDistanceSnap);
editorTimelineShowTimingChanges = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTimingChanges); editorTimelineShowTimingChanges = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTimingChanges);
editorTimelineShowTicks = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTicks); editorTimelineShowTicks = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTicks);
editorTimelineShowSamples = config.GetBindable<bool>(OsuSetting.EditorTimelineShowSamples);
AddInternal(new OsuContextMenuContainer AddInternal(new OsuContextMenuContainer
{ {
@ -390,10 +388,6 @@ namespace osu.Game.Screens.Edit
{ {
State = { BindTarget = editorTimelineShowTicks } State = { BindTarget = editorTimelineShowTicks }
}, },
new ToggleMenuItem(EditorStrings.TimelineShowSamples)
{
State = { BindTarget = editorTimelineShowSamples }
}
] ]
}, },
new BackgroundDimMenuItem(editorBackgroundDim), new BackgroundDimMenuItem(editorBackgroundDim),