Merge pull request #532 from mbektas/prevent_mainwindow_devtools

disable devtools for mainwindow
jupyterlab · Dec 6, 2022 · 8611946 · 8611946
2 parents 6246e25 + 3c5f59b
commit 8611946
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/main/dialog/themedwindow.ts b/src/main/dialog/themedwindow.ts
@@ -4,6 +4,7 @@
 import { BrowserWindow } from 'electron';
 import * as fs from 'fs';
 import * as path from 'path';
+import { DarkThemeBGColor, LightThemeBGColor } from '../utils';
 
 export class ThemedWindow {
   constructor(options: ThemedWindow.IWindowOptions) {
@@ -75,15 +76,15 @@ export class ThemedWindow {
           }
           body {
             margin: 0;
-            background: #ffffff;
+            background: ${LightThemeBGColor};
             color: #000000;
             font-size: var(--type-ramp-base-font-size);
             font-family: var(--body-font);
             -webkit-user-select: none;
             user-select: none;
           }
           body.app-ui-dark {
-            background: #212121;
+            background: ${DarkThemeBGColor};
             color: #ffffff;
           }
           .page-container {

diff --git a/src/main/mainwindow/mainwindow.ts b/src/main/mainwindow/mainwindow.ts
@@ -4,7 +4,12 @@
 import { BrowserWindow } from 'electron';
 import { LabView } from '../labview/labview';
 import { TitleBarView } from '../titlebarview/titlebarview';
-import { appConfig, isDarkTheme } from '../utils';
+import {
+  appConfig,
+  DarkThemeBGColor,
+  isDarkTheme,
+  LightThemeBGColor
+} from '../utils';
 
 export class MainWindow {
   constructor(options: MainWindow.IOptions) {
@@ -21,7 +26,12 @@ export class MainWindow {
       title: 'JupyterLab',
       titleBarStyle: 'hidden',
       frame: process.platform === 'darwin',
-      backgroundColor: isDarkTheme(appConfig.theme) ? '#212121' : '#ffffff'
+      backgroundColor: isDarkTheme(appConfig.theme)
+        ? DarkThemeBGColor
+        : LightThemeBGColor,
+      webPreferences: {
+        devTools: false
+      }
     });
 
     this._window.setMenuBarVisibility(false);

diff --git a/src/main/utils.ts b/src/main/utils.ts
@@ -17,6 +17,9 @@ import log from 'electron-log';
 import { app, nativeTheme } from 'electron';
 import { IPythonEnvironment } from './tokens';
 
+export const DarkThemeBGColor = '#212121';
+export const LightThemeBGColor = '#ffffff';
+
 export interface IAppConfiguration {
   isRemote: boolean;
   url: URL;