v0.1.0-alpha4

GGIEnrike · Aug 31, 2022 · 442ea91 · 442ea91
1 parent a075a18
commit 442ea91
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 45 deletions.
diff --git a/src/SettingsDropdown.ts b/src/SettingsDropdown.ts
@@ -8,44 +8,46 @@ export class SettingsDropdown {
     open: boolean
     canOpen: boolean
     constructor(xMargin: number, yMargin: number, width: number, height: number, fileName: string, win: BrowserWindow, v: BrowserView, theme: 'dark' | 'light') {
-        this.view = new BrowserView({webPreferences: {preload: path.join(__dirname, "settingsPreload.js")}})
-        this.win = win
-        this.v = v
+        ipcMain.once('loadedView', () => {
+            this.view = new BrowserView({webPreferences: {preload: path.join(__dirname, "settingsPreload.js")}})
+            this.win = win
+            this.v = v
 
-        let y = this.v.getBounds().y + yMargin
+            let y = this.v.getBounds().y + yMargin
 
-        this.win.addBrowserView(this.view)
-        this.view.setBounds({ x: this.win.getBounds().width - xMargin - width, y: y, width: width, height: height })
-
-        this.hide()
-
-        this.view.webContents.send('setTheme', theme)
-
-        ipcMain.on('toggleSettings', () => {
-            if (this.open) {
-                this.hide()
-            } else {
-                if (this.canOpen) {
-                    this.show()
-                }
-            }
-        })
-
-        ipcMain.on('lockButtonPressed', () => {
-            y = this.v.getBounds().y + yMargin
+            this.win.addBrowserView(this.view)
             this.view.setBounds({ x: this.win.getBounds().width - xMargin - width, y: y, width: width, height: height })
-        })
+
+            this.hide()
+
+            this.view.webContents.send('setTheme', theme)
+
+            ipcMain.on('toggleSettings', () => {
+                if (this.open) {
+                    this.hide()
+                } else {
+                    if (this.canOpen) {
+                        this.show()
+                    }
+                }
+            })
 
-        // this.view.webContents.openDevTools()
-
-        this.view.webContents.loadFile(path.join(__dirname, fileName))
-
-        this.win.on('resize', () => {
-            this.view.setBounds({ x: this.win.getBounds().width - xMargin - width, y: y, width: width, height: height })
-        })
+            ipcMain.on('lockButtonPressed', () => {
+                y = this.v.getBounds().y + yMargin
+                this.view.setBounds({ x: this.win.getBounds().width - xMargin - width, y: y, width: width, height: height })
+            })
 
-        this.view.webContents.on('blur', () => {
-            this.hide()
+            // this.view.webContents.openDevTools()
+
+            this.view.webContents.loadFile(path.join(__dirname, fileName))
+
+            this.win.on('resize', () => {
+                this.view.setBounds({ x: this.win.getBounds().width - xMargin - width, y: y, width: width, height: height })
+            })
+
+            this.view.webContents.on('blur', () => {
+                this.hide()
+            })
         })
     }
 

diff --git a/src/View.ts b/src/View.ts
@@ -1,4 +1,4 @@
-import { BrowserView, BrowserWindow, ipcMain, dialog, MenuItem, Menu } from "electron"
+import { BrowserView, BrowserWindow, ipcMain, dialog } from "electron"
 import * as path from "path"
 import { LoadingError } from "./LoadingError"
 
@@ -190,8 +190,6 @@ export class View {
             win.webContents.send('canGoBack', this.view.webContents.canGoBack())
             win.webContents.send('canGoForward', this.view.webContents.canGoForward())
 
-            // win.webContents.send('canRefresh', this.homePage)
-
             if (this.homePage) {
                 this.shouldEnableZoom = false
             } else {
@@ -208,11 +206,8 @@ export class View {
             }
         })
 
-        this.view.webContents.on('did-finish-load', () => {
-            // this.homeCount += 1
-            // if (this.homeCount > 0) {
-            //     this.homePage = false
-            // }
+        this.view.webContents.once('did-finish-load', () => {
+            ipcMain.emit('loadedView')
         })
 
         // this.view.webContents.on('did-navigate', () => {

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -62,10 +62,6 @@ window.api.handleCanGoForward((_ev: Event, canGoForward: boolean) => {
     forwardButton.disabled = !canGoForward
 })
 
-window.api.handleCanRefresh((_ev: Event, canRefresh: boolean) => {
-    refreshButton.disabled = canRefresh
-})
-
 searchBar.addEventListener('keyup' , (event: KeyboardEvent) => {
     //key code for enter
     if (event.key === 'Enter') {