hk/kunkun
1
0
Fork 0
mirror of https://github.com/kunkunsh/kunkun.git synced 2025-04-11 17:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(desktop): global hot key register during init must be after appConfig.init (#113)

Browse Source
This commit is contained in:
Huakun Shen 2025-02-13 23:13:35 -05:00 committed by GitHub
parent f1cace38d4
commit 4221b574c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@kksh/desktop", "name": "@kksh/desktop",
"version": "0.1.21", "version": "0.1.22",
"description": "", "description": "",
"type": "module", "type": "module",
"scripts": { "scripts": {

10
apps/desktop/src/lib/utils/init.ts
View File

@ -14,10 +14,10 @@ export function init() {
} }
if (!dev) { if (!dev) {
document.addEventListener("contextmenu", function (event) { // document.addEventListener("contextmenu", function (event) {
event.preventDefault() // event.preventDefault()
console.warn("contextmenu disabled in release mode", event) // console.warn("contextmenu disabled in release mode", event)
}) // })
} }
} }
@ -31,6 +31,6 @@ export function initMainWindow() {
info(`Registering hotkey: ${hotkeyStr}`) info(`Registering hotkey: ${hotkeyStr}`)
registerAppHotkey(hotkeyStr) registerAppHotkey(hotkeyStr)
} else { } else {
console.log("No hotkey found in confi") console.log("No hotkey found in config")
} }
} }

6
apps/desktop/src/routes/+layout.svelte
View File

@ -1,16 +1,10 @@
<script lang="ts"> <script lang="ts">
import { ParaglideJS } from "@inlang/paraglide-sveltekit" import { ParaglideJS } from "@inlang/paraglide-sveltekit"
import { i18n } from "$lib/i18n" import { i18n } from "$lib/i18n"
import { onMount } from "svelte"
import "../app.css" import "../app.css"
import { init } from "@/utils/init"
import { ModeWatcher, ThemeWrapper } from "@kksh/svelte5" import { ModeWatcher, ThemeWrapper } from "@kksh/svelte5"
import { Toaster } from "svelte-sonner" import { Toaster } from "svelte-sonner"
onMount(() => {
init()
})
let { children } = $props() let { children } = $props()
</script> </script>

2
apps/desktop/src/routes/app/+layout.svelte
View File

@ -6,6 +6,7 @@
import { appsLoader } from "@/stores/apps" import { appsLoader } from "@/stores/apps"
import { initDeeplink } from "@/utils/deeplink" import { initDeeplink } from "@/utils/deeplink"
import { updateAppHotkey } from "@/utils/hotkey" import { updateAppHotkey } from "@/utils/hotkey"
import { init as initApp } from "@/utils/init"
import { globalKeyDownHandler, globalKeyUpHandler, goBackOrCloseOnEscape } from "@/utils/key" import { globalKeyDownHandler, globalKeyUpHandler, goBackOrCloseOnEscape } from "@/utils/key"
import { listenToWindowBlur } from "@/utils/tauri-events" import { listenToWindowBlur } from "@/utils/tauri-events"
import { isInMainWindow } from "@/utils/window" import { isInMainWindow } from "@/utils/window"
@ -63,6 +64,7 @@
.catch(error) .catch(error)
quickLinks.init() quickLinks.init()
appConfig.init().then(() => { appConfig.init().then(() => {
initApp()
console.log("appConfig.language", $appConfig.language) console.log("appConfig.language", $appConfig.language)
setLanguageTag($appConfig.language as AvailableLanguageTag) setLanguageTag($appConfig.language as AvailableLanguageTag)
switchToLanguage($appConfig.language as AvailableLanguageTag) switchToLanguage($appConfig.language as AvailableLanguageTag)