diff preview.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 1ec3488bfd1e
children
line wrap: on
line diff
--- a/preview.pde	Tue Aug 14 13:11:33 2018 +0300
+++ b/preview.pde	Tue Aug 14 13:12:43 2018 +0300
@@ -6,7 +6,7 @@
 int g_prevy = 0;
 int g_phandlex = 0;
 int g_phandley = 0;
-int g_pgrab = 0;
+boolean g_pgrab = false;
 final int g_pwindow_px = 16, g_pwindow_py = 16;
 
 int[] g_pwindow = new int[(320 + g_pwindow_px) * (256 + g_pwindow_py)];
@@ -14,13 +14,13 @@
 
 void preview_window()
 {
+    if (g_preview == 0)
+        return;
+
     int wix = X + 16;
     int ofx = g_prevx;
     int ofy = g_prevy;
 
-    if (g_preview == 0)
-        return;
-
     for (int y = 0; y < Y + g_pwindow_py; y++)
     {
         int ad = (ofy + y) * width;
@@ -47,15 +47,16 @@
 
 void update_preview_window() //done at mousereleased
 {
-    int wix = X + 16;
-
     if (g_preview == 0)
         return;
 
+    int wix = X + g_pwindow_px;
+
     for (int y = 0; y < Y + g_pwindow_py; y++)
     for (int x = 0; x < X + g_pwindow_py; x++)
     {
-        if (y == 0 || y == Y + 15 || x == 0 || x == X + 15)
+        if (y == 0 || y == Y + g_pwindow_py - 1 ||
+            x == 0 || x == X + g_pwindow_py - 1)
             g_pwindow[y * wix + x] = g_rgb[257];
         else
         if (y < 8 || x < 8 || y >= Y + 8 || x >= X + 8)