h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-18 17:07:20 +08:00
Code Issues Releases Wiki Activity

Merge pull request from UselessToucan/MakeMusicControllerDraggableAgain

Browse Source 
Make MusicController draggable again
This commit is contained in:
Dean Herbert 2018-01-25 09:18:07 +09:00 committed by GitHub
commit 59f62ad8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions

16
osu.Game/Overlays/MusicController.cs

@ -5,8 +5,6 @@ using System;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
@ -20,10 +18,12 @@ using osu.Framework.Localisation;
using osu.Framework.Threading;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Music;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Music;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays
{
@ -65,6 +65,12 @@ namespace osu.Game.Overlays
AlwaysPresent = true;
}
protected override bool OnDragStart(InputState state)
{
base.OnDragStart(state);
return true;
}
protected override bool OnDrag(InputState state)
{
if (base.OnDrag(state)) return true;