Merge branch 'color-picker-drag'

Conflicts:
	src/util/GestureHandler.as
This commit is contained in:
Nathan Dinsmore 2014-06-24 14:13:22 -04:00
commit dceb5f64ab

View file

@ -96,6 +96,7 @@ public class GestureHandler {
public function setDragClient(newClient:DragClient, evt:MouseEvent):void { public function setDragClient(newClient:DragClient, evt:MouseEvent):void {
Menu.removeMenusFrom(stage); Menu.removeMenusFrom(stage);
if (carriedObj) return;
if (dragClient != null) dragClient.dragEnd(evt); if (dragClient != null) dragClient.dragEnd(evt);
dragClient = newClient as DragClient; dragClient = newClient as DragClient;
dragClient.dragBegin(evt); dragClient.dragBegin(evt);