Browse Source

Setting Draggable2D drag enabled to false doesn't stop mouse up events #87

Handler methods now early out if dragEnabled is false.
master
chrisgregan 10 years ago
parent
commit
e3a58966d2
  1. 15
      Assets/Fungus/Sprite/Scripts/Draggable2D.cs

15
Assets/Fungus/Sprite/Scripts/Draggable2D.cs

@ -60,6 +60,11 @@ namespace Fungus
protected virtual void OnMouseUp() protected virtual void OnMouseUp()
{ {
if (!dragEnabled)
{
return;
}
bool dragCompleted = false; bool dragCompleted = false;
DragCompleted[] handlers = GetHandlers<DragCompleted>(); DragCompleted[] handlers = GetHandlers<DragCompleted>();
@ -92,6 +97,11 @@ namespace Fungus
protected virtual void OnTriggerEnter2D(Collider2D other) protected virtual void OnTriggerEnter2D(Collider2D other)
{ {
if (!dragEnabled)
{
return;
}
foreach (DragEntered handler in GetHandlers<DragEntered>()) foreach (DragEntered handler in GetHandlers<DragEntered>())
{ {
handler.OnDragEntered(this, other); handler.OnDragEntered(this, other);
@ -105,6 +115,11 @@ namespace Fungus
protected virtual void OnTriggerExit2D(Collider2D other) protected virtual void OnTriggerExit2D(Collider2D other)
{ {
if (!dragEnabled)
{
return;
}
foreach (DragExited handler in GetHandlers<DragExited>()) foreach (DragExited handler in GetHandlers<DragExited>())
{ {
handler.OnDragExited(this, other); handler.OnDragExited(this, other);

Loading…
Cancel
Save