- Fix double window bug

- Transparent window title bar on Windows

.github/workflows/darwin.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Use Node.js 12.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 16.x
 
     - name: Add OSX certificate
       env:

.github/workflows/win32.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: windows-2019
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js 12.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 16.x
     - name: install dependencies
       run: yarn
     - name: build

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Raindrop.io",
 	"productName": "Raindrop.io",
-	"version": "0.0.0",
+	"version": "5.4.16",
 	"description": "Crossplatform bookmarking app",
 	"main": "src/index.js",
 	"repository": {
@@ -34,13 +34,13 @@
 		"update-electron-app": "2.0.x"
 	},
 	"devDependencies": {
-		"@electron-forge/cli": "6.0.0-beta.61",
-		"@electron-forge/maker-appx": "6.0.0-beta.61",
-		"@electron-forge/maker-dmg": "6.0.0-beta.61",
-		"@electron-forge/maker-squirrel": "6.0.0-beta.61",
-		"@electron-forge/maker-zip": "6.0.0-beta.61",
-		"@electron-forge/publisher-github": "6.0.0-beta.61",
-		"electron": "13.0.x",
+		"@electron-forge/cli": "6.0.0-beta.63",
+		"@electron-forge/maker-appx": "6.0.0-beta.63",
+		"@electron-forge/maker-dmg": "6.0.0-beta.63",
+		"@electron-forge/maker-squirrel": "6.0.0-beta.63",
+		"@electron-forge/maker-zip": "6.0.0-beta.63",
+		"@electron-forge/publisher-github": "6.0.0-beta.63",
+		"electron": "16.0.x",
 		"shx": "^0.3.2"
 	}
 }

src/navigation.js

@@ -1,36 +1,4 @@
 const { app, shell } = require('electron')
-const { URL } = require('url')
-
-function onWillNavigate(e, url) {
-    let origin, target
-
-    //origin
-    try{
-        origin = new URL(e.sender.getURL())
-    }catch(e) {
-        if (String(e).includes('Invalid URL'))
-            origin = new URL('about:blank')
-        else
-            throw e
-    }
-
-    //target
-    try{
-        target = new URL(url)
-    }catch(e) {
-        if (String(e).includes('Invalid URL'))
-            target = new URL('about:blank')
-        else
-            throw e
-    }
-
-    //external link
-    if (origin.host != target.host ||
-        origin.protocol != target.protocol){
-        onNewWindow(e, url)
-        return
-    }
-}
 
 function onNewWindow(e, url) {
     e.preventDefault()
@@ -39,9 +7,6 @@ function onNewWindow(e, url) {
 
 module.exports = function() {
     app.on('web-contents-created', (e, contents) => {
-        if (contents.getType() == 'window')
-            contents.on('will-navigate', onWillNavigate)
-
         contents.on('new-window', onNewWindow)
     })
 }

src/window.js

@@ -34,7 +34,11 @@ class Window {
 			nativeWindowOpen: true,
 
 			//appearance
-			titleBarStyle: process.platform == 'darwin' ? 'hidden' : 'default',
+			titleBarStyle: (process.platform == 'darwin' || process.platform == 'win32') ? 'hidden' : 'default',
+			titleBarOverlay: {
+				color: nativeTheme.shouldUseDarkColors ? '#303030' : 'white',
+				symbolColor: nativeTheme.shouldUseDarkColors ? 'white' : 'black'
+			},
 			backgroundColor: nativeTheme.shouldUseDarkColors ? '#303030' : 'white',
 			fullscreenable: process.platform == 'darwin',