Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 09:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/7363

Browse source
This commit is contained in:
Vanessa 2023-02-15 11:41:50 +08:00
parent b407ff9003
commit 65c3cefac5
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/assets/scss/_layout.scss
View file

@ -26,8 +26,11 @@
} }
&.layout--floatr { &.layout--floatr {
border-left: 1px solid var(--b3-border-color); border: 1px solid var(--b3-border-color);
box-shadow: -8px 0px 24px rgb(140 149 159 / 20%); box-shadow: -8px 0px 24px rgb(140 149 159 / 20%);
border-right: 0;
border-radius: 8px 0 0 8px;
overflow: hidden;
} }
&.layout--floatt { &.layout--floatt {

4
app/src/layout/dock/index.ts
View file

@ -157,9 +157,7 @@ top: 112px;bottom: 82px;left:0`);
} else if (this.position === "Right") { } else if (this.position === "Right") {
this.layout.element.setAttribute("style", `width:${this.layout.element.clientWidth}px; this.layout.element.setAttribute("style", `width:${this.layout.element.clientWidth}px;
opacity:${show ? 1 : 0}; opacity:${show ? 1 : 0};
right:0; right:0;top: 112px;bottom: 82px;`);
top: ${document.getElementById("toolbar").offsetHeight + document.getElementById("dockTop").offsetHeight}px;
bottom: ${document.getElementById("status").offsetHeight + document.getElementById("dockBottom").offsetHeight}px;`);
} else { } else {
this.layout.element.setAttribute("style", `height:${this.layout.element.clientHeight}px; this.layout.element.setAttribute("style", `height:${this.layout.element.clientHeight}px;
opacity:${show ? 1 : 0}; opacity:${show ? 1 : 0};

5
app/src/layout/dock/util.ts
View file

@ -90,12 +90,9 @@ export const resetFloatDockSize = () => {
if (!window.siyuan.layout.leftDock.pin && window.siyuan.layout.leftDock.layout.element.style.opacity === "1") { if (!window.siyuan.layout.leftDock.pin && window.siyuan.layout.leftDock.layout.element.style.opacity === "1") {
window.siyuan.layout.leftDock.showDock(true); window.siyuan.layout.leftDock.showDock(true);
} }
if (!window.siyuan.layout.rightDock.pin) { if (!window.siyuan.layout.rightDock.pin && window.siyuan.layout.rightDock.layout.element.style.opacity === "1") {
window.siyuan.layout.rightDock.resetDockPosition(window.siyuan.layout.rightDock.layout.element.style.opacity === "1")
if (window.siyuan.layout.rightDock.layout.element.style.opacity === "1") {
window.siyuan.layout.rightDock.showDock(true); window.siyuan.layout.rightDock.showDock(true);
} }
}
if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity === "1") { if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity === "1") {
window.siyuan.layout.topDock.showDock(true) window.siyuan.layout.topDock.showDock(true)
} }