diff multipaint.pde @ 145:5af8b5ddf349

Merge and clean up changes from v1.8.2018
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 14 Aug 2018 13:12:43 +0300
parents 5e18cb16bc4b
children d80871032cdd
line wrap: on
line diff
--- a/multipaint.pde	Tue Aug 14 13:11:33 2018 +0300
+++ b/multipaint.pde	Tue Aug 14 13:12:43 2018 +0300
@@ -1,5 +1,5 @@
 //
-// Multipaint Metal Edition 22.5.2017
+// Multipaint 1.8.2018
 // Tero Heikkinen (Dr. TerrorZ)
 // ProcessingJS port and changes by Matti Hämäläinen (ccr/TNSP)
 // processing setup draw and file things here
@@ -193,7 +193,7 @@
     sussborder();
     setup_raster();
 
-    message("Multipaint|Metal|v22.5.2017");
+    message(" Multipaint|    2018|| v1.8.2018");
     message("*");
     g_dirty = true;
 }
@@ -469,12 +469,10 @@
     g_msy = mouseY;
 
     // Actual tool drawing
-    if (g_tooltrigger == 1)
-    {
-        // comes from mousepressed, or mousedragged
-        if (g_mx <= width - g_hedge && g_my <= height - g_vedge)
-            do_tool(g_mx, g_my, g_button);
-    }
+    if (g_tooltrigger == 1 &&
+        g_mx <= width - g_hedge &&
+        g_my <= height - g_vedge)
+        do_tool(g_mx, g_my, g_button);
 
     switcher(0);
 
@@ -498,6 +496,11 @@
     loadPixels();
     viewport();
     switcher(1);
+
+    if (g_pgrab)
+        preview_box_drag();
+
+    preview_window();
     update_ui(false);
     updatePixels();