From 1b4ba75b5a597313576940810833cb5f2a59d82c Mon Sep 17 00:00:00 2001
From: Zander Otavka <zotavka@gmail.com>
Date: Mon, 3 Aug 2015 12:01:15 -0700
Subject: [PATCH] Fix click and drag logic for floatingUIExample.js.

---
 examples/example/ui/floatingUIExample.js | 43 ++++++++++++------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/examples/example/ui/floatingUIExample.js b/examples/example/ui/floatingUIExample.js
index 9c4e43be94..1e957fe6b3 100644
--- a/examples/example/ui/floatingUIExample.js
+++ b/examples/example/ui/floatingUIExample.js
@@ -127,35 +127,37 @@ blueSquare3.offsetPosition = {
 };
 
 
-function onMouseDown(event) {
-    isLeftClick = event.isLeftButton;
-    isRightClick = event.isRightButton;
-}
+var mouseDown = {};
 
-function onMouseMove(event) {
-    isLeftClick = isRightClick = false;
+function onMouseDown(event) {
+    if (event.isLeftButton) {
+        mouseDown.overlay = OverlayManager.findAtPoint({ x: event.x, y: event.y });
+    }
+    if (event.isRightButton) {
+        mouseDown.pos = { x: event.x, y: event.y };
+    }
 }
 
 function onMouseUp(event) {
-    if (isLeftClick && event.isLeftButton) {
+    if (event.isLeftButton) {
         var overlay = OverlayManager.findAtPoint({ x: event.x, y: event.y });
-        print(overlay.attachedPanel);
-        if (overlay.attachedPanel === bluePanel) {
-            overlay.destroy();
-        } else if (overlay) {
-            var oldPos = overlay.offsetPosition;
-            var newPos = {
-                x: Number(oldPos.x),
-                y: Number(oldPos.y),
-                z: Number(oldPos.z) + 0.1
-            };
-            overlay.offsetPosition = newPos;
+        if (overlay === mouseDown.overlay) {
+            if (overlay.attachedPanel === bluePanel) {
+                overlay.destroy();
+            } else if (overlay) {
+                var oldPos = overlay.offsetPosition;
+                var newPos = {
+                    x: Number(oldPos.x),
+                    y: Number(oldPos.y),
+                    z: Number(oldPos.z) + 0.1
+                };
+                overlay.offsetPosition = newPos;
+            }
         }
     }
-    if (isRightClick && event.isRightButton) {
+    if (event.isRightButton && Vec3.distance(mouseDown.pos, { x: event.x, y: event.y }) < 5) {
         mainPanel.visible = !mainPanel.visible;
     }
-    isLeftClick = isRightClick = false;
 }
 
 function onScriptEnd() {
@@ -163,6 +165,5 @@ function onScriptEnd() {
 }
 
 Controller.mousePressEvent.connect(onMouseDown);
-Controller.mouseMoveEvent.connect(onMouseMove);
 Controller.mouseReleaseEvent.connect(onMouseUp);
 Script.scriptEnding.connect(onScriptEnd);
\ No newline at end of file