fix: Additional window cannot be opened in production

Voxelum · May 6, 2023 · 5dbf1da · 5dbf1da
1 parent 094e32a
commit 5dbf1da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/xmcl-electron-app/main/Controller.ts b/xmcl-electron-app/main/Controller.ts
@@ -59,6 +59,8 @@ export default class Controller implements LauncherAppController {
           trafficLightPosition: this.app.platform.name === 'osx' ? { x: 14, y: 10 } : undefined,
           minWidth: 600,
           minHeight: 600,
+          width: 1024,
+          height: 768,
 
           webPreferences: {
             contextIsolation: true,
@@ -79,6 +81,14 @@ export default class Controller implements LauncherAppController {
     window.webContents.setWindowOpenHandler(this.windowOpenHandler)
     window.webContents.on('will-navigate', this.onWebContentWillNavigate)
     window.webContents.on('did-create-window', this.onWebContentCreateWindow)
+    this.logger.log(`Try to open window ${details.url}`)
+    window.once('ready-to-show', () => {
+      window.loadURL(details.url).then(() => {
+        this.logger.log(`Opened window ${details.url}`)
+      }, (e) => {
+        this.logger.log(`Fail to open window ${details.url}`, e)
+      })
+    })
   }
 
   private onWebContentWillNavigate = (event: Event, url: string) => {

diff --git a/xmcl-keystone-ui/src/views/Modpack.vue b/xmcl-keystone-ui/src/views/Modpack.vue
@@ -114,6 +114,7 @@
 import FilterCombobox from '@/components/FilterCombobox.vue'
 import { useFilterCombobox, useService } from '@/composables'
 import { kModpacks } from '@/composables/modpack'
+import { kMarketRoute } from '@/composables/useMarketRoute'
 import { isStringArrayEquals } from '@/util/equal'
 import { injection } from '@/util/inject'
 import { CachedFTBModpackVersionManifest, ModpackServiceKey, Resource, ResourceServiceKey } from '@xmcl/runtime-api'
@@ -125,10 +126,8 @@ import { AddInstanceDialogKey } from '../composables/instanceAdd'
 import { ModpackItem } from '../composables/modpack'
 import ModpackCard from './ModpackCard.vue'
 import DeleteButton from './ModpackDeleteButton.vue'
-import { useMarketRoute } from '@/composables/useMarketRoute'
 
 const { t } = useI18n()
-const { push } = useRouter()
 const dragging = ref(undefined as undefined | ModpackItem)
 const { removeResources, updateResources } = useService(ResourceServiceKey)
 const { showModpacksFolder } = useService(ModpackServiceKey)
@@ -176,7 +175,7 @@ function onDrop() {
     startDelete(dragging.value)
   }
 }
-const { goToCurseforge, goToModrinth } = useMarketRoute()
+const { goToCurseforge, goToModrinth } = injection(kMarketRoute)
 
 function getModpackItem (resource: Resource): ModpackItem {
   const metadata = resource.metadata