Skip to content

Commit 69445b8

Browse files
RoderickQiuRoderickQiu
committed
update to 1.28.0 etc
also fix windows maximize bug
1 parent 3a744e2 commit 69445b8

File tree

4 files changed

+69
-77
lines changed

4 files changed

+69
-77
lines changed

‎main.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,14 @@ function createWindow() {
120120
}
121121
});
122122

123-
win.on('maximize', () => {
124-
isMaximized = true;
125-
});
126-
127123
win.on('enter-full-screen', () => {
128-
isMaximized = true;
124+
if (process.platform == "darwin") isMaximized = true;
129125
})
130126

131127
win.on('leave-full-screen', () => {
132-
isMaximized = false;
128+
if (process.platform == "darwin") isMaximized = false;
133129
})
134130

135-
win.on('unmaximize', () => {
136-
isMaximized = false;
137-
});
138-
139131
//prevent app-killers for lock mode / focus mode
140132
win.webContents.on('crashed', () => {
141133
if (store.get('islocked') || (fullScreenProtection && isTimerWin && (process.env.NODE_ENV !== "development") && (!isLoose))) relaunchSolution();
@@ -1857,8 +1849,13 @@ ipcMain.on('window-minimize', function () {
18571849

18581850
ipcMain.on('window-maximize', function () {
18591851
if (win != null) {
1860-
if (isMaximized) win.unmaximize();
1861-
else win.maximize();
1852+
if (isMaximized) {
1853+
win.unmaximize();
1854+
if (process.platform != "darwin") isMaximized = false;
1855+
} else {
1856+
win.maximize();
1857+
if (process.platform != "darwin") isMaximized = true;
1858+
}
18621859
}
18631860
})
18641861

‎package.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
{
2-
"name": "wnr",
3-
"version": "1.27.0",
4-
"description": "Work and rest, with wnr now!",
5-
"main": "main.js",
6-
"scripts": {
7-
"dep-update": "yarn",
8-
"start": "cross-env NODE_ENV=development electron .",
9-
"nsis": "cross-env NODE_ENV=production node ./res/builder/nsis.js",
10-
"7zip": "cross-env NODE_ENV=portable node ./res/builder/win-zip.js",
11-
"mac": "cross-env NODE_ENV=production node ./res/builder/mac.js",
12-
"linux": "cross-env NODE_ENV=production node ./res/builder/linux.js",
13-
"appimage": "cross-env NODE_ENV=production node ./res/builder/appimage.js",
14-
"dir": "cross-env NODE_ENV=production node ./res/builder/dir_test.js",
15-
"ms-store": "cross-env NODE_ENV=msstore node ./res/builder/dir_test.js"
2+
"name" : "wnr",
3+
"version" : "1.28.0",
4+
"description" : "Work and rest, with wnr now!",
5+
"main" : "main.js",
6+
"scripts" : {
7+
"dep-update" : "yarn",
8+
"start" : "cross-env NODE_ENV=development electron .",
9+
"nsis" : "cross-env NODE_ENV=production node ./res/builder/nsis.js",
10+
"7zip" : "cross-env NODE_ENV=portable node ./res/builder/win-zip.js",
11+
"mac" : "cross-env NODE_ENV=production node ./res/builder/mac.js",
12+
"linux" : "cross-env NODE_ENV=production node ./res/builder/linux.js",
13+
"appimage" : "cross-env NODE_ENV=production node ./res/builder/appimage.js",
14+
"dir" : "cross-env NODE_ENV=production node ./res/builder/dir_test.js",
15+
"ms-store" : "cross-env NODE_ENV=msstore node ./res/builder/dir_test.js"
1616
},
17-
"repository": {
18-
"type": "git",
19-
"url": "https://github.com/RoderickQiu/wnr.git"
17+
"repository" : {
18+
"type" : "git",
19+
"url" : "https://github.com/RoderickQiu/wnr.git"
2020
},
21-
"author": "RoderickQiu",
22-
"license": "MPL-2.0",
23-
"homepage": "https://getwnr.com",
24-
"appId": "com.scrisstudio.wnr",
25-
"build": {
26-
"appId": "com.scrisstudio.wnr"
21+
"author" : "RoderickQiu",
22+
"license" : "MPL-2.0",
23+
"homepage" : "https://getwnr.com",
24+
"appId" : "com.scrisstudio.wnr",
25+
"build" : {
26+
"appId" : "com.scrisstudio.wnr"
2727
},
28-
"copyright": "(c) Roderick Qiu",
29-
"productName": "wnr",
30-
"dependencies": {
31-
"@eastdesire/jscolor": "^2.5.1",
32-
"@electron/remote": "2.0.8",
33-
"bootstrap": "4.6.1",
34-
"cmd-or-ctrl": "0.3.1",
35-
"compare-version": "0.1.2",
36-
"copy-to-clipboard": "3.3.1",
37-
"crypto-js": "4.1.1",
38-
"electron-debug": "3.2.0",
39-
"electron-store": "8.0.2",
40-
"i18n": "0.15.0",
41-
"jquery": "3.6.0",
42-
"node-fetch": "2.6.7",
43-
"node-notifier": "10.0.1",
44-
"node-shi": "0.4.2",
45-
"popper.js": "1.16.1",
46-
"schart.js": "3.0.0",
47-
"win-release-id": "1.0.6"
28+
"copyright" : "(c) Roderick Qiu",
29+
"productName" : "wnr",
30+
"dependencies" : {
31+
"@eastdesire/jscolor" : "2.5.1",
32+
"@electron/remote" : "2.0.8",
33+
"bootstrap" : "4.6.1",
34+
"cmd-or-ctrl" : "0.3.1",
35+
"compare-version" : "0.1.2",
36+
"copy-to-clipboard" : "3.3.1",
37+
"crypto-js" : "4.1.1",
38+
"electron-debug" : "3.2.0",
39+
"electron-store" : "8.0.2",
40+
"i18n" : "0.15.0",
41+
"jquery" : "3.6.0",
42+
"node-fetch" : "2.6.7",
43+
"node-notifier" : "10.0.1",
44+
"node-shi" : "0.4.2",
45+
"popper.js" : "1.16.1",
46+
"schart.js" : "3.0.0",
47+
"win-release-id" : "1.0.6"
4848
},
49-
"devDependencies": {
50-
"cross-env": "7.0.3",
51-
"electron": "18.3.5",
52-
"electron-builder": "23.0.3"
49+
"devDependencies" : {
50+
"cross-env" : "7.0.3",
51+
"electron" : "18.3.5",
52+
"electron-builder" : "23.0.3"
5353
}
5454
}

‎update.json

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
{
2-
"version" : "1.27.0",
3-
"feature-introduction" : true,
2+
"version" : "1.28.0",
3+
"feature-introduction" : false,
44
"content" : {
55
"zh-CN" : [
6-
"新增了每几轮计时进行一次长休息、在计时结束前几秒弹出通知提示的功能，可以在设置面板中打开。",
7-
"新增了第一轮工作计时缩短一定时间的功能，使计时更加灵活，可以在计时主界面“更多设置”菜单中打开。",
8-
"使用自制提示框替换系统提示框，减少看不到提示窗口的情况。",
9-
"修复了外置标题窗口中笔记无法同步、正计时时托盘菜单中计时信息显示错误的问题。",
10-
"我们收到了关于 wnr 的 MINI 模式窗口在 Windows 10/11 系统上部分播放器全屏后无法显示的问题，但暂未解决，欢迎 Pull Request。"
6+
"新增了对窗口最大化的支持，这种介于全屏专心与普通计时之间的模式将带来更大的方便。",
7+
"新增了在设置中自定义工作、休息等的主题颜色的功能。",
8+
"修复了几个小问题。"
119
],
1210
"zh-TW" : [
13-
"新增了每幾輪計時進行一次長休息、在計時結束前幾秒彈出通知提示的功能，可以在設置面板中打開。",
14-
"新增了第一輪工作計時縮短一定時間的功能，使計時更加靈活，可以在計時主界面“更多設置”菜單中打開。",
15-
"使用自制提示框替換系統提示框，減少看不到提示窗口的情況。",
16-
"修復了外置標題窗口中筆記無法同步、正計時時托盤菜單中計時信息顯示錯誤的問題。",
17-
"我們收到了關於 wnr 的 MINI 模式窗口在 Windows 10/11 系統上部分播放器全屏後無法顯示的問題，但暫未解決，歡迎 Pull Request。"
11+
"新增了對窗口最大化的支持，這種介於全屏專心與普通計時之間的模式將帶來更大的方便。",
12+
"新增了在設置中自定義工作、休息等的主題顏色的功能。",
13+
"修復了幾個小問題。"
1814
],
1915
"en" : [
20-
"New features: 1. Optimized long break, 2. Notification before a time period will end in seconds, 3.First work period discount, 4. A new dialog box style that can prevent being hidden.",
21-
"Bugs fixed about: 1. Note sync in eternal title window, 2. Tray message malfunction in stopwatch mode.",
22-
"Help wanted: Some users said that MINI mode fails to show when some video players are fullscreened, but I couldn't solve it. Pull Requests are welcomed."
23-
16+
"New feature: maximizable window.",
17+
"New feature: new setting about customizing theme colors. ",
18+
"Several bugs fixed."
2419
]
2520
},
2621
"introduce" : {

‎yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ajv "^6.12.0"
1616
ajv-keywords "^3.4.1"
1717

18-
"@eastdesire/jscolor@^2.5.1":
18+
"@eastdesire/jscolor@2.5.1":
1919
version "2.5.1"
2020
resolved "https://registry.npmmirror.com/@eastdesire/jscolor/-/jscolor-2.5.1.tgz#3c3d3a9c0d8e5803abc49d02defd1ac8dfa57896"
2121
integrity sha512-+D7Xz2f1Zxpc438q0s7wwKHwWal596dcAGcWp+pxfHlYtt0LVdynMFrf0PYdmwHt8idKfeglyU2h2LdkATFcbQ==
@@ -937,7 +937,7 @@ electron-store@8.0.2:
937937

938938
electron@18.3.5:
939939
version "18.3.5"
940-
resolved "https://mirrors.huaweicloud.com/repository/npm/electron/-/electron-18.3.5.tgz#a589c2bfa3fe807914a055f54f665999329b739b"
940+
resolved "https://registry.npmmirror.com/electron/-/electron-18.3.5.tgz#a589c2bfa3fe807914a055f54f665999329b739b"
941941
integrity sha512-/GJ39X3ijpyZiOtYQ1ha5Ly0hWiIzF19CGEapM9euaM2AZrmt79x+MckQDXqJxOaVA9YHXju5Ho6b9pB9a/2pQ==
942942
dependencies:
943943
"@electron/get" "^1.13.0"

0 commit comments

Comments
 (0)