From db5d0962bae5566d61684df9893341fc8d7093e2 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sat, 17 Dec 2022 17:33:32 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=AF=B9=E6=AF=94=20https://github.com/siyua?=
 =?UTF-8?q?n-note/siyuan/issues/6858?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/main.js       | 26 +++++++++++++++++++-------
 kernel/model/repository.go | 12 ++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/electron/main.js b/app/electron/main.js
index d619cb288..032403cd6 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -441,6 +441,24 @@ const boot = () => {
 
     resetTrayMenu()
   }
+  const setWndTopMenu = {
+    label: trayMenu.cancelWindowTop,
+    click: () => {
+      setCancelWndTop()
+    },
+  }
+  const setCancelWndTop = () => {
+    if (!mainWindow.isAlwaysOnTop()) {
+      mainWindow.setAlwaysOnTop(true)
+      setWndTopMenu.label = trayMenu.cancelWindowTop
+    } else {
+      mainWindow.setAlwaysOnTop(false)
+      setWndTopMenu.label = trayMenu.setWindowTop
+    }
+
+    resetTrayMenu()
+  }
+
 
   const buildTrayMenuTemplate = () => {
     let ret = [
@@ -477,13 +495,7 @@ const boot = () => {
       let changeWndTop = {
         label: trayMenu.setWindowTop,
         click: () => {
-          if (!mainWindow.isAlwaysOnTop()) {
-            mainWindow.setAlwaysOnTop(true)
-            changeWndTop.label = trayMenu.cancelWindowTop
-          } else {
-            mainWindow.setAlwaysOnTop(false)
-            changeWndTop.label = trayMenu.setWindowTop
-          }
+
         },
       };
       ret.splice(1, 0, changeWndTop)
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 346538ba8..3620edad4 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -169,6 +169,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
 			Title:  title,
 		})
 	}
+	if 1 > len(ret.AddsLeft) {
+		ret.AddsLeft = []*DiffFile{}
+	}
 
 	for _, updateLeft := range diff.UpdatesLeft {
 		title, err := parseTitleInSnapshot(updateLeft.ID, repo, luteEngine)
@@ -182,6 +185,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
 			Title:  title,
 		})
 	}
+	if 1 > len(ret.UpdatesLeft) {
+		ret.UpdatesLeft = []*DiffFile{}
+	}
 
 	for _, updateRight := range diff.UpdatesRight {
 		title, err := parseTitleInSnapshot(updateRight.ID, repo, luteEngine)
@@ -195,6 +201,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
 			Title:  title,
 		})
 	}
+	if 1 > len(ret.UpdatesRight) {
+		ret.UpdatesRight = []*DiffFile{}
+	}
 
 	for _, removeRight := range diff.RemovesRight {
 		title, err := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
@@ -208,6 +217,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
 			Title:  title,
 		})
 	}
+	if 1 > len(ret.RemovesRight) {
+		ret.RemovesRight = []*DiffFile{}
+	}
 	return
 }