Skip to content

Commit a5599e9

Browse files
sawkasawka
authored
QoL and Layout Fixes for Windows (#2661)
* remove title bar on windows windows * re-integrate native controls into our tab bar * remove menu completely (weird "Alt" activation) * actually fix Ctrl-V in terminal * clamp zoom levels better (0.4 - 2.6) * simplify macos / windows drag regions (keep responsive to zoom) * fix settings schemas for windows
1 parent 3caba75 commit a5599e9

21 files changed

Lines changed: 390 additions & 285 deletions

File tree

‎cmd/server/main-server.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ func updateTelemetryCounts(lastCounts telemetrydata.TEventProps) telemetrydata.T
234234
SettingsCustomSettings: customSettings,
235235
SettingsCustomAIModes: customAIModes,
236236
}
237-
237+
238238
secretsCount, err := secretstore.CountSecrets()
239239
if err == nil {
240240
props.UserSet.SettingsSecretsCount = secretsCount
@@ -315,17 +315,19 @@ func startupActivityUpdate(firstLaunch bool) {
315315
cohortISOWeek := fmt.Sprintf("%04d-W%02d", year, week)
316316
userSetOnce.CohortMonth = cohortMonth
317317
userSetOnce.CohortISOWeek = cohortISOWeek
318+
fullConfig := wconfig.GetWatcher().GetFullConfig()
318319
props := telemetrydata.TEventProps{
319320
UserSet: &telemetrydata.TEventUserProps{
320-
ClientVersion: "v" + WaveVersion,
321-
ClientBuildTime: BuildTime,
322-
ClientArch: wavebase.ClientArch(),
323-
ClientOSRelease: wavebase.UnameKernelRelease(),
324-
ClientIsDev: wavebase.IsDevMode(),
325-
AutoUpdateChannel: autoUpdateChannel,
326-
AutoUpdateEnabled: autoUpdateEnabled,
327-
LocalShellType: shellType,
328-
LocalShellVersion: shellVersion,
321+
ClientVersion: "v" + WaveVersion,
322+
ClientBuildTime: BuildTime,
323+
ClientArch: wavebase.ClientArch(),
324+
ClientOSRelease: wavebase.UnameKernelRelease(),
325+
ClientIsDev: wavebase.IsDevMode(),
326+
AutoUpdateChannel: autoUpdateChannel,
327+
AutoUpdateEnabled: autoUpdateEnabled,
328+
LocalShellType: shellType,
329+
LocalShellVersion: shellVersion,
330+
SettingsTransparent: fullConfig.Settings.WindowTransparent,
329331
},
330332
UserSetOnce: userSetOnce,
331333
}

‎emain/emain-ipc.ts‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import { RpcApi } from "../frontend/app/store/wshclientapi";
1212
import { getWebServerEndpoint } from "../frontend/util/endpoints";
1313
import * as keyutil from "../frontend/util/keyutil";
1414
import { fireAndForget, parseDataUrl } from "../frontend/util/util";
15+
import { incrementTermCommandsRun } from "./emain-activity";
1516
import { createBuilderWindow, getAllBuilderWindows, getBuilderWindowByWebContentsId } from "./emain-builder";
1617
import { callWithOriginalXdgCurrentDesktopAsync, unamePlatform } from "./emain-platform";
1718
import { getWaveTabViewByWebContentsId } from "./emain-tabview";
1819
import { handleCtrlShiftState } from "./emain-util";
1920
import { getWaveVersion } from "./emain-wavesrv";
2021
import { createNewWaveWindow, focusedWaveWindow, getWaveWindowByWebContentsId } from "./emain-window";
21-
import { incrementTermCommandsRun } from "./emain-activity";
2222
import { ElectronWshClient } from "./emain-wsh";
2323

2424
const electronApp = electron.app;
@@ -29,9 +29,7 @@ let webviewKeys: string[] = [];
2929
export function openBuilderWindow(appId?: string) {
3030
const normalizedAppId = appId || "";
3131
const existingBuilderWindows = getAllBuilderWindows();
32-
const existingWindow = existingBuilderWindows.find(
33-
(win) => win.builderAppId === normalizedAppId
34-
);
32+
const existingWindow = existingBuilderWindows.find((win) => win.builderAppId === normalizedAppId);
3533
if (existingWindow) {
3634
existingWindow.focus();
3735
return;
@@ -314,12 +312,12 @@ export function initIpcHandlers() {
314312
tabView?.setKeyboardChordMode(true);
315313
});
316314

317-
if (unamePlatform !== "darwin") {
318-
const fac = new FastAverageColor();
319-
320-
electron.ipcMain.on("update-window-controls-overlay", async (event, rect: Dimensions) => {
315+
const fac = new FastAverageColor();
316+
electron.ipcMain.on("update-window-controls-overlay", async (event, rect: Dimensions) => {
317+
if (unamePlatform === "darwin") return;
318+
try {
321319
const fullConfig = await RpcApi.GetFullConfigCommand(ElectronWshClient);
322-
if (fullConfig.settings["window:nativetitlebar"]) return;
320+
if (fullConfig?.settings?.["window:nativetitlebar"] && unamePlatform !== "win32") return;
323321

324322
const zoomFactor = event.sender.getZoomFactor();
325323
const electronRect: Electron.Rectangle = {
@@ -337,18 +335,18 @@ export function initIpcHandlers() {
337335
color: unamePlatform === "linux" ? color.rgba : "#00000000",
338336
symbolColor: color.isDark ? "white" : "black",
339337
});
340-
});
341-
}
338+
} catch (e) {
339+
console.error("Error updating window controls overlay:", e);
340+
}
341+
});
342342

343343
electron.ipcMain.on("quicklook", (event, filePath: string) => {
344-
if (unamePlatform == "darwin") {
345-
child_process.execFile("/usr/bin/qlmanage", ["-p", filePath], (error, stdout, stderr) => {
346-
if (error) {
347-
console.error(`Error opening Quick Look: ${error}`);
348-
return;
349-
}
350-
});
351-
}
344+
if (unamePlatform !== "darwin") return;
345+
child_process.execFile("/usr/bin/qlmanage", ["-p", filePath], (error, stdout, stderr) => {
346+
if (error) {
347+
console.error(`Error opening Quick Look: ${error}`);
348+
}
349+
});
352350
});
353351

354352
electron.ipcMain.handle("clear-webview-storage", async (event, webContentsId: number) => {

‎emain/emain-menu.ts‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { focusedBuilderWindow, getBuilderWindowById } from "./emain-builder";
99
import { openBuilderWindow } from "./emain-ipc";
1010
import { isDev, unamePlatform } from "./emain-platform";
1111
import { clearTabCache } from "./emain-tabview";
12+
import { decreaseZoomLevel, increaseZoomLevel } from "./emain-util";
1213
import {
1314
createNewWaveWindow,
1415
createWorkspace,
@@ -123,7 +124,11 @@ function makeEditMenu(fullConfig?: FullConfigType): Electron.MenuItemConstructor
123124
];
124125
}
125126

126-
function makeFileMenu(numWaveWindows: number, callbacks: AppMenuCallbacks, fullConfig: FullConfigType): Electron.MenuItemConstructorOptions[] {
127+
function makeFileMenu(
128+
numWaveWindows: number,
129+
callbacks: AppMenuCallbacks,
130+
fullConfig: FullConfigType
131+
): Electron.MenuItemConstructorOptions[] {
127132
const fileMenu: Electron.MenuItemConstructorOptions[] = [
128133
{
129134
label: "New Window",
@@ -242,25 +247,19 @@ function makeViewMenu(
242247
accelerator: "CommandOrControl+=",
243248
click: (_, window) => {
244249
const wc = getWindowWebContents(window) ?? webContents;
245-
if (wc == null) {
246-
return;
250+
if (wc) {
251+
increaseZoomLevel(wc);
247252
}
248-
const newZoom = Math.min(5, wc.getZoomFactor() + 0.2);
249-
wc.setZoomFactor(newZoom);
250-
wc.send("zoom-factor-change", newZoom);
251253
},
252254
},
253255
{
254256
label: "Zoom In (hidden)",
255257
accelerator: "CommandOrControl+Shift+=",
256258
click: (_, window) => {
257259
const wc = getWindowWebContents(window) ?? webContents;
258-
if (wc == null) {
259-
return;
260+
if (wc) {
261+
increaseZoomLevel(wc);
260262
}
261-
const newZoom = Math.min(5, wc.getZoomFactor() + 0.2);
262-
wc.setZoomFactor(newZoom);
263-
wc.send("zoom-factor-change", newZoom);
264263
},
265264
visible: false,
266265
acceleratorWorksWhenHidden: true,
@@ -270,25 +269,19 @@ function makeViewMenu(
270269
accelerator: "CommandOrControl+-",
271270
click: (_, window) => {
272271
const wc = getWindowWebContents(window) ?? webContents;
273-
if (wc == null) {
274-
return;
272+
if (wc) {
273+
decreaseZoomLevel(wc);
275274
}
276-
const newZoom = Math.max(0.2, wc.getZoomFactor() - 0.2);
277-
wc.setZoomFactor(newZoom);
278-
wc.send("zoom-factor-change", newZoom);
279275
},
280276
},
281277
{
282278
label: "Zoom Out (hidden)",
283279
accelerator: "CommandOrControl+Shift+-",
284280
click: (_, window) => {
285281
const wc = getWindowWebContents(window) ?? webContents;
286-
if (wc == null) {
287-
return;
282+
if (wc) {
283+
decreaseZoomLevel(wc);
288284
}
289-
const newZoom = Math.max(0.2, wc.getZoomFactor() - 0.2);
290-
wc.setZoomFactor(newZoom);
291-
wc.send("zoom-factor-change", newZoom);
292285
},
293286
visible: false,
294287
acceleratorWorksWhenHidden: true,
@@ -380,7 +373,11 @@ export function instantiateAppMenu(workspaceOrBuilderId?: string): Promise<elect
380373
);
381374
}
382375

383-
export function makeAppMenu() {
376+
// does not a set a menu on windows
377+
export function makeAndSetAppMenu() {
378+
if (unamePlatform === "win32") {
379+
return;
380+
}
384381
fireAndForget(async () => {
385382
const menu = await instantiateAppMenu();
386383
electron.Menu.setApplicationMenu(menu);
@@ -389,7 +386,7 @@ export function makeAppMenu() {
389386

390387
waveEventSubscribe({
391388
eventType: "workspace:update",
392-
handler: makeAppMenu,
389+
handler: makeAndSetAppMenu,
393390
});
394391

395392
function getWebContentsByWorkspaceOrBuilderId(workspaceOrBuilderId: string): electron.WebContents {

‎emain/emain-tabview.ts‎

Lines changed: 83 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,88 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import { RpcApi } from "@/app/store/wshclientapi";
5-
import { adaptFromElectronKeyEvent } from "@/util/keyutil";
5+
import { adaptFromElectronKeyEvent, checkKeyPressed } from "@/util/keyutil";
66
import { CHORD_TIMEOUT } from "@/util/sharedconst";
77
import { Rectangle, shell, WebContentsView } from "electron";
8-
import { getWaveWindowById } from "emain/emain-window";
8+
import { createNewWaveWindow, getWaveWindowById } from "emain/emain-window";
99
import path from "path";
1010
import { configureAuthKeyRequestInjection } from "./authkey";
1111
import { setWasActive } from "./emain-activity";
12-
import { getElectronAppBasePath, isDevVite } from "./emain-platform";
13-
import { handleCtrlShiftFocus, handleCtrlShiftState, shFrameNavHandler, shNavHandler } from "./emain-util";
12+
import { getElectronAppBasePath, isDevVite, unamePlatform } from "./emain-platform";
13+
import {
14+
decreaseZoomLevel,
15+
handleCtrlShiftFocus,
16+
handleCtrlShiftState,
17+
increaseZoomLevel,
18+
shFrameNavHandler,
19+
shNavHandler,
20+
} from "./emain-util";
1421
import { ElectronWshClient } from "./emain-wsh";
1522

23+
function handleWindowsMenuAccelerators(waveEvent: WaveKeyboardEvent, tabView: WaveTabView): boolean {
24+
const waveWindow = getWaveWindowById(tabView.waveWindowId);
25+
26+
if (checkKeyPressed(waveEvent, "Ctrl:Shift:n")) {
27+
createNewWaveWindow();
28+
return true;
29+
}
30+
31+
if (checkKeyPressed(waveEvent, "Ctrl:Shift:r")) {
32+
tabView.webContents.reloadIgnoringCache();
33+
return true;
34+
}
35+
36+
if (checkKeyPressed(waveEvent, "Ctrl:v")) {
37+
tabView.webContents.paste();
38+
return true;
39+
}
40+
41+
if (checkKeyPressed(waveEvent, "Ctrl:0")) {
42+
tabView.webContents.setZoomFactor(1);
43+
tabView.webContents.send("zoom-factor-change", 1);
44+
return true;
45+
}
46+
47+
if (checkKeyPressed(waveEvent, "Ctrl:=") || checkKeyPressed(waveEvent, "Ctrl:Shift:=")) {
48+
increaseZoomLevel(tabView.webContents);
49+
return true;
50+
}
51+
52+
if (checkKeyPressed(waveEvent, "Ctrl:-") || checkKeyPressed(waveEvent, "Ctrl:Shift:-")) {
53+
decreaseZoomLevel(tabView.webContents);
54+
return true;
55+
}
56+
57+
if (checkKeyPressed(waveEvent, "F11")) {
58+
if (waveWindow) {
59+
waveWindow.setFullScreen(!waveWindow.isFullScreen());
60+
}
61+
return true;
62+
}
63+
64+
for (let i = 1; i <= 9; i++) {
65+
if (checkKeyPressed(waveEvent, `Alt:Ctrl:${i}`)) {
66+
const workspaceNum = i - 1;
67+
RpcApi.WorkspaceListCommand(ElectronWshClient).then((workspaceList) => {
68+
if (workspaceList && workspaceNum < workspaceList.length) {
69+
const workspace = workspaceList[workspaceNum];
70+
if (waveWindow) {
71+
waveWindow.switchWorkspace(workspace.workspacedata.oid);
72+
}
73+
}
74+
});
75+
return true;
76+
}
77+
}
78+
79+
if (checkKeyPressed(waveEvent, "Alt:Shift:i")) {
80+
tabView.webContents.toggleDevTools();
81+
return true;
82+
}
83+
84+
return false;
85+
}
86+
1687
function computeBgColor(fullConfig: FullConfigType): string {
1788
const settings = fullConfig?.settings;
1889
const isTransparent = settings?.["window:transparent"] ?? false;
@@ -249,6 +320,14 @@ export async function getOrCreateWebViewForTab(waveWindowId: string, tabId: stri
249320
e.preventDefault();
250321
tabView.setKeyboardChordMode(false);
251322
tabView.webContents.send("reinject-key", waveEvent);
323+
return;
324+
}
325+
326+
if (unamePlatform === "win32" && input.type == "keyDown") {
327+
if (handleWindowsMenuAccelerators(waveEvent, tabView)) {
328+
e.preventDefault();
329+
return;
330+
}
252331
}
253332
});
254333
tabView.webContents.on("zoom-changed", (e) => {

‎emain/emain-util.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@ export const WaveAppPathVarName = "WAVETERM_APP_PATH";
88
export const WaveAppResourcesPathVarName = "WAVETERM_RESOURCES_PATH";
99
export const WaveAppElectronExecPath = "WAVETERM_ELECTRONEXECPATH";
1010

11+
const MinZoomLevel = 0.4;
12+
const MaxZoomLevel = 2.6;
13+
const ZoomDelta = 0.2;
14+
15+
export function increaseZoomLevel(webContents: electron.WebContents): void {
16+
const newZoom = Math.min(MaxZoomLevel, webContents.getZoomFactor() + ZoomDelta);
17+
webContents.setZoomFactor(newZoom);
18+
webContents.send("zoom-factor-change", newZoom);
19+
}
20+
21+
export function decreaseZoomLevel(webContents: electron.WebContents): void {
22+
const newZoom = Math.max(MinZoomLevel, webContents.getZoomFactor() - ZoomDelta);
23+
webContents.setZoomFactor(newZoom);
24+
webContents.send("zoom-factor-change", newZoom);
25+
}
26+
1127
export function getElectronExecPath(): string {
1228
return process.execPath;
1329
}

0 commit comments

Comments
 (0)