From 80f5ff3937933f3b85ac14ec6ccf5135b34f9d1c Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Mon, 7 May 2018 11:15:23 +1200 Subject: [PATCH] Reflect size change on dotgrid --- desktop/sources/scripts/dotgrid.js | 2 ++ desktop/sources/scripts/picker.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop/sources/scripts/dotgrid.js b/desktop/sources/scripts/dotgrid.js index c23428a..ef88793 100644 --- a/desktop/sources/scripts/dotgrid.js +++ b/desktop/sources/scripts/dotgrid.js @@ -434,6 +434,8 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) { if(size.width < 50 || size.height < 50){ return; } + size = { width:parseInt(size.width/15)*15,height:parseInt(size.height/15)*15} + var win = require('electron').remote.getCurrentWindow(); win.setSize(size.width+100,size.height+100+(interface ? 10 : 0),true); diff --git a/desktop/sources/scripts/picker.js b/desktop/sources/scripts/picker.js index b7cae29..f123d5e 100644 --- a/desktop/sources/scripts/picker.js +++ b/desktop/sources/scripts/picker.js @@ -3,11 +3,12 @@ function Picker() this.memory = ""; this.el = document.createElement("input"); this.el.id = "picker" - this.el.setAttribute("placeholder","#ff0000") this.original = null; this.start = function() { + this.el.setAttribute("placeholder",`#${dotgrid.tool.style().color} ${dotgrid.width}x${dotgrid.height}`) + dotgrid.controller.set("picker"); dotgrid.interface.el.className = "picker" this.el.focus()