fix for external editor in storyboarder spec for clip studio pro

wonderunit · Dec 6, 2017 · d22dd34 · d22dd34
1 parent 007f13f
commit d22dd34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/js/files/file-helper.js b/src/js/files/file-helper.js
@@ -154,6 +154,9 @@ let writePhotoshopFileFromPNGPathLayers = (pngPathLayers, psdPath, options) => {
           curCanvas.width = curLayerImg.width
           curCanvas.height = curLayerImg.height
           context.drawImage(curLayerImg, 0, 0)
+          // hack
+          context.fillStyle = 'rgba(0,0,0,0.1)'
+          context.fillRect(0,0, 1, 1)
           child.canvas = curCanvas
           psdWidth = curLayerImg.width > psdWidth ? curLayerImg.width : psdWidth
           psdHeight = curLayerImg.height > psdHeight ? curLayerImg.height : psdHeight

diff --git a/src/js/window/main-window.js b/src/js/window/main-window.js
@@ -1730,27 +1730,21 @@ let openInEditor = async () => {
       let pathToEditor = prefsModule.getPrefs()['absolutePathToImageEditor']
       if (pathToEditor) {
         let binaryPath
+        let execString
 
         // use .exe directly on win32
         if (pathToEditor.match(/\.exe$/)) {
           binaryPath = pathToEditor
-
+          execString = `"${binaryPath}" "${pathToLinkedFile}"`
         // find binary in .app package on macOS
-      } else if (pathToEditor.match(/\.app$/)) {
-          try {
-            let obj = plist.parse(fs.readFileSync(path.join(pathToEditor, 'Contents', 'Info.plist'), 'utf8'))
-            if (obj.CFBundlePackageType === 'APPL') {
-              binaryPath = path.join(pathToEditor, 'Contents', 'MacOS', obj.CFBundleExecutable)
-            } else {
-              errmsg = 'Not a valid .app package'
-            }
-          } catch (err) {
-            errmsg = 'Could not find executable binary in .app'
-          }
+        } else if (pathToEditor.match(/\.app$/)) {
+          binaryPath = pathToEditor
+          execString = `open -a "${binaryPath}" "${pathToLinkedFile}"`
         }
 
         if (binaryPath) {
-          child_process.exec(`"${binaryPath}" ${pathToLinkedFile}`, (error, stdout, stderr) => {
+          child_process.exec(execString, (error, stdout, stderr) => {
+            console.log(execString)
             if (error) {
               notifications.notify({ message: `[WARNING] ${error}` })
               return