Skip to content

Commit 98701dc

Browse files
committed
Merge pull request 'fix: hide window in macOS;message-tokens-popup scroll' (#146) from fix_hotkey_close_window into main
Reviewed-on: https://git.biggo.com/john/dive/pulls/146
2 parents e60f74e + ee02d51 commit 98701dc

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

electron/main/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ app.on("before-quit", () => {
210210
app.on("activate", () => {
211211
const allWindows = BrowserWindow.getAllWindows()
212212
if (allWindows.length) {
213+
allWindows[0].show()
213214
allWindows[0].focus()
214215
} else {
215216
if (win) {

src/styles/pages/_Chat.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,11 @@
11881188

11891189
.popup-confirm-content {
11901190
padding: 0;
1191-
min-height: 605px;
1191+
min-height: 0;
1192+
overflow-y: auto;
1193+
justify-content: flex-start;
1194+
1195+
@include scrollbar;
11921196
}
11931197

11941198
span {

0 commit comments

Comments
 (0)