From 44cf2aa7a3bf0667812661992a7e646e67a425a0 Mon Sep 17 00:00:00 2001
From: AlFasGD <kalfas.alex@gmail.com>
Date: Tue, 22 May 2018 09:00:11 +0300
Subject: [PATCH] Sync changes on composition tools

---
 osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs | 7 +++++--
 osu.Game/Rulesets/Edit/Tools/ICompositionTool.cs         | 6 ------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
index 9c3f99127d..91062a211e 100644
--- a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
@@ -12,8 +12,11 @@ public class HitObjectCompositionTool<T> : ICompositionTool
     {
         public string Name { get; } = typeof(T).Name;
 
-        public Action<InputState, MouseDownEventArgs, bool> OnMouseDown { get; }
-        public Action<InputState, MouseDownEventArgs, bool> OnMouseUp { get; }
+        public Func<InputState, MouseDownEventArgs, bool> OnMouseDown;
+        public Func<InputState, MouseDownEventArgs, bool> OnMouseUp;
+        public Func<InputState, MouseDownEventArgs, bool> OnDragStart;
+        public Func<InputState, MouseDownEventArgs, bool> OnDragRequested;
+        public Func<InputState, MouseDownEventArgs, bool> OnDragEnd;
 
         public HitObjectCompositionTool()
         {
diff --git a/osu.Game/Rulesets/Edit/Tools/ICompositionTool.cs b/osu.Game/Rulesets/Edit/Tools/ICompositionTool.cs
index 456c7e6fb3..ce8b139b43 100644
--- a/osu.Game/Rulesets/Edit/Tools/ICompositionTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/ICompositionTool.cs
@@ -1,16 +1,10 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Input;
-using System;
-
 namespace osu.Game.Rulesets.Edit.Tools
 {
     public interface ICompositionTool
     {
         string Name { get; }
-
-        Action<InputState, MouseDownEventArgs, bool> OnMouseDown { get; }
-        Action<InputState, MouseDownEventArgs, bool> OnMouseUp { get; }
     }
 }