diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html
index 966000277..90a9f4555 100644
--- a/app/appearance/icons/index.html
+++ b/app/appearance/icons/index.html
@@ -338,13 +338,13 @@
- iconTopLeft
+ iconTopLeft
- iconTopRight
+ iconTopRight
-
diff --git a/app/src/assets/template/desktop/index.tpl b/app/src/assets/template/desktop/index.tpl
index f0e940dc8..5ef84704d 100644
--- a/app/src/assets/template/desktop/index.tpl
+++ b/app/src/assets/template/desktop/index.tpl
@@ -16,7 +16,6 @@
-
diff --git a/app/src/constants.ts b/app/src/constants.ts
index 3af7e6c20..8bba683e4 100644
--- a/app/src/constants.ts
+++ b/app/src/constants.ts
@@ -250,20 +250,6 @@ export abstract class Constants {
"instance": "Layout",
"children": [{
"direction": "lr",
- "size": "0px",
- "type": "top",
- "instance": "Layout",
- "children": [{
- "instance": "Wnd",
- "children": []
- }, {
- "instance": "Wnd",
- "resize": "lr",
- "children": []
- }]
- }, {
- "direction": "lr",
- "resize": "tb",
"size": "auto",
"type": "normal",
"instance": "Layout",
@@ -318,10 +304,6 @@ export abstract class Constants {
}]
}]
},
- top: {
- pin: true,
- data: []
- },
bottom: {
pin: true,
data: []
diff --git a/app/src/index.ts b/app/src/index.ts
index 240d48a70..5ae5896df 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -139,10 +139,6 @@ class App {
pin: true,
data: response.data.conf.uiLayout.right
};
- window.siyuan.config.uiLayout.top = {
- pin: true,
- data: response.data.conf.uiLayout.top
- };
window.siyuan.config.uiLayout.bottom = {
pin: true,
data: response.data.conf.uiLayout.bottom
diff --git a/app/src/layout/dock/index.ts b/app/src/layout/dock/index.ts
index 8416b3166..c43931a77 100644
--- a/app/src/layout/dock/index.ts
+++ b/app/src/layout/dock/index.ts
@@ -26,22 +26,17 @@ export class Dock {
constructor(options: { data: { pin: boolean, data: IDockTab[][] }, position: TDockPosition }) {
switch (options.position) {
case "Left":
- this.layout = window.siyuan.layout.layout.children[1].children[0] as Layout;
+ this.layout = window.siyuan.layout.layout.children[0].children[0] as Layout;
this.resizeElement = this.layout.element.nextElementSibling as HTMLElement;
this.layout.element.classList.add("layout--floatl");
break;
case "Right":
- this.layout = window.siyuan.layout.layout.children[1].children[2] as Layout;
+ this.layout = window.siyuan.layout.layout.children[0].children[2] as Layout;
this.resizeElement = this.layout.element.previousElementSibling as HTMLElement;
this.layout.element.classList.add("layout--floatr");
break;
- case "Top":
- this.layout = window.siyuan.layout.layout.children[0] as Layout;
- this.resizeElement = this.layout.element.nextElementSibling as HTMLElement;
- this.layout.element.classList.add("layout--floatt");
- break;
case "Bottom":
- this.layout = window.siyuan.layout.layout.children[2] as Layout;
+ this.layout = window.siyuan.layout.layout.children[1] as Layout;
this.resizeElement = this.layout.element.previousElementSibling as HTMLElement;
this.layout.element.classList.add("layout--floatb");
break;
@@ -475,13 +470,6 @@ export class Dock {
case "Right":
direct = "w";
break;
- case "Top":
- if (index === 0) {
- direct = "se";
- } else {
- direct = "sw";
- }
- break;
case "Bottom":
if (index === 0) {
direct = "ne";
diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts
index e3e934f3a..1a23b132f 100644
--- a/app/src/layout/dock/util.ts
+++ b/app/src/layout/dock/util.ts
@@ -93,9 +93,6 @@ export const resetFloatDockSize = () => {
if (!window.siyuan.layout.rightDock.pin && window.siyuan.layout.rightDock.layout.element.style.opacity === "1") {
window.siyuan.layout.rightDock.showDock(true);
}
- if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity === "1") {
- window.siyuan.layout.topDock.showDock(true);
- }
if (!window.siyuan.layout.bottomDock.pin && window.siyuan.layout.bottomDock.layout.element.style.opacity === "1") {
window.siyuan.layout.bottomDock.showDock(true);
}
diff --git a/app/src/layout/getAll.ts b/app/src/layout/getAll.ts
index 0dd35ebe1..81a7c754f 100644
--- a/app/src/layout/getAll.ts
+++ b/app/src/layout/getAll.ts
@@ -77,11 +77,6 @@ export const getAllDocks = () => {
docks.push(dock);
});
});
- window.siyuan.config.uiLayout.top.data.forEach((item: IDockTab[]) => {
- item.forEach((dock: IDockTab) => {
- docks.push(dock);
- });
- });
window.siyuan.config.uiLayout.bottom.data.forEach((item: IDockTab[]) => {
item.forEach((dock: IDockTab) => {
docks.push(dock);
diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts
index 5f6cd0590..08292ecd1 100644
--- a/app/src/layout/util.ts
+++ b/app/src/layout/util.ts
@@ -75,9 +75,6 @@ export const getDockByType = (type: TDockType) => {
if (window.siyuan.layout.bottomDock.data[type]) {
return window.siyuan.layout.bottomDock;
}
- if (window.siyuan.layout.topDock.data[type]) {
- return window.siyuan.layout.topDock;
- }
};
export const switchWnd = (newWnd: Wnd, targetWnd: Wnd) => {
@@ -155,7 +152,6 @@ export const exportLayout = (reload: boolean, cb?: () => void) => {
const layoutJSON: any = {
hideDock: useElement.getAttribute("xlink:href") === "#iconDock",
layout: {},
- top: dockToJSON(window.siyuan.layout.topDock),
bottom: dockToJSON(window.siyuan.layout.bottomDock),
left: dockToJSON(window.siyuan.layout.leftDock),
right: dockToJSON(window.siyuan.layout.rightDock),
@@ -171,8 +167,7 @@ export const exportLayout = (reload: boolean, cb?: () => void) => {
};
const JSONToDock = (json: any) => {
- window.siyuan.layout.centerLayout = window.siyuan.layout.layout.children[1].children[1] as Layout;
- window.siyuan.layout.topDock = new Dock({position: "Top", data: json.top});
+ window.siyuan.layout.centerLayout = window.siyuan.layout.layout.children[0].children[1] as Layout;
window.siyuan.layout.leftDock = new Dock({position: "Left", data: json.left});
window.siyuan.layout.rightDock = new Dock({position: "Right", data: json.right});
window.siyuan.layout.bottomDock = new Dock({position: "Bottom", data: json.bottom});
@@ -706,7 +701,6 @@ export const addResize = (obj: Layout | Wnd) => {
resizeTabs();
if (!isWindow()) {
window.siyuan.layout.leftDock.setSize();
- window.siyuan.layout.topDock.setSize();
window.siyuan.layout.bottomDock.setSize();
window.siyuan.layout.rightDock.setSize();
}
diff --git a/app/src/menus/dock.ts b/app/src/menus/dock.ts
index 3a932838b..48ff50333 100644
--- a/app/src/menus/dock.ts
+++ b/app/src/menus/dock.ts
@@ -9,8 +9,6 @@ const moveMenuItem = (label: string, target: Element) => {
window.siyuan.layout.leftDock.add(label.endsWith("Top") ? 0 : 1, target);
} else if (label.indexOf("moveToRight") > -1) {
window.siyuan.layout.rightDock.add(label.endsWith("Top") ? 0 : 1, target);
- } else if (label.indexOf("moveToTop") > -1) {
- window.siyuan.layout.topDock.add(label.endsWith("Left") ? 0 : 1, target);
} else if (label.indexOf("moveToBottom") > -1) {
window.siyuan.layout.bottomDock.add(label.endsWith("Left") ? 0 : 1, target);
}
@@ -24,8 +22,6 @@ export const initDockMenu = (target: Element) => {
window.siyuan.menus.menu.append(moveMenuItem("moveToLeftBottom", target).element);
window.siyuan.menus.menu.append(moveMenuItem("moveToRightTop", target).element);
window.siyuan.menus.menu.append(moveMenuItem("moveToRightBottom", target).element);
- window.siyuan.menus.menu.append(moveMenuItem("moveToTopLeft", target).element);
- window.siyuan.menus.menu.append(moveMenuItem("moveToTopRight", target).element);
window.siyuan.menus.menu.append(moveMenuItem("moveToBottomLeft", target).element);
window.siyuan.menus.menu.append(moveMenuItem("moveToBottomRight", target).element);
return window.siyuan.menus.menu;
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index 343b21575..dbbb0ee66 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -64,7 +64,6 @@ export const workspaceMenu = (rect: DOMRect) => {
dockMenu.push(togglePinDock(window.siyuan.layout.leftDock, "iconLeftTop"));
dockMenu.push(togglePinDock(window.siyuan.layout.rightDock, "iconRightTop"));
dockMenu.push(togglePinDock(window.siyuan.layout.bottomDock, "iconBottomLeft"));
- dockMenu.push(togglePinDock(window.siyuan.layout.topDock, "iconTopLeft"));
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.panels,
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index b692a5d15..f497dfc56 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -204,7 +204,6 @@ interface ISiyuan {
layout?: {
layout?: import("../layout").Layout,
centerLayout?: import("../layout").Layout,
- topDock?: import("../layout/dock").Dock,
leftDock?: import("../layout/dock").Dock,
rightDock?: import("../layout/dock").Dock,
bottomDock?: import("../layout/dock").Dock,
diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts
index a86acf80b..22469b1e3 100644
--- a/app/src/util/globalShortcut.ts
+++ b/app/src/util/globalShortcut.ts
@@ -101,7 +101,7 @@ export const globalShortcut = () => {
if (!window.siyuan.layout.leftDock.pin && window.siyuan.layout.leftDock.layout.element.clientWidth > 0 &&
// 隐藏停靠栏会导致点击两侧内容触发浮动面板弹出，因此需减小鼠标范围
(window.siyuan.layout.leftDock.element.clientWidth > 0 || (window.siyuan.layout.leftDock.element.clientWidth === 0 && event.clientX < 8))) {
- if (event.clientY > document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight &&
+ if (event.clientY > document.getElementById("toolbar").clientHeight &&
event.clientY < window.innerHeight - document.getElementById("status").clientHeight - document.getElementById("dockBottom").clientHeight) {
if (!hasClosestByClassName(event.target, "b3-menu") &&
!hasClosestByClassName(event.target, "layout--float")) {
@@ -114,7 +114,7 @@ export const globalShortcut = () => {
} else if (event.clientX > window.innerWidth - 41) {
if (!window.siyuan.layout.rightDock.pin && window.siyuan.layout.rightDock.layout.element.clientWidth > 0 &&
(window.siyuan.layout.rightDock.element.clientWidth > 0 || (window.siyuan.layout.rightDock.element.clientWidth === 0 && event.clientX > window.innerWidth - 8))) {
- if (event.clientY > document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight &&
+ if (event.clientY > document.getElementById("toolbar").clientHeight &&
event.clientY < window.innerHeight - document.getElementById("status").clientHeight - document.getElementById("dockBottom").clientHeight) {
if (!hasClosestByClassName(event.target, "layout--float")) {
window.siyuan.layout.rightDock.showDock();
@@ -125,9 +125,7 @@ export const globalShortcut = () => {
}
}
- if (event.clientY < 75) {
- window.siyuan.layout.topDock.showDock();
- } else if (event.clientY > window.innerHeight - 73) {
+ if (event.clientY > window.innerHeight - 73) {
window.siyuan.layout.bottomDock.showDock();
}
}
@@ -835,9 +833,6 @@ export const globalShortcut = () => {
// dock float 时，点击空白处，隐藏 dock
const floatDockLayoutElement = hasClosestByClassName(event.target, "layout--float", true);
if (floatDockLayoutElement) {
- if (!floatDockLayoutElement.isSameNode(window.siyuan.layout.topDock.layout.element)) {
- window.siyuan.layout.topDock.hideDock();
- }
if (!floatDockLayoutElement.isSameNode(window.siyuan.layout.bottomDock.layout.element)) {
window.siyuan.layout.bottomDock.hideDock();
}
@@ -848,7 +843,6 @@ export const globalShortcut = () => {
window.siyuan.layout.rightDock.hideDock();
}
} else if (!hasClosestByClassName(event.target, "dock") && !isWindow()) {
- window.siyuan.layout.topDock.hideDock();
window.siyuan.layout.bottomDock.hideDock();
window.siyuan.layout.leftDock.hideDock();
window.siyuan.layout.rightDock.hideDock();