Merge branch 'dev'

Figma-Linux · Feb 5, 2020 · a0a2c4a · a0a2c4a
2 parents def5fb4 + 7d2881f
commit a0a2c4a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,7 @@ build
 *.deb
 *.bak
 Figma-app*
+snap/parts
+snap/prime
+snap/snap
+snap/stage
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "chokidar": "^3.0.2",
     "electron-devtools-installer": "^2.2.4",
     "electron-settings": "github:ChugunovRoman/electron-settings#figma-linux",
-    "figma-linux-rust-binding": "^0.1.3",
+    "figma-linux-rust-binding": "^0.1.4",
     "electron-build-env": "^0.2",
     "mobx": "^5.6.0",
     "mobx-react": "^5.4.2",

diff --git a/src/main/window/WindowManager.ts b/src/main/window/WindowManager.ts
@@ -350,6 +350,8 @@ class WindowManager {
 
     this.mainWindow.webContents.send(Const.TABADDED, { id: tab.id, url, showBackBtn: true, title });
 
+    this.mainWindow.setBrowserView(tab);
+
     return tab;
   };
 
@@ -407,11 +409,8 @@ class WindowManager {
   };
 
   private onMainWindowWillNavigate = (event: any, newUrl: string) => {
-    // const currentUrl = event.sender.getURL();
     const currentUrl = event.sender.getURL();
 
-    console.log("from: ", currentUrl, " to: ", newUrl);
-
     if (newUrl === currentUrl) {
       event.preventDefault();
       return;

diff --git a/src/middleware/webBinding.ts b/src/middleware/webBinding.ts
@@ -21,7 +21,7 @@ interface IntiApiOptions {
   shortcutMan?: any;
 }
 
-const API_VERSION = 19;
+const API_VERSION = 20;
 let webPort: MessagePort;
 let fontMap: any = null;
 let resolveFontMapPromise: any = null;

diff --git a/src/package.json b/src/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "chokidar": "^3.0.2",
     "electron-devtools-installer": "^2.2.4",
-    "figma-linux-rust-binding": "^0.1.3",
+    "figma-linux-rust-binding": "^0.1.4",
     "electron-build-env": "^0.2",
     "electron-settings": "github:ChugunovRoman/electron-settings#figma-linux",
     "mobx": "^5.0.3",