From 26acf47e50565406aa315862cb653379c8810f08 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 7 May 2018 11:05:25 +1200
Subject: [PATCH] Implementing canvas resize

---
 desktop/sources/scripts/dotgrid.js |  2 ++
 desktop/sources/scripts/picker.js  | 54 ++++++++++++++++++++++++++----
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/desktop/sources/scripts/dotgrid.js b/desktop/sources/scripts/dotgrid.js
index 5e5d1ea..c23428a 100644
--- a/desktop/sources/scripts/dotgrid.js
+++ b/desktop/sources/scripts/dotgrid.js
@@ -432,6 +432,8 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y)
   }
   this.set_size = function(size = {width:300,height:300},interface = true) 
   {
+    if(size.width < 50 || size.height < 50){ return; }
+
     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 035c02a..b7cae29 100644
--- a/desktop/sources/scripts/picker.js
+++ b/desktop/sources/scripts/picker.js
@@ -4,7 +4,6 @@ function Picker()
   this.el = document.createElement("input");
   this.el.id = "picker"
   this.el.setAttribute("placeholder","#ff0000")
-  this.el.setAttribute("maxlength","7")
   this.original = null;
 
   this.start = function()
@@ -27,16 +26,34 @@ function Picker()
 
   this.validate = function()
   {
-    if(!is_valid(this.el.value)){ return; }
+    var parts = this.parse(this.el.value)
 
-    dotgrid.tool.style().color = this.el.value;
-    dotgrid.tool.style().fill = dotgrid.tool.style().fill != "none" ? this.el.value : "none";
+    if(parts.color){ this.set_color(parts.color); }
+    else if(parts.size){ this.set_size(parts.size); }
+
+    this.stop();
+  }
+
+  this.set_color = function(color)
+  {
+    dotgrid.tool.style().color = color;
+    dotgrid.tool.style().fill = dotgrid.tool.style().fill != "none" ? color : "none";
     dotgrid.draw();
     dotgrid.controller.set();
     dotgrid.interface.el.className = ""
     this.el.blur()
   }
 
+  this.set_size = function(size)
+  {
+    dotgrid.set_size(size);
+    // dotgrid.tool.style().size = size;
+    // dotgrid.draw();
+    // dotgrid.controller.set();
+    // dotgrid.interface.el.className = ""
+    // this.el.blur()
+  }
+
   this.cancel = function()
   {
     if(!this.original){ return; }
@@ -65,9 +82,34 @@ function Picker()
     this.update();
   }
 
-  function is_valid(val)
+  this.parse = function(value)
   {
-    var re = /[0-9A-Fa-f]{6}/g;
+    var parts = value.split(" ");
+    var color = null;
+    var size = null;
+
+    for(id in parts){
+      var part = parts[id];
+      if(is_color(part) && !color){ color = part; }
+      if(is_size(part) && !size){ size = { width:parseInt(part.toLowerCase().split("x")[0]),height:parseInt(part.toLowerCase().split("x")[1]) }; }
+    }
+    return {color:color,size:size}
+  }
+
+  function is_size(val)
+  {
+    if(val.toLowerCase().indexOf("x") < 1){ return false; }
+
+    return true
+  }
+
+  function is_color(val)
+  {
+    if(val.length != 4 && val.length != 7){
+      return false
+    }
+
+    var re = /\#[0-9A-Fa-f]/g;
     return re.test(val)
   }