Skip to content

Commit 6e8d698

Browse files
committed
feat: zoom function
1 parent bb7fa46 commit 6e8d698

File tree

5 files changed

+28
-4
lines changed

5 files changed

+28
-4
lines changed

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# UnderScript App Changelog
22

3+
## Version 1.3.0 (2020-02-28)
4+
### New Features
5+
1. Zoom with CTRL+Scroll
6+
### Bug fixes
7+
1. Fixed underscript bundler
8+
39
## Version 1.2.0 (2020-12-31)
410
Happy New Year!
511
### New Features

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"author": "feildmaster <[email protected]> (https://feildmaster.com/)",
1717
"license": "MIT",
1818
"devDependencies": {
19-
"electron": "^11.1.1",
20-
"electron-builder": "^22.11.5",
21-
"@types/fs-extra": "^9.0.13"
19+
"@types/fs-extra": "^9.0.13",
20+
"electron": "^11.5.0",
21+
"electron-builder": "^22.11.5"
2222
},
2323
"dependencies": {
2424
"electron-context-menu": "^2.3.1",

src/electron.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ function createWindow() {
1010
nodeIntegration: false,
1111
contextIsolation: false,
1212
enableRemoteModule: false,
13+
worldSafeExecuteJavaScript: false,
14+
preload: path.resolve(app.getAppPath(), 'src', 'preload', 'index.js'),
1315
},
1416
icon: path.resolve(app.getAppPath(), 'src', 'uc.png'),
1517
});
1618

19+
// TODO: make a script manager, instead of using this thing
1720
win.webContents.session.setPreloads([
1821
path.resolve(app.getPath('userData'), 'underscript.bundle.js'),
19-
path.resolve(app.getAppPath(), 'src', 'preload', 'rememberMe.js'),
2022
]);
2123

2224
win.webContents.session.webRequest.onHeadersReceived((details, callback) => {

src/preload/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require('./rememberMe');
2+
require('./zoom');

src/preload/zoom.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const { webFrame } = require('electron');
2+
3+
function handle(event) {
4+
if (!event.ctrlKey) return;
5+
const adjust = event.deltaY < 0 ? -0.1 : 0.1;
6+
const factor = Math.max(Math.min(webFrame.getZoomFactor() + adjust, 2), 0.5);
7+
webFrame.setZoomFactor(factor);
8+
}
9+
10+
document.addEventListener('DOMContentLoaded', () => {
11+
document.addEventListener('wheel', handle, {
12+
passive: true,
13+
});
14+
});

0 commit comments

Comments
 (0)