Mercurial > hg > forks > multipaint-js

changeset 79:dda377b64984

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Jul 2018 21:26:09 +0300
parents a258e0cac898
children 384b301970ac
files Interface.pde
diffstat 1 files changed, 27 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/Interface.pde	Thu Jul 05 20:41:12 2018 +0300
+++ b/Interface.pde	Thu Jul 05 21:26:09 2018 +0300
@@ -848,29 +848,29 @@
 
     for (int tit = 0; tit < pan.length(); tit++) {
         ad = pan.charCodeAt(tit);
-        if (g_repanel <= 0) {
+        if (g_repanel <= 0 && realdraw == 1)
+        {
             if (ad != ';' && ad != ':' && ad != '.') {
-                if (realdraw == 1) {
-                    int icolor;
-                    if (ad == 'j' && g_spare)
-                        icolor = 1;
-                    else
-                        icolor = int(g_data[ad]);
+                int icolor;
+                if (ad == 'j' && g_spare)
+                    icolor = 1;
+                else
+                    icolor = int(g_data[ad]);
 
-                    drawicon(xx + x, yy + y, ad - 48, icolor);
-                }
+                drawicon(xx + x, yy + y, ad - 48, icolor);
             }
-            if (ad == ';') { //draw the preset brush box
-                if (realdraw == 1) {
-                    drawchar(xx, yy, 128);
-                    drawchar(xx + 8 * g_uizoom, yy, 129);
-                    drawchar(xx + 16 * g_uizoom, yy, 130);
-                    drawchar(xx + 24 * g_uizoom, yy, 131);
-                    drawchar(xx, yy + 8 * g_uizoom, 132);
-                    drawchar(xx + 8 * g_uizoom, yy + 8 * g_uizoom, 133);
-                    drawchar(xx + 16 * g_uizoom, yy + 8 * g_uizoom, 134);
-                    drawchar(xx + 24 * g_uizoom, yy + 8 * g_uizoom, 135);
-                }
+            else
+            if (ad == ';')
+            {
+                //draw the preset brush box
+                drawchar(xx, yy, 128);
+                drawchar(xx + 8 * g_uizoom, yy, 129);
+                drawchar(xx + 16 * g_uizoom, yy, 130);
+                drawchar(xx + 24 * g_uizoom, yy, 131);
+                drawchar(xx, yy + 8 * g_uizoom, 132);
+                drawchar(xx + 8 * g_uizoom, yy + 8 * g_uizoom, 133);
+                drawchar(xx + 16 * g_uizoom, yy + 8 * g_uizoom, 134);
+                drawchar(xx + 24 * g_uizoom, yy + 8 * g_uizoom, 135);
             }
         }
 
@@ -889,19 +889,18 @@
                 if (ad == 's' && g_realbutton == 39) ad = 'S';
                 if (ad == 'j' && g_realbutton == 39) ad = 'J';
                 if (ad == 'g' && g_realbutton == 39) ad = 'G';
-                if (ad == 'r' && g_realbutton == 39) {
-                    ad = ')';
-                    if (g_shift) ad = '(';
-                }
+                if (ad == 'r' && g_realbutton == 39) ad = g_shift ? '(' : ')';
                 command(int(ad));
                 g_msgctr = 50;
             }
         }
         if (ad == ';') {
-            for (int ii = 0; ii <= 3; ii++) {
-                for (int jj = 0; jj <= 1; jj++) {
-                    if (doicon(xx + ii * 8 * g_uizoom, yy + jj * 8 * g_uizoom, 8 * g_uizoom, 8 * g_uizoom)) command(128 + ii + jj * 4);
-                }
+            for (int ii = 0; ii <= 3; ii++)
+            for (int jj = 0; jj <= 1; jj++)
+            {
+                if (doicon(xx + ii * 8 * g_uizoom, yy + jj * 8 * g_uizoom,
+                    8 * g_uizoom, 8 * g_uizoom))
+                    command(128 + ii + jj * 4);
             }
         }
         if (tabletype == 0) {