Merge branch 'hotfix/1.1.1'

Author: ECRomaneli

src/service/FrameService.ts

@@ -241,29 +241,29 @@ class FrameService {
     this.setupNavbarForCurrentPage();
 
     if (!Storage.getSettings<boolean>(Settings.SHARE_BOUNDS)) {
-      frame.isMaximized() && this.toggleMaximize();
+      frame.isMaximized() && frame.unmaximize();
       const bounds = PageService.getPageBounds(page);
       frame.setBounds(bounds);
     }
 
+    this.ensureWindowVisible(frame);
     this.updateChildrenBounds();
 
     const dragHandle = Draggable.from(frame);
     const navbar = NavbarService.getView();
-    if (navbar) {
+    if (navbar && frame.contentView.children.length === 0) {
       frame.contentView.addChildView(navbar);
-      dragHandle.attach(navbar.webContents, {
-        exclude: 'button',
-      });
+      dragHandle.attach(navbar.webContents, { exclude: 'button' });
     } else {
       dragHandle.attach(newView.webContents, {
-        region: { height: Storage.getSettings(Settings.ACTION_AREA) as number },
+        region: { height: Storage.getSettings<number>(Settings.ACTION_AREA) },
         exclude: 'button, a, input, select, textarea',
       });
     }
+
     this.safeDisplay(frame, newView);
     this.buildViewFindbar(newView);
-    show && this.show();
+    show && !frame.isVisible() && this.show();
   }
 
   private safeDisplay(frame: BaseWindow, view: PageView): void {

web/preferences/components/settings/Settings.js

@@ -97,6 +97,26 @@ app.component('Settings', {
             description: s.actionAreaDesc,
             data: { type: 'number', min: 0, value: await storage.getSettings(this.$const.Settings.ACTION_AREA), unit: 'px' }
           },
+          {
+            id: this.$const.Settings.USE_EXTERNAL_BROWSER,
+            label: s.useExternalBrowser,
+            description: s.useExternalBrowserDesc,
+            data: { type: 'bool', value: await storage.getSettings(this.$const.Settings.USE_EXTERNAL_BROWSER) }
+          },
+          {
+            id: this.$const.Settings.GROUP_PAGES_BY_SESSION,
+            label: s.groupPagesBySession,
+            description: s.groupPagesBySessionDesc,
+            data: { type: 'bool', value: await storage.getSettings(this.$const.Settings.GROUP_PAGES_BY_SESSION) }
+          },
+          {
+            id: this.$const.Settings.ALLOW_FULLSCREEN,
+            label: s.allowFullscreen,
+            description: s.allowFullscreenDesc,
+            data: { type: 'bool', value: await storage.getSettings(this.$const.Settings.ALLOW_FULLSCREEN) }
+          }
+        ],
+        [s.appearance]: [
           {
             id: this.$const.Settings.APP_THEME,
             label: s.appTheme,
@@ -126,26 +146,6 @@ app.component('Settings', {
               ]
             }
           },
-          {
-            id: this.$const.Settings.USE_EXTERNAL_BROWSER,
-            label: s.useExternalBrowser,
-            description: s.useExternalBrowserDesc,
-            data: { type: 'bool', value: await storage.getSettings(this.$const.Settings.USE_EXTERNAL_BROWSER) }
-          },
-          {
-            id: this.$const.Settings.GROUP_PAGES_BY_SESSION,
-            label: s.groupPagesBySession,
-            description: s.groupPagesBySessionDesc,
-            data: { type: 'bool', value: await storage.getSettings(this.$const.Settings.GROUP_PAGES_BY_SESSION) }
-          },
-          {
-            id: this.$const.Settings.ALLOW_FULLSCREEN,
-            label: s.allowFullscreen,
-            description: s.allowFullscreenDesc,
-            data: { type: 'bool', value: await storage.getSettings(this.$const.Settings.ALLOW_FULLSCREEN) }
-          }
-        ],
-        [s.appearance]: [
           {
             id: this.$const.Settings.SHOW_FRAME,
             label: s.showFrame,