From 72098a65f9c7dd4c786ecb9f8e6c26fd13d24c02 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Fri, 3 Aug 2018 13:10:57 +1200
Subject: [PATCH] Reconnected menu

---
 desktop/sources/scripts/dotgrid.js   | 16 ++++++++--------
 desktop/sources/scripts/generator.js |  6 +++---
 desktop/sources/scripts/tool.js      |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/desktop/sources/scripts/dotgrid.js b/desktop/sources/scripts/dotgrid.js
index d1824bf..f380704 100644
--- a/desktop/sources/scripts/dotgrid.js
+++ b/desktop/sources/scripts/dotgrid.js
@@ -53,15 +53,15 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y)
     this.controller.add("default","Stroke","Bezier",() => { dotgrid.tool.cast("bezier") },"F");
     this.controller.add("default","Stroke","Close",() => { dotgrid.tool.cast("close") },"Z");
 
-    this.controller.add("default","Effect","Linecap",() => { dotgrid.mod_linecap(); },"Q");
-    this.controller.add("default","Effect","Linejoin",() => { dotgrid.mod_linejoin(); },"W");
-    this.controller.add("default","Effect","Mirror",() => { dotgrid.tool.toggle_mirror(); },"E");
-    this.controller.add("default","Effect","Fill",() => { dotgrid.mod_fill(); },"R");
+    this.controller.add("default","Effect","Linecap",() => { dotgrid.tool.toggle("linecap"); },"Q");
+    this.controller.add("default","Effect","Linejoin",() => { dotgrid.tool.toggle("linejoin"); },"W");
+    this.controller.add("default","Effect","Mirror",() => { dotgrid.tool.toggle("mirror"); },"E");
+    this.controller.add("default","Effect","Fill",() => { dotgrid.tool.toggle("fill"); },"R");
     this.controller.add("default","Effect","Color",() => { dotgrid.picker.start(); },"G");
-    this.controller.add("default","Effect","Thicker",() => { dotgrid.mod_thickness(1) },"}");
-    this.controller.add("default","Effect","Thinner",() => { dotgrid.mod_thickness(-1) },"{");
-    this.controller.add("default","Effect","Thicker +5",() => { dotgrid.mod_thickness(5,true) },"]");
-    this.controller.add("default","Effect","Thinner -5",() => { dotgrid.mod_thickness(-5,true) },"[");
+    this.controller.add("default","Effect","Thicker",() => { dotgrid.tool.toggle("thickness",1) },"}");
+    this.controller.add("default","Effect","Thinner",() => { dotgrid.tool.toggle("thickness",-1) },"{");
+    this.controller.add("default","Effect","Thicker +5",() => { dotgrid.tool.toggle("thickness",5) },"]");
+    this.controller.add("default","Effect","Thinner -5",() => { dotgrid.mod_thickness("thickness",-5) },"[");
 
     this.controller.add("default","Manual","Add Point",() => { dotgrid.tool.add_vertex(dotgrid.cursor.pos); dotgrid.guide.refresh() },"Enter");
     this.controller.add("default","Manual","Move Up",() => { dotgrid.cursor.pos.y -= 15; dotgrid.guide.refresh() },"Up");
diff --git a/desktop/sources/scripts/generator.js b/desktop/sources/scripts/generator.js
index 8dd1764..1d927cb 100644
--- a/desktop/sources/scripts/generator.js
+++ b/desktop/sources/scripts/generator.js
@@ -10,15 +10,15 @@ function Generator(layer,style)
     for(k1 in l){
       var seg = l[k1];
       for(k2 in seg.vertices){
-        if(mirror == 1){ seg.vertices[k2].x = (dotgrid.tool.settings.size.width) - seg.vertices[k2].x }
-        if(mirror == 2){ seg.vertices[k2].y = (dotgrid.tool.settings.size.height) - seg.vertices[k2].y }
+        if(mirror == 1){ seg.vertices[k2].x = (dotgrid.tool.settings.size.width) - seg.vertices[k2].x + 15 }
+        if(mirror == 2){ seg.vertices[k2].y = (dotgrid.tool.settings.size.height) - seg.vertices[k2].y + 30 }
 
         // Offset
         seg.vertices[k2].x += offset.x
         seg.vertices[k2].y += offset.y
 
         // Rotate
-        var center = {x:(dotgrid.tool.settings.size.width/2)+offset.x,y:(dotgrid.tool.settings.size.height/2)+offset.y}
+        var center = {x:(dotgrid.tool.settings.size.width/2)+offset.x-15,y:(dotgrid.tool.settings.size.height/2)+offset.y}
         seg.vertices[k2] = rotate_point(seg.vertices[k2],center,angle)
 
         // Scale
diff --git a/desktop/sources/scripts/tool.js b/desktop/sources/scripts/tool.js
index cf19ac7..e5e6cec 100644
--- a/desktop/sources/scripts/tool.js
+++ b/desktop/sources/scripts/tool.js
@@ -227,16 +227,16 @@ function Tool()
 
   this.paths = function()
   {
-    var l1 = new Generator(dotgrid.tool.layers[0],dotgrid.tool.styles[0]).toString({x:0,y:0},1)
-    var l2 = new Generator(dotgrid.tool.layers[1],dotgrid.tool.styles[1]).toString({x:0,y:0},1)
-    var l3 = new Generator(dotgrid.tool.layers[2],dotgrid.tool.styles[2]).toString({x:0,y:0},1)
+    var l1 = new Generator(dotgrid.tool.layers[0],dotgrid.tool.styles[0]).toString({x:-10,y:-10},1)
+    var l2 = new Generator(dotgrid.tool.layers[1],dotgrid.tool.styles[1]).toString({x:-10,y:-10},1)
+    var l3 = new Generator(dotgrid.tool.layers[2],dotgrid.tool.styles[2]).toString({x:-10,y:-10},1)
 
     return [l1,l2,l3]
   }
 
   this.path = function()
   {
-    return new Generator(dotgrid.tool.layer(),dotgrid.tool.style()).toString({x:0,y:0},1)
+    return new Generator(dotgrid.tool.layer(),dotgrid.tool.style()).toString({x:-10,y:-10},1)
   }
 
   this.translate = function(a,b)