Mercurial > hg > forks > multipaint-js

changeset 138:a6af71199946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Logic cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 09 Aug 2018 14:40:25 +0300
parents d6f60370b3e7
children e899ca447a69
files events.pde
diffstat 1 files changed, 16 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/events.pde	Thu Aug 09 14:29:59 2018 +0300
+++ b/events.pde	Thu Aug 09 14:40:25 2018 +0300
@@ -93,8 +93,6 @@
 
 void mouseDragged()
 {
-    int msx, msy;
-
     mouseMoved();
 
     g_iconx = mouseX;
@@ -106,36 +104,23 @@
         {
             g_piconx = g_iconx;
             g_picony = g_icony;
-            g_iconx = -1;
-            g_icony = -1;
             g_repanel = -2;
             g_tooltrigger = 100;
-            return;
-        } else {
-            g_iconx = -1;
-            g_icony = -1;
+        }
+        else
+        {
             g_piconx = -1;
             g_picony = -1;
         }
-    } else {
-        if (g_data[int('m')] == 0 && g_data[int('M')] == 0) {
-            msx = g_iconx - (g_windowx);
-            msy = g_icony - (g_windowy);
-            msx = g_msx - (g_windowx);
-            msy = g_msy - (g_windowy);
+    }
+    else
+    {
+        if (mouseButton == CENTER) return;
+        if (g_tooltrigger == 0) g_tooltrigger = 1;
+    }
 
-        } else {
-            msx = g_iconx;
-            msy = g_icony;
-        }
-
-        g_iconx = -1;
-        g_icony = -1;
-    }
     g_iconx = -1;
     g_icony = -1;
-    if (mouseButton == CENTER) return;
-    if (g_tooltrigger == 0) g_tooltrigger = 1;
 }
 
 
@@ -150,7 +135,8 @@
     g_button = mouseButton;
     g_realbutton = g_button;
 
-    if (insidewindow(g_iconx, g_icony)) {
+    if (insidewindow(g_iconx, g_icony))
+    {
         if (g_phase == 0) {
             g_repanel = -2;
             g_tooltrigger = 100;
@@ -165,11 +151,11 @@
     {
         g_msx = g_iconx;
         g_msy = g_icony;
-        if (g_data[int('m')] == 0 && g_data[int('M')] == 0) {
-            msx = g_iconx - (g_windowx);
-            msy = g_icony - (g_windowy);
-            msx = g_msx - (g_windowx);
-            msy = g_msy - (g_windowy);
+
+        if (g_data[int('m')] == 0 && g_data[int('M')] == 0)
+        {
+            msx = g_iconx - g_windowx;
+            msy = g_icony - g_windowy;
         } else {
             msx = g_iconx;
             msy = g_icony;