Release v1.1

Fry98 · Sep 18, 2018 · 7f79a29 · 7f79a29
2 parents 9448639 + 47765f9
commit 7f79a29
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 5 deletions.
diff --git a/App/config.json b/App/config.json
@@ -1 +1 @@
-{"rightClick":88,"leftClick":90}
+{"rightClick":88,"leftClick":90,"mouse":false}
diff --git a/App/images/cat_m7.png b/App/images/cat_m7.png
diff --git a/App/images/cat_m8.png b/App/images/cat_m8.png
diff --git a/App/images/cat_m9.png b/App/images/cat_m9.png
diff --git a/App/images/cat_ma.png b/App/images/cat_ma.png
diff --git a/App/images/cat_mb.png b/App/images/cat_mb.png
diff --git a/App/images/cat_mc.png b/App/images/cat_mc.png
diff --git a/App/js/core.js b/App/js/core.js
@@ -65,4 +65,9 @@ iohook.start();
     rightCode = e.keyCode;
     document.getElementById('right-inp').value = String.fromCharCode(e.keyCode);
   };
-}
+}
+
+ipcRenderer.on('mtoggle', ()=>{
+  config.mouse = !config.mouse;
+  fs.writeFileSync(__dirname + '/config.json', JSON.stringify(config), 'utf8');
+});
diff --git a/App/js/draw.js b/App/js/draw.js
@@ -9,11 +9,11 @@ module.exports = ()=>{
   }
   ctx.drawImage(images[mouseArea], 0, 0, 1280, 720, 0, 0, canv.width, canv.height);
   if (keyMap[config.leftClick]) {
-    ctx.drawImage(images[6], 0, 0, 1280, 720, 0, 0, canv.width, canv.height);
+    ctx.drawImage(images[12], 0, 0, 1280, 720, 0, 0, canv.width, canv.height);
   } else if (keyMap[config.rightClick]) {
-    ctx.drawImage(images[6], 0, 0, 1280, 720, unit(20), unit(10), canv.width, canv.height);
+    ctx.drawImage(images[12], 0, 0, 1280, 720, unit(20), unit(10), canv.width, canv.height);
   } else {
-    ctx.drawImage(images[7], 0, 0, 1280, 720, unit(10), 0, canv.width, canv.height);
+    ctx.drawImage(images[13], 0, 0, 1280, 720, unit(10), 0, canv.width, canv.height);
   }
 };
 

diff --git a/App/js/update.js b/App/js/update.js
@@ -15,5 +15,8 @@ module.exports = ()=>{
     } else {
       mouseArea = downArea;
     }
+    if (config.mouse) {
+      mouseArea += 6;
+    }
   }
 };
diff --git a/main.js b/main.js
@@ -14,6 +14,12 @@ function createWindow(){
             win.webContents.send('keybind');
           }
         },
+        {
+          label: 'Toggle Mouse/Tablet',
+          click: ()=>{
+            win.webContents.send('mtoggle');
+          }
+        },
         {
           label: 'Exit',
           click: ()=>{