···1// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2// See the LICENCE file in the repository root for full licence text.
34-using System;
5using osu.Framework.Allocation;
6using osu.Framework.Configuration;
7using osu.Framework.Graphics;
···112 var currentState = inputManager.CurrentState;
113 var mouse = currentState.Mouse;
114 inputManagerStatus.Text = $"{inputManager}";
115- mouseStatus.Text = $"Mouse: {mouse.Position} {mouse.Scroll} " + String.Join(" ", mouse.Buttons);
116- keyboardStatus.Text = "Keyboard: " + String.Join(" ", currentState.Keyboard.Keys);
117- joystickStatus.Text = "Joystick: " + String.Join(" ", currentState.Joystick.Buttons);
118 base.Update();
119 }
120
···1// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2// See the LICENCE file in the repository root for full licence text.
304using osu.Framework.Allocation;
5using osu.Framework.Configuration;
6using osu.Framework.Graphics;
···111 var currentState = inputManager.CurrentState;
112 var mouse = currentState.Mouse;
113 inputManagerStatus.Text = $"{inputManager}";
114+ mouseStatus.Text = $"Mouse: {mouse.Position} {mouse.Scroll} " + string.Join(" ", mouse.Buttons);
115+ keyboardStatus.Text = "Keyboard: " + string.Join(" ", currentState.Keyboard.Keys);
116+ joystickStatus.Text = "Joystick: " + string.Join(" ", currentState.Joystick.Buttons);
117 base.Update();
118 }
119
+1-3
osu.Framework/Audio/Track/ITrackStore.cs
···1// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2// See the LICENCE file in the repository root for full licence text.
34-using System;
5-6namespace osu.Framework.Audio.Track
7{
8 public interface ITrackStore : IAdjustableResourceStore<Track>
···12 /// </summary>
13 /// <param name="length">The length of the virtual track.</param>
14 /// <returns>A new virtual track.</returns>
15- Track GetVirtual(double length = Double.PositiveInfinity);
16 }
17}
···1// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2// See the LICENCE file in the repository root for full licence text.
3004namespace osu.Framework.Audio.Track
5{
6 public interface ITrackStore : IAdjustableResourceStore<Track>
···10 /// </summary>
11 /// <param name="length">The length of the virtual track.</param>
12 /// <returns>A new virtual track.</returns>
13+ Track GetVirtual(double length = double.PositiveInfinity);
14 }
15}
+1-2
osu.Framework/Input/States/ButtonStates.cs
···1// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2// See the LICENCE file in the repository root for full licence text.
34-using System;
5using System.Collections;
6using System.Collections.Generic;
7using System.Linq;
···67 pressedButtons.AddRange(other.pressedButtons);
68 }
6970- public override string ToString() => $@"{GetType().ReadableName()}({String.Join(" ", pressedButtons)})";
7172 public IEnumerator<TButton> GetEnumerator() => ((IEnumerable<TButton>)pressedButtons).GetEnumerator();
73 IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
···1// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
2// See the LICENCE file in the repository root for full licence text.
304using System.Collections;
5using System.Collections.Generic;
6using System.Linq;
···66 pressedButtons.AddRange(other.pressedButtons);
67 }
6869+ public override string ToString() => $@"{GetType().ReadableName()}({string.Join(" ", pressedButtons)})";
7071 public IEnumerator<TButton> GetEnumerator() => ((IEnumerable<TButton>)pressedButtons).GetEnumerator();
72 IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();