diff --git a/app/src/assets/scss/_reset.scss b/app/src/assets/scss/_reset.scss index 302454f70..e3f76f123 100644 --- a/app/src/assets/scss/_reset.scss +++ b/app/src/assets/scss/_reset.scss @@ -55,7 +55,7 @@ body { -webkit-font-smoothing: auto; .toolbar { - padding: 0 0 0 5px; + padding: 0; } .fullscreen { diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 4b739785e..8389cc36f 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -182,6 +182,13 @@ progressLoading: 400 padding-left: 0; } + #windowAppIcon { + -webkit-app-region: drag; + width: 42px; + margin-left: 1px; + justify-content: center; + } + #windowControls { top: 0; z-index: 502; diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index 39c46a321..ffa8a172c 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -179,7 +179,8 @@ export const onGetConfig = (isStart: boolean) => { }; const initBar = () => { - document.querySelector(".toolbar").innerHTML = ` + const toolbar = document.getElementById("toolbar"); + toolbar.innerHTML = `
`; - document.querySelector(".toolbar").addEventListener("click", (event: MouseEvent) => { + toolbar.addEventListener("click", (event: MouseEvent) => { let target = event.target as HTMLElement; while (!target.classList.contains("toolbar")) { if (target.id === "barBack") { @@ -463,8 +464,18 @@ const initWindow = () => { } return; } - const controlsElement = document.querySelector("#windowControls"); document.body.classList.add("body--win32"); + + //添加应用图标 + const toolbar = document.getElementById("toolbar"); + toolbar.insertAdjacentHTML("afterbegin", ``); + + //添加窗口控件 + const controlsElement = document.getElementById("windowControls"); controlsElement.innerHTML = `