Skip to content

Commit 3291b33

Browse files
committed
Fixes for Windows version cannot input with IME #48
1 parent 4c93131 commit 3291b33

File tree

1 file changed

+37
-31
lines changed

1 file changed

+37
-31
lines changed

main.js

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if (require('electron-squirrel-startup')) return;
22

33
// Modules to control application life and create native browser window
4-
const { app, BrowserWindow, Menu, webContents } = require("electron")
4+
const { app, BrowserWindow, Menu, session } = require("electron")
55
const path = require("path")
66
const { updateElectronApp, UpdateSourceType } = require('update-electron-app')
77

@@ -13,6 +13,10 @@ function createWindow() {
1313
icon: __dirname + "/assets/icon.ico",
1414
webPreferences: {
1515
preload: path.join(__dirname, "preload.js"),
16+
nodeIntegration: false,
17+
nativeWindowOpen: true,
18+
contextIsolation: false,
19+
sandbox: false,
1620
},
1721
});
1822

@@ -22,7 +26,9 @@ function createWindow() {
2226
// Open the DevTools.
2327
// mainWindow.webContents.openDevTools()
2428
}
25-
29+
// Workarounds - #48
30+
app.commandLine.appendSwitch('disable-features', 'ImmersiveIme');
31+
app.commandLine.appendSwitch('enable-blink-features', 'TextInputIme');
2632
// This method will be called when Electron has finished
2733
// initialization and is ready to create browser windows.
2834
// Some APIs can only be used after this event occurs.
@@ -55,21 +61,21 @@ const template = [
5561
// { role: 'appMenu' }
5662
...(isMac
5763
? [
58-
{
59-
label: app.name,
60-
submenu: [
61-
{ role: "about" },
62-
{ type: "separator" },
63-
{ role: "services" },
64-
{ type: "separator" },
65-
{ role: "hide" },
66-
{ role: "hideOthers" },
67-
{ role: "unhide" },
68-
{ type: "separator" },
69-
{ role: "quit" },
70-
],
71-
},
72-
]
64+
{
65+
label: app.name,
66+
submenu: [
67+
{ role: "about" },
68+
{ type: "separator" },
69+
{ role: "services" },
70+
{ type: "separator" },
71+
{ role: "hide" },
72+
{ role: "hideOthers" },
73+
{ role: "unhide" },
74+
{ type: "separator" },
75+
{ role: "quit" },
76+
],
77+
},
78+
]
7379
: []),
7480
// { role: 'fileMenu' }
7581
{
@@ -88,15 +94,15 @@ const template = [
8894
{ role: "paste" },
8995
...(isMac
9096
? [
91-
{ role: "pasteAndMatchStyle" },
92-
{ role: "delete" },
93-
{ role: "selectAll" },
94-
{ type: "separator" },
95-
{
96-
label: "Speech",
97-
submenu: [{ role: "startSpeaking" }, { role: "stopSpeaking" }],
98-
},
99-
]
97+
{ role: "pasteAndMatchStyle" },
98+
{ role: "delete" },
99+
{ role: "selectAll" },
100+
{ type: "separator" },
101+
{
102+
label: "Speech",
103+
submenu: [{ role: "startSpeaking" }, { role: "stopSpeaking" }],
104+
},
105+
]
100106
: [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
101107
],
102108
},
@@ -127,11 +133,11 @@ const template = [
127133
{ role: "zoom" },
128134
...(isMac
129135
? [
130-
{ type: "separator" },
131-
{ role: "front" },
132-
{ type: "separator" },
133-
{ role: "window" },
134-
]
136+
{ type: "separator" },
137+
{ role: "front" },
138+
{ type: "separator" },
139+
{ role: "window" },
140+
]
135141
: [{ role: "close" }]),
136142
],
137143
},

0 commit comments

Comments
 (0)