kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix zoom

This commit is contained in:
Mr. Stallion 2021-09-06 19:57:01 -05:00
parent c7044ed435
commit 7b6e391348
3 changed files with 65 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electron/Index.vue
View File

@ -330,6 +330,11 @@
(<Modal>this.$refs['fixLogsModal']).show();
});
electron.ipcRenderer.on('update-zoom', (_e, zoomLevel) => {
webContents.setZoomLevel(zoomLevel);
// log.info('INDEXVUE ZOOM UPDATE', zoomLevel);
});
window.addEventListener('keydown', (e) => {
const key = getKey(e);

7
electron/Window.vue
View File

@ -49,6 +49,8 @@
const browserWindow = electron.remote.getCurrentWindow();
// void browserWindow.webContents.setVisualZoomLevelLimits(1, 5);
function getWindowBounds(): Electron.Rectangle {
const bounds = browserWindow.getContentBounds();
const height = document.body.offsetHeight;
@ -132,6 +134,11 @@
}
});
// electron.ipcRenderer.on('update-zoom', (_e: Event, zoomLevel: number) => {
// // log.info('WINDOWVUE ZOOM UPDATE', zoomLevel);
// // browserWindow.webContents.setZoomLevel(zoomLevel);
// });
electron.ipcRenderer.on('connect', (_e: Event, id: number, name: string) => {
const tab = this.tabMap[id];
tab.user = name;

56
electron/main.ts
View File

@ -170,6 +170,9 @@ function setUpWebContents(webContents: Electron.WebContents): void {
else return electron.shell.openExternal(linkUrl);
};
webContents.setVisualZoomLevelLimits(1, 5);
webContents.on('will-navigate', openLinkExternally);
webContents.on('new-window', openLinkExternally);
}
@ -338,6 +341,8 @@ function showPatchNotes(): void {
}
let zoomLevel = 0;
function onReady(): void {
let hasCompletedUpgrades = false;
@ -408,9 +413,49 @@ function onReady(): void {
const viewItem = {
label: `&${l('action.view')}`,
submenu: <Electron.MenuItemConstructorOptions[]>[
{role: 'resetzoom'},
{role: 'zoomin'},
{role: 'zoomout'},
// {role: 'resetZoom'},
{
label: 'Reset Zoom',
click: (_m: Electron.MenuItem, w: Electron.BrowserWindow) => {
// log.info('MENU ZOOM0');
// w.webContents.setZoomLevel(0);
zoomLevel = 0;
for(const win of electron.webContents.getAllWebContents()) win.send('update-zoom', 0);
for(const win of windows) win.webContents.send('update-zoom', 0);
},
accelerator: 'CmdOrCtrl+0'
},
{
// role: 'zoomIn',
label: 'Zoom In',
click: (_m: Electron.MenuItem, w: Electron.BrowserWindow) => {
// log.info('MENU ZOOM+');
zoomLevel = Math.min(zoomLevel + w.webContents.getZoomFactor()/2, 6);
// w.webContents.setZoomLevel(newZoom);
for(const win of electron.webContents.getAllWebContents()) win.send('update-zoom', zoomLevel);
for(const win of windows) win.webContents.send('update-zoom', zoomLevel);
},
accelerator: 'CmdOrCtrl+Plus'
},
{
// role: 'zoomIn',
label: 'Zoom Out',
click: (_m: Electron.MenuItem, w: Electron.BrowserWindow) => {
// log.info('MENU ZOOM-');
zoomLevel = Math.max(0, zoomLevel - w.webContents.getZoomFactor()/2);
// w.webContents.setZoomLevel(newZoom);
for(const win of electron.webContents.getAllWebContents()) win.send('update-zoom', zoomLevel);
for(const win of windows) win.webContents.send('update-zoom', zoomLevel);
},
accelerator: 'CmdOrCtrl+-'
},
// {role: 'zoomOut'},
{type: 'separator'},
{role: 'togglefullscreen'}
]
@ -658,6 +703,11 @@ function onReady(): void {
for(const w of electron.webContents.getAllWebContents()) w.send('rising-upgrade-complete');
});
electron.ipcMain.on('update-zoom', (_e, zoomLevel: number) => {
// log.info('MENU ZOOM UPDATE', zoomLevel);
for(const w of electron.webContents.getAllWebContents()) w.send('update-zoom', zoomLevel);
});
createWindow();
}