sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reference EditorBeatmap directly for selected objects

Browse Source
This commit is contained in:
Dean Herbert 2020-10-09 18:44:23 +09:00
parent 5966205037
commit edaf6db5c6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -37,8 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
public int SelectedCount => selectedBlueprints.Count; public int SelectedCount => selectedBlueprints.Count;
public IEnumerable<HitObject> SelectedHitObjects => EditorBeatmap.SelectedHitObjects;
private Drawable content; private Drawable content;
private OsuSpriteText selectionDetailsText; private OsuSpriteText selectionDetailsText;
@ -309,7 +307,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
ChangeHandler?.BeginChange(); ChangeHandler?.BeginChange();
foreach (var h in SelectedHitObjects) foreach (var h in EditorBeatmap.SelectedHitObjects)
{ {
// Make sure there isn't already an existing sample // Make sure there isn't already an existing sample
if (h.Samples.Any(s => s.Name == sampleName)) if (h.Samples.Any(s => s.Name == sampleName))
@ -330,7 +328,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
ChangeHandler?.BeginChange(); ChangeHandler?.BeginChange();
foreach (var h in SelectedHitObjects) foreach (var h in EditorBeatmap.SelectedHitObjects)
{ {
var comboInfo = h as IHasComboInformation; var comboInfo = h as IHasComboInformation;
@ -351,7 +349,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
ChangeHandler?.BeginChange(); ChangeHandler?.BeginChange();
foreach (var h in SelectedHitObjects) foreach (var h in EditorBeatmap.SelectedHitObjects)
h.SamplesBindable.RemoveAll(s => s.Name == sampleName); h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
ChangeHandler?.EndChange(); ChangeHandler?.EndChange();
@ -425,11 +423,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// </summary> /// </summary>
protected virtual void UpdateTernaryStates() protected virtual void UpdateTernaryStates()
{ {
SelectionNewComboState.Value = GetStateFromSelection(SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo); SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
foreach (var (sampleName, bindable) in SelectionSampleStates) foreach (var (sampleName, bindable) in SelectionSampleStates)
{ {
bindable.Value = GetStateFromSelection(SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName)); bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
} }
} }