sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into editor-ternary-buttons

Browse Source
This commit is contained in:
Dean Herbert
2020-09-25 18:30:59 +09:00
committed by GitHub
parent 346d14d40b 8bbf15a096
commit 8e6bf516d9
12 changed files with 258 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,9 @@ namespace osu.Game.Rulesets.Edit
protected override bool OnKeyDown(KeyDownEvent e)
{
if (e.ControlPressed || e.AltPressed || e.SuperPressed)
return false;
if (checkLeftToggleFromKey(e.Key, out var leftIndex))
{
var item = toolboxCollection.Items.ElementAtOrDefault(leftIndex);
@ -221,7 +224,7 @@ namespace osu.Game.Rulesets.Edit
if (checkRightToggleFromKey(e.Key, out var rightIndex))
{
var item = togglesCollection.Children[rightIndex];
var item = togglesCollection.ElementAtOrDefault(rightIndex);
if (item is DrawableTernaryButton button)
{

3
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -157,6 +157,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
updateState(ArmedState.Idle, true);
}
/// <summary>
/// Invoked by the base <see cref="DrawableHitObject"/> to populate samples, once on initial load and potentially again on any change to the samples collection.
/// </summary>
protected virtual void LoadSamples()
{
if (Samples != null)