h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 19:53:23 +08:00
Code Issues Releases Wiki Activity

Tidy up dependency resolution

Browse Source
This commit is contained in:
Dean Herbert 2023-04-04 19:14:30 +09:00
parent 195b5fc3f1
commit 4aed483005
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,9 @@ namespace osu.Game.Rulesets.Edit
[Resolved] [Resolved]
protected IBeatSnapProvider BeatSnapProvider { get; private set; } protected IBeatSnapProvider BeatSnapProvider { get; private set; }
[Resolved]
private OverlayColourProvider colourProvider { get; set; }
protected ComposeBlueprintContainer BlueprintContainer { get; private set; } protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
protected ExpandingToolboxContainer LeftToolbox { get; private set; } protected ExpandingToolboxContainer LeftToolbox { get; private set; }
@ -82,12 +85,6 @@ namespace osu.Game.Rulesets.Edit
private IBindable<bool> hasTiming; private IBindable<bool> hasTiming;
private Bindable<bool> autoSeekOnPlacement; private Bindable<bool> autoSeekOnPlacement;
[Resolved]
private EditorBeatmap beatmap { get; set; }
[Resolved]
private OverlayColourProvider colours { get; set; }
private OsuTextFlowContainer inspectorText; private OsuTextFlowContainer inspectorText;
protected HitObjectComposer(Ruleset ruleset) protected HitObjectComposer(Ruleset ruleset)
@ -99,7 +96,7 @@ namespace osu.Game.Rulesets.Edit
dependencies = new DependencyContainer(base.CreateChildDependencies(parent)); dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuConfigManager config) private void load(OsuConfigManager config)
{ {
autoSeekOnPlacement = config.GetBindable<bool>(OsuSetting.EditorAutoSeekOnPlacement); autoSeekOnPlacement = config.GetBindable<bool>(OsuSetting.EditorAutoSeekOnPlacement);
@ -323,14 +320,14 @@ namespace osu.Game.Rulesets.Edit
{ {
inspectorText.Clear(); inspectorText.Clear();
switch (beatmap.SelectedHitObjects.Count) switch (EditorBeatmap.SelectedHitObjects.Count)
{ {
case 0: case 0:
addHeader("No selection"); addHeader("No selection");
break; break;
case 1: case 1:
var selected = beatmap.SelectedHitObjects.Single(); var selected = EditorBeatmap.SelectedHitObjects.Single();
addHeader("Type"); addHeader("Type");
addValue($"{selected.GetType().ReadableName()}"); addValue($"{selected.GetType().ReadableName()}");
@ -382,13 +379,13 @@ namespace osu.Game.Rulesets.Edit
default: default:
addHeader("Selected Objects"); addHeader("Selected Objects");
addValue($"{beatmap.SelectedHitObjects.Count:#,0.##}"); addValue($"{EditorBeatmap.SelectedHitObjects.Count:#,0.##}");
addHeader("Start Time"); addHeader("Start Time");
addValue($"{beatmap.SelectedHitObjects.Min(o => o.StartTime):#,0.##}"); addValue($"{EditorBeatmap.SelectedHitObjects.Min(o => o.StartTime):#,0.##}");
addHeader("End Time"); addHeader("End Time");
addValue($"{beatmap.SelectedHitObjects.Max(o => o.GetEndTime()):#,0.##}"); addValue($"{EditorBeatmap.SelectedHitObjects.Max(o => o.GetEndTime()):#,0.##}");
break; break;
} }
@ -396,13 +393,13 @@ namespace osu.Game.Rulesets.Edit
{ {
s.Padding = new MarginPadding { Top = 2 }; s.Padding = new MarginPadding { Top = 2 };
s.Font = s.Font.With(size: 12); s.Font = s.Font.With(size: 12);
s.Colour = colours.Content2; s.Colour = colourProvider.Content2;
}); });
void addValue(string value) => inspectorText.AddParagraph(value, s => void addValue(string value) => inspectorText.AddParagraph(value, s =>
{ {
s.Font = s.Font.With(weight: FontWeight.SemiBold); s.Font = s.Font.With(weight: FontWeight.SemiBold);
s.Colour = colours.Content1; s.Colour = colourProvider.Content1;
}); });
} }