An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Align fullscreen toolbars with native window controls https://github.com/siyuan-note/siyuan/issues/20779
Daniel7b71da77be3b
diff --git a/app/src/assets/scss/util/_reset.scss b/app/src/assets/scss/util/_reset.scssindex adc01b7bb6..800a76c086 100644--- a/app/src/assets/scss/util/_reset.scss+++ b/app/src/assets/scss/util/_reset.scss@@ -87,6 +87,11 @@ body {&.body--windows,&.body--linux {--b3-toolbar-left-mac: 8px;+ --b3-fullscreen-controls-width: 128.5px;++ &.body--toolbar-hide {+ --b3-fullscreen-controls-width: calc(46.5px + 6 * var(--b3-ui-window-control-padding, 13.25px));+ }.toolbar:not(.toolbar--browser) {padding: 0 0 0 5px;@@ -98,7 +103,7 @@ body {.fullscreen {& > .protyle-breadcrumb,& > .block__icons {- padding-right: 126px;+ padding-right: calc(var(--b3-fullscreen-controls-width) + 8px);}& > .block__icons > .search__label {@@ -146,7 +151,7 @@ body {&:not(.body--toolbar-hide):not(.body--window) {.fullscreen > .protyle-breadcrumb,.fullscreen > .block__icons {- min-height: 32px;+ min-height: var(--b3-ui-toolbar-height, 32px);}}diff --git a/app/tests/frontendPlatformLayout.test.js b/app/tests/frontendPlatformLayout.test.jsindex ecc44a8dee..d6e46026a8 100644--- a/app/tests/frontendPlatformLayout.test.js+++ b/app/tests/frontendPlatformLayout.test.js@@ -39,7 +39,7 @@ const browserCases = ({css, mobile}) => {<span class="fn__space"></span><span class="block__icon">X</span></div></div>`;const input = document.querySelector("input");const padding = frontend === "browser-desktop" ? 8 :- (frontend === "desktop-window" ? (platform === "mac" ? 42 : 168) : (platform === "mac" ? 8 : 126));+ (frontend === "desktop-window" ? (platform === "mac" ? 42 : 168) : (platform === "mac" ? 8 : 136.5));check.equal(getComputedStyle(input).right, (frontend === "browser-desktop" || platform === "mac" ? 8 : 108) + "px", label);check.equal(getComputedStyle(document.querySelector(".block__icons")).paddingRight, padding + "px", label);if (frontend === "browser-desktop") {@@ -51,6 +51,32 @@ const browserCases = ({css, mobile}) => {}}}+ if (!mobile) {+ document.documentElement.setAttribute("data-frontend", "desktop");+ for (const platform of ["windows", "linux"]) {+ for (const density of ["default", "compact"]) {+ document.documentElement.setAttribute("data-ui-density", density);+ for (const fused of [false, true]) {+ document.body.className = `body--${platform}${fused ? " body--toolbar-hide" : ""}`;+ for (const headerClass of ["block__icons", "protyle-breadcrumb"]) {+ const label = `${platform}/${density}/${fused}/${headerClass}`;+ document.body.innerHTML = `<div id="toolbar" class="toolbar fn__flex"><div class="fn__flex-1"></div>+ <div id="windowControls" class="fn__flex">${["win", "win", "close"].map(type =>+ `<div class="toolbar__item toolbar__item--${type}"><svg></svg></div>`).join("")}</div></div>+ <div class="fullscreen"><div class="${headerClass}"><div class="fn__flex-1"></div>+ <span class="block__icon"><svg></svg></span></div></div>`;+ const controls = document.querySelector("#windowControls").getBoundingClientRect();+ const header = document.querySelector(`.${headerClass}`).getBoundingClientRect();+ const button = document.querySelector(".block__icon").getBoundingClientRect();+ check.ok(button.right <= controls.left - 4, `${label} functional and window buttons do not overlap`);+ check.ok(Math.abs((header.top + header.bottom - controls.top - controls.bottom) / 2) <= .5,+ `${label} header and window controls share their vertical center`);+ }+ }+ }+ }+ document.documentElement.removeAttribute("data-ui-density");+ }};if (process.versions.electron && process.type === "browser") {