mirror of
https://github.com/scratchfoundation/scratch-flash.git
synced 2024-12-04 21:21:06 -05:00
Merge branch 'color-picker-drag'
Conflicts: src/util/GestureHandler.as
This commit is contained in:
commit
dceb5f64ab
1 changed files with 1 additions and 0 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue