You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2018/12/19 10:36:27 UTC
[royale-asjs] branch refactor_sensitive_bead created (now 4ef1267)
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a change to branch refactor_sensitive_bead
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
at 4ef1267 Use controllers for listening to mouse events
This branch includes the following new commits:
new 05598c4 Match DragEvent.clientX with MouseEvent.clientX
new 2161a61 Organize imports
new 8307d4c Update documentation
new 4ef1267 Use controllers for listening to mouse events
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[royale-asjs] 03/04: Update documentation
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch refactor_sensitive_bead
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 8307d4c051e8ba1e368389110d43719c3e3f6bb7
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed Dec 19 12:33:40 2018 +0200
Update documentation
---
.../SensitiveSingleSelectionDropTargetBead.as | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
index 610ec6b..b668d4d 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
@@ -48,7 +48,7 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9
+ * @productversion Royale 0.9.6
*/
[Event(name="enter", type="org.apache.royale.events.Event")]
@@ -58,7 +58,7 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9
+ * @productversion Royale 0.9.6
*/
[Event(name="exit", type="org.apache.royale.events.Event")]
@@ -70,7 +70,7 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9
+ * @productversion Royale 0.9.6
*/
[Event(name="over", type="org.apache.royale.events.Event")]
@@ -83,7 +83,7 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9
+ * @productversion Royale 0.9.6
*/
[Event(name="drop", type="org.apache.royale.events.Event")]
@@ -94,21 +94,21 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9
+ * @productversion Royale 0.9.6
*/
[Event(name="complete", type="org.apache.royale.events.Event")]
/**
- * The SingleSelectionDropTargetBead enables items to be dropped onto single-selection List
- * components. This bead can be used with SingleSelectionDragSourceBead to enable the re-arrangement
- * of rows within the same list.
+ * The SensitiveSingleSelectionDropTargetBead enables items to be dropped onto single-selection List
+ * components. When the pointing device is in the first half of an item renderer it assumes the item is to be dropped on that item renderer.
+ * If it is on the second half it assumes the drop target is the next item renderer.
*
* @see org.apache.royale.html.beads.SingleSelectionDropIndicatorBead
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.6
*/
public class SensitiveSingleSelectionDropTargetBead extends EventDispatcher implements IBead
{
@@ -118,7 +118,7 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.8
+ * @productversion Royale 0.9.6
*/
public function SensitiveSingleSelectionDropTargetBead()
{
@@ -159,7 +159,7 @@ package org.apache.royale.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9
+ * @productversion Royale 0.9.6
*/
public function get dropDirection():String
{
[royale-asjs] 04/04: Use controllers for listening to mouse events
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch refactor_sensitive_bead
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 4ef126761d6e91d1db6f7219ed2edd7f8ae5a991
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed Dec 19 12:35:49 2018 +0200
Use controllers for listening to mouse events
---
.../SensitiveSingleSelectionDropTargetBead.as | 23 ++++++++++------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
index b668d4d..fe40c83 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
@@ -149,6 +149,7 @@ package org.apache.royale.html.beads
IEventDispatcher(_dropController).addEventListener(DragEvent.DRAG_EXIT, handleDragExit);
IEventDispatcher(_dropController).addEventListener(DragEvent.DRAG_OVER, handleDragOver);
IEventDispatcher(_dropController).addEventListener(DragEvent.DRAG_DROP, handleDragDrop);
+ IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE, handleDragMove);
}
private var _dropDirection: String = "horizontal";
@@ -223,20 +224,9 @@ package org.apache.royale.html.beads
var pt2:Point;
_dropController.acceptDragDrop(event.relatedObject as IUIBase, DropType.COPY);
- listenToMouseMove();
}
- private function listenToMouseMove():void
- {
- (_strand as IEventDispatcher).addEventListener(MouseEvent.MOUSE_MOVE, checkForNextItemRenderer);
- }
-
- private function stopListeningToMouseMove():void
- {
- (_strand as IEventDispatcher).addEventListener(MouseEvent.MOUSE_MOVE, checkForNextItemRenderer);
- }
-
- private function checkForNextItemRenderer(e:MouseEvent):void
+ private function checkForNextItemRenderer(e:DragEvent):void
{
var changeMade:Boolean = true;
var calculatedIndex:int = -1;
@@ -287,7 +277,6 @@ package org.apache.royale.html.beads
}
indicatorVisible = false;
}
- stopListeningToMouseMove();
}
/**
@@ -306,6 +295,14 @@ package org.apache.royale.html.beads
/**
* @private
*/
+ private function handleDragMove(event:DragEvent):void
+ {
+ checkForNextItemRenderer(event);
+ }
+
+ /**
+ * @private
+ */
private function handleDragDrop(event:DragEvent):void
{
//trace("SingleSelectionDropTargetBead received DragDrop via: "+event.relatedObject.toString());
RE: [royale-asjs] 01/04: Match DragEvent.clientX with
MouseEvent.clientX
Posted by Yishay Weiss <yi...@hotmail.com>.
This modifies Peter’s code which was committed with the comment saying it was ‘preliminary’. If there are no objections I’ll merge it by tomorrow.
________________________________
From: yishayw@apache.org <yi...@apache.org>
Sent: Wednesday, December 19, 2018 12:36:28 PM
To: commits@royale.apache.org
Subject: [royale-asjs] 01/04: Match DragEvent.clientX with MouseEvent.clientX
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch refactor_sensitive_bead
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 05598c451f860108e2d52130fe15f98464d8c240
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed Dec 19 12:31:47 2018 +0200
Match DragEvent.clientX with MouseEvent.clientX
---
.../src/main/royale/org/apache/royale/events/DragEvent.as | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as
index 8c1023b..208fe57 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as
@@ -374,10 +374,8 @@ package org.apache.royale.events
de.delta = event.delta;
de.relatedObject = event.target as InteractiveObject;
- var localPoint:Point = new Point(event.screenX, event.screenY);
- var clientPoint:Point = PointUtils.localToGlobal(localPoint, event.target);
- de.clientX = clientPoint.x;
- de.clientY = clientPoint.y;
+ de.clientX = event.clientX;
+ de.clientY = event.clientY;
return de;
}
@@ -390,10 +388,8 @@ package org.apache.royale.events
de.shiftKey = event.shiftKey;
de.relatedObject = event.target;
- var localPoint:Point = new Point(event.screenX, event.screenY);
- var clientPoint:Point = PointUtils.localToGlobal(localPoint, event.target);
- de.clientX = clientPoint.x;
- de.clientY = clientPoint.y;
+ de.clientX = event.clientX;
+ de.clientY = event.clientY;
return de;
}
[royale-asjs] 01/04: Match DragEvent.clientX with MouseEvent.clientX
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch refactor_sensitive_bead
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 05598c451f860108e2d52130fe15f98464d8c240
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed Dec 19 12:31:47 2018 +0200
Match DragEvent.clientX with MouseEvent.clientX
---
.../src/main/royale/org/apache/royale/events/DragEvent.as | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as
index 8c1023b..208fe57 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/events/DragEvent.as
@@ -374,10 +374,8 @@ package org.apache.royale.events
de.delta = event.delta;
de.relatedObject = event.target as InteractiveObject;
- var localPoint:Point = new Point(event.screenX, event.screenY);
- var clientPoint:Point = PointUtils.localToGlobal(localPoint, event.target);
- de.clientX = clientPoint.x;
- de.clientY = clientPoint.y;
+ de.clientX = event.clientX;
+ de.clientY = event.clientY;
return de;
}
@@ -390,10 +388,8 @@ package org.apache.royale.events
de.shiftKey = event.shiftKey;
de.relatedObject = event.target;
- var localPoint:Point = new Point(event.screenX, event.screenY);
- var clientPoint:Point = PointUtils.localToGlobal(localPoint, event.target);
- de.clientX = clientPoint.x;
- de.clientY = clientPoint.y;
+ de.clientX = event.clientX;
+ de.clientY = event.clientY;
return de;
}
[royale-asjs] 02/04: Organize imports
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch refactor_sensitive_bead
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 2161a6172e5a60fa6e610de863c33e6955492e16
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Wed Dec 19 12:32:54 2018 +0200
Organize imports
---
.../royale/html/beads/SensitiveSingleSelectionDropTargetBead.as | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
index 0bffe99..610ec6b 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as
@@ -18,19 +18,14 @@
////////////////////////////////////////////////////////////////////////////////
// TODO:yishayw rename this class
-// TODO:yishayw move some of the logic to the controller
package org.apache.royale.html.beads
{
import org.apache.royale.collections.ArrayList;
import org.apache.royale.core.DropType;
import org.apache.royale.core.IBead;
- import org.apache.royale.core.IChild;
import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.IItemRendererParent;
- import org.apache.royale.core.ILayoutHost;
- import org.apache.royale.core.IParent;
- import org.apache.royale.core.IRenderedObject;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
@@ -39,13 +34,9 @@ package org.apache.royale.html.beads
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.events.MouseEvent;
import org.apache.royale.geom.Point;
- import org.apache.royale.geom.Rectangle;
import org.apache.royale.html.beads.controllers.DropMouseController;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
import org.apache.royale.utils.PointUtils;
- import org.apache.royale.utils.UIUtils;
/**