From 13a25b15b728e014f1a788d88af487c8d9d3ba97 Mon Sep 17 00:00:00 2001
From: mikkame <matchasoft.jp@gmail.com>
Date: Thu, 14 May 2020 22:12:30 +0900
Subject: [PATCH] fixed #36

---
 public/preload.js |  5 +++++
 src/App.vue       | 13 ++++++++++---
 src/background.js | 10 +++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/public/preload.js b/public/preload.js
index 1cf49cc..871cb38 100644
--- a/public/preload.js
+++ b/public/preload.js
@@ -7,6 +7,11 @@ contextBridge.exposeInMainWorld(
 
 ipcRenderer.on('drop-file', (e, data) => {
     const event = new CustomEvent('drop-file', {detail:data})
+    document.dispatchEvent(event)
+})
 
+ipcRenderer.on('toggle-draw', (e) => {
+    const event = new Event('toggle-draw')
     document.dispatchEvent(event)
 })
+
diff --git a/src/App.vue b/src/App.vue
index 89c326d..fb03b77 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  #app(@drop="dropFile", @dragover.prevent, @dragenter.prevent, @keydown.shift="pen =true", @keyup="pen =false", tabindex="0")
+  #app(@drop="dropFile", @dragover.prevent, @dragenter.prevent, tabindex="0")
 
     Moveable.moveable(
       v-if="camera_stream && !full_screen_camera",
@@ -25,8 +25,9 @@
         BlankTab(:tab='tab', v-if='tab.type === "BlankTab"' @changeTab='changeTab')
         FileTab(:tab='tab', v-if='tab.type === "FileTab"')
         CaptureTab(:tab='tab', v-if='tab.type === "CaptureTab"')
-      svg.pen_field(v-if="pen", @mousemove.prevent="pen_stroke", @mousedown="pen_start",@mouseout="pen_end",@mouseup="pen_end")
-        path(:d="strokeToPathString(stroke)", v-for="stroke in pen_strokes", fill="transparent" stroke="red" stroke-width="5").path
+    svg.pen_field(v-if="pen", @mousemove.prevent="pen_stroke", @mousedown="pen_start",@mouseout="pen_end",@mouseup="pen_end")
+      span ペンモード Ctrl+D で終了
+      path(:d="strokeToPathString(stroke)", v-for="stroke in pen_strokes", fill="transparent" stroke="red" stroke-width="5").path
 
     .footer-bar-wrapper
       .footer-bar
@@ -211,6 +212,10 @@
               })
                 console.log(vm.tabs)
             })
+            document.addEventListener('toggle-draw', () => {
+                vm.pen = !vm.pen
+                console.log('draw')
+            })
 
         }
 
@@ -231,6 +236,8 @@
     top: 0;
     width: 100%;
     height: 100%;
+    box-shadow: inset 0px 0px 10px 0px rgba(255,0,0,1)
+
   }
 
   html, body, #app {
diff --git a/src/background.js b/src/background.js
index 7a01ea4..993e38d 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,10 +1,12 @@
 'use strict'
 
-import {app, BrowserWindow, protocol} from 'electron'
+import {app, BrowserWindow, protocol, globalShortcut} from 'electron'
 import {createProtocol,} from 'vue-cli-plugin-electron-builder/lib'
 import fs from 'fs'
 import path from 'path'
 const mime = require('mime')
+const localShortcut = require("electron-localshortcut");
+
 const isDevelopment = process.env.NODE_ENV !== 'production'
 
 // Keep a global reference of the window object, if you don't, the window will
@@ -50,6 +52,12 @@ function createWindow() {
             name: path.basename(filepath)
         })
     })
+    let ret = globalShortcut.register('CommandOrControl+D', () => {
+        webContents.send('toggle-draw')
+
+    })
+
+
 
 }