diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-12-11 13:16:23 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-12-17 12:51:41 +0100 |
| commit | 47131524871f740cb12e85a47e45ef998d38205c (patch) | |
| tree | e861d244a29da93585f980b84cf93a73539dc498 | |
| parent | 4480a3a230598dfee0dca3d4f692b3c72812c60b (diff) | |
| download | mullvadvpn-47131524871f740cb12e85a47e45ef998d38205c.tar.xz mullvadvpn-47131524871f740cb12e85a47e45ef998d38205c.zip | |
Set zoom level limits in main process instead of renderer
| -rw-r--r-- | gui/src/main/index.ts | 3 | ||||
| -rw-r--r-- | gui/src/renderer/app.tsx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 02be33b2d2..a2e9a0560a 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -444,6 +444,9 @@ class ApplicationMain { } catch (error) { log.error(`Failed to load index file: ${error.message}`); } + + // disable pinch to zoom + consumePromise(this.windowController.webContents.setVisualZoomLevelLimits(1, 1)); } } diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 1be8f11384..f9cff36663 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -1,4 +1,3 @@ -import { webFrame } from 'electron'; import log from 'electron-log'; import * as React from 'react'; import { Provider } from 'react-redux'; @@ -210,9 +209,6 @@ export default class AppRenderer { if (initialState.isConnected) { consumePromise(this.onDaemonConnected()); } - - // disable pinch to zoom - webFrame.setVisualZoomLevelLimits(1, 1); } public renderView() { |