scratchfoundation/scratch-flash
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-flash.git synced 2024-12-04 13:11:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'color-picker-drag'

Browse source 
Conflicts:
	src/util/GestureHandler.as
This commit is contained in:
Nathan Dinsmore 2014-06-24 14:13:22 -04:00
commit dceb5f64ab
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/util/GestureHandler.as
View file

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