h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 08:27:49 +08:00
Code Issues Releases Wiki Activity

Restructure popover updates to be more centralised

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-06-10 11:51:14 +02:00
parent e873698221
commit 0efa028e0a
No known key found for this signature in database
1 changed files with 54 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,26 +180,35 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (commonVolume != null) if (commonVolume != null)
volume.Current.Value = commonVolume.Value; volume.Current.Value = commonVolume.Value;
updateBankPlaceholderText(); updatePrimaryBankState();
bank.Current.BindValueChanged(val => bank.Current.BindValueChanged(val =>
{ {
updateBank(val.NewValue); if (string.IsNullOrEmpty(val.NewValue))
updateBankPlaceholderText(); return;
setBank(val.NewValue);
updatePrimaryBankState();
}); });
// on commit, ensure that the value is correct by sourcing it from the objects' samples again. // on commit, ensure that the value is correct by sourcing it from the objects' samples again.
// this ensures that committing empty text causes a revert to the previous value. // this ensures that committing empty text causes a revert to the previous value.
bank.OnCommit += (_, _) => updateBankText(); bank.OnCommit += (_, _) => updatePrimaryBankState();
updateAdditionBankText(); updateAdditionBankState();
updateAdditionBankVisual();
additionBank.Current.BindValueChanged(val => additionBank.Current.BindValueChanged(val =>
{ {
updateAdditionBank(val.NewValue); if (string.IsNullOrEmpty(val.NewValue))
updateAdditionBankVisual(); return;
});
additionBank.OnCommit += (_, _) => updateAdditionBankText();
volume.Current.BindValueChanged(val => updateVolume(val.NewValue)); setAdditionBank(val.NewValue);
updateAdditionBankState();
});
additionBank.OnCommit += (_, _) => updateAdditionBankState();
volume.Current.BindValueChanged(val =>
{
if (val.NewValue != null)
setVolume(val.NewValue.Value);
});
createStateBindables(); createStateBindables();
updateTernaryStates(); updateTernaryStates();
@ -210,6 +219,26 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private string? getCommonAdditionBank() => allRelevantSamples.Select(GetAdditionBankValue).Distinct().Count() == 1 ? GetAdditionBankValue(allRelevantSamples.First()) : null; private string? getCommonAdditionBank() => allRelevantSamples.Select(GetAdditionBankValue).Distinct().Count() == 1 ? GetAdditionBankValue(allRelevantSamples.First()) : null;
private int? getCommonVolume() => allRelevantSamples.Select(GetVolumeValue).Distinct().Count() == 1 ? GetVolumeValue(allRelevantSamples.First()) : null; private int? getCommonVolume() => allRelevantSamples.Select(GetVolumeValue).Distinct().Count() == 1 ? GetVolumeValue(allRelevantSamples.First()) : null;
private void updatePrimaryBankState()
{
string? commonBank = getCommonBank();
bank.Current.Value = commonBank;
bank.PlaceholderText = string.IsNullOrEmpty(commonBank) ? "(multiple)" : string.Empty;
}
private void updateAdditionBankState()
{
string? commonAdditionBank = getCommonAdditionBank();
additionBank.PlaceholderText = string.IsNullOrEmpty(commonAdditionBank) ? "(multiple)" : string.Empty;
additionBank.Current.Value = commonAdditionBank;
bool anyAdditions = allRelevantSamples.Any(o => o.Any(s => s.Name != HitSampleInfo.HIT_NORMAL));
if (anyAdditions)
additionBank.Show();
else
additionBank.Hide();
}
/// <summary> /// <summary>
/// Applies the given update action on all samples of <see cref="allRelevantSamples"/> /// Applies the given update action on all samples of <see cref="allRelevantSamples"/>
/// and invokes the necessary update notifiers for the beatmap and hit objects. /// and invokes the necessary update notifiers for the beatmap and hit objects.
@ -229,11 +258,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
beatmap.EndChange(); beatmap.EndChange();
} }
private void updateBank(string? newBank) private void setBank(string newBank)
{ {
if (string.IsNullOrEmpty(newBank))
return;
updateAllRelevantSamples((_, relevantSamples) => updateAllRelevantSamples((_, relevantSamples) =>
{ {
for (int i = 0; i < relevantSamples.Count; i++) for (int i = 0; i < relevantSamples.Count; i++)
@ -245,11 +271,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}); });
} }
private void updateAdditionBank(string? newBank) private void setAdditionBank(string newBank)
{ {
if (string.IsNullOrEmpty(newBank))
return;
updateAllRelevantSamples((_, relevantSamples) => updateAllRelevantSamples((_, relevantSamples) =>
{ {
for (int i = 0; i < relevantSamples.Count; i++) for (int i = 0; i < relevantSamples.Count; i++)
@ -261,47 +284,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}); });
} }
private void updateBankText() private void setVolume(int newVolume)
{ {
bank.Current.Value = getCommonBank();
}
private void updateBankPlaceholderText()
{
string? commonBank = getCommonBank();
bank.PlaceholderText = string.IsNullOrEmpty(commonBank) ? "(multiple)" : string.Empty;
}
private void updateAdditionBankVisual()
{
string? commonAdditionBank = getCommonAdditionBank();
additionBank.PlaceholderText = string.IsNullOrEmpty(commonAdditionBank) ? "(multiple)" : string.Empty;
bool anyAdditions = allRelevantSamples.Any(o => o.Any(s => s.Name != HitSampleInfo.HIT_NORMAL));
if (anyAdditions)
additionBank.Show();
else
additionBank.Hide();
}
private void updateAdditionBankText()
{
string? commonAdditionBank = getCommonAdditionBank();
if (string.IsNullOrEmpty(commonAdditionBank)) return;
additionBank.Current.Value = commonAdditionBank;
}
private void updateVolume(int? newVolume)
{
if (newVolume == null)
return;
updateAllRelevantSamples((_, relevantSamples) => updateAllRelevantSamples((_, relevantSamples) =>
{ {
for (int i = 0; i < relevantSamples.Count; i++) for (int i = 0; i < relevantSamples.Count; i++)
{ {
relevantSamples[i] = relevantSamples[i].With(newVolume: newVolume.Value); relevantSamples[i] = relevantSamples[i].With(newVolume: newVolume);
} }
}); });
} }
@ -371,8 +360,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
relevantSamples.Add(relevantSample?.With(sampleName) ?? h.CreateHitSampleInfo(sampleName)); relevantSamples.Add(relevantSample?.With(sampleName) ?? h.CreateHitSampleInfo(sampleName));
}); });
updateAdditionBankVisual(); updateAdditionBankState();
updateAdditionBankText();
} }
private void removeHitSample(string sampleName) private void removeHitSample(string sampleName)
@ -389,8 +377,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
} }
}); });
updateAdditionBankText(); updateAdditionBankState();
updateAdditionBankVisual();
} }
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)
@ -401,10 +388,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (e.ShiftPressed) if (e.ShiftPressed)
{ {
string? newBank = banks.ElementAtOrDefault(rightIndex); string? newBank = banks.ElementAtOrDefault(rightIndex);
updateBank(newBank);
updateBankText(); if (string.IsNullOrEmpty(newBank))
updateAdditionBank(newBank); return true;
updateAdditionBankText();
setBank(newBank);
updatePrimaryBankState();
setAdditionBank(newBank);
updateAdditionBankState();
} }
else else
{ {