Repository: flex-asjs Updated Branches: refs/heads/develop 52300dae3 -> 4010a04c2
Disabled mouse events for the drag image. Set the default cursor for StringItemRenderer to be pointer. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4010a04c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4010a04c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4010a04c Branch: refs/heads/develop Commit: 4010a04c279af361a1f44e822e31410ebbae6bff Parents: 52300da Author: Peter Ent <p...@apache.org> Authored: Wed Jul 12 17:00:40 2017 -0400 Committer: Peter Ent <p...@apache.org> Committed: Wed Jul 12 17:00:40 2017 -0400 ---------------------------------------------------------------------- .../projects/Basic/src/main/resources/defaults.css | 1 + .../flex/html/beads/controllers/DragMouseController.as | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4010a04c/frameworks/projects/Basic/src/main/resources/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css index 531180f..91d7932 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -496,6 +496,7 @@ StringItemRenderer height: 24; flex-shrink: 0; flex-grow: 1; + cursor: pointer; } AccordionItemRenderer http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4010a04c/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as index 6d560a1..2963d86 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as @@ -243,16 +243,19 @@ package org.apache.flex.html.beads.controllers (dragImage as InteractiveObject).mouseEnabled = false; (dragImage as DisplayObjectContainer).mouseChildren = false; } + COMPILE::JS { + dragImage.element.style['pointer-events'] = 'none'; + } } } } else { - trace("DRAG-MOUSE: sending dragMove " + event.target.toString()); +// trace("DRAG-MOUSE: sending dragMove " + event.target.toString()); dragEvent = DragEvent.createDragEvent("dragMove", event); - trace("client: " + event.clientX.toString() + " " + event.clientY.toString() + " " + event.target.toString()); +// trace("client: " + event.clientX.toString() + " " + event.clientY.toString() + " " + event.target.toString()); pt = PointUtils.globalToLocal(new Point(event.clientX, event.clientY), host); - trace("host: " + pt.x.toString() + " " + pt.y.toString()); +// trace("host: " + pt.x.toString() + " " + pt.y.toString()); dragImage.x = pt.x + dragImageOffsetX; dragImage.y = pt.y + dragImageOffsetY; DragEvent.dispatchDragEvent(dragEvent, event.target); @@ -261,12 +264,12 @@ package org.apache.flex.html.beads.controllers private function dragMouseUpHandler(event:MouseEvent):void { - trace("DRAG-MOUSE: dragMouseUp"); +// trace("DRAG-MOUSE: dragMouseUp"); var dragEvent:DragEvent; if (dragging) { - trace("DRAG-MOUSE: sending dragEnd"); +// trace("DRAG-MOUSE: sending dragEnd"); var screenPoint:Point = new Point(event.screenX, event.screenY); var newPoint:Point = PointUtils.globalToLocal(screenPoint, event.target);
