Mercurial > hg > forks > multipaint-js
changeset 242:7401300452c2
Integrate the minor changes from Multipaint 2018b (v18.10.2018).
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 23 Oct 2018 11:29:45 +0300 |
parents | 9b715f7489b2 |
children | a73a43454483 |
files | events.pde interface.pde multipaint.pde |
diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/events.pde Tue Sep 11 12:36:19 2018 +0300 +++ b/events.pde Tue Oct 23 11:29:45 2018 +0300 @@ -951,6 +951,7 @@ restore_undo(); refresh(); g_boxreconstruct = 2; + update_preview_window(); } if (g_data[int('U')] == 1) { @@ -958,6 +959,7 @@ message("Redo"); redo_undo(); refresh(); + update_preview_window(); } if (g_machine == SPECTRUM)
--- a/interface.pde Tue Sep 11 12:36:19 2018 +0300 +++ b/interface.pde Tue Oct 23 11:29:45 2018 +0300 @@ -166,7 +166,7 @@ // currently valid outputs are 0,10,20,1,11,21,2,12,22 // flat variants: 100,110,120,101,111,121,102,112,122 int base = 0; - if (g_aspect == AR_FLAT) base = 100; + if (g_aspect == AR_FLAT && !g_inhibit_aspect) base = 100; if (g_uiscale == 1) base += 10; if (g_uiscale == 3) base += 20; if (g_data[int('M')] == 1 && g_data[int('m')] == 1) g_data[int('m')] = 0; @@ -1244,7 +1244,7 @@ int bs = 8 * g_uiscale; int h = 0; if (g_button == RIGHT) h = 1; - e_rect(ox, oy, bs * 2, bs * 4, g_rgb[int(g_realback)]); + e_rect(ox, oy, bs * 2, bs * 4 - 1, g_rgb[int(g_realback)]); e_rect(ox + bs / 2, oy + 4 * g_uiscale, 12 * g_uiscale, bs * 2, g_rgb[int(g_realfront)]); if (doicon(ox, oy, bs * 2, bs * 3)) command(int('<')); if (g_machine == C64M || g_machine == MSX || g_machine == AMIGA) @@ -1298,7 +1298,7 @@ } else { - icontable(width - 32 * g_uiscale - 1, 0, 0, 1); + icontable(width - 32 * g_uiscale - 1, g_uiscale * 4, 0, 1); icontable(272 * g_uiscale, height - 32 * g_uiscale, 1, 1); palettebox(g_uiscale * 324 + 4, height - 32 * g_uiscale, width - (96 * g_uiscale) - 4);
--- a/multipaint.pde Tue Sep 11 12:36:19 2018 +0300 +++ b/multipaint.pde Tue Oct 23 11:29:45 2018 +0300 @@ -1,5 +1,5 @@ // -// Multipaint.JS 1.8.2018 +// Multipaint.JS v18.10.2018 // Tero Heikkinen (Dr. TerrorZ) // ProcessingJS port and changes by Matti Hämäläinen (ccr/TNSP) // processing setup draw and file things here @@ -261,7 +261,7 @@ sussborder(); setup_raster(); - message(" Multipaint| - 2018 -||v1.8.2018.JS"); + message(" Multipaint| .JS 2018 -|v18.10.2018"); message("*"); g_dirty = true; }