Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make notification windows not have titles on X11 (#12935)

Browse source 
Co-Authored-By: Max <max@zed.dev>

Release Notes:

- N/A

Co-authored-by: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2024-06-12 10:27:40 -06:00 • committed by GitHub
parent 2fd00a8f35
commit 1b28f93c64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 57 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

55
script/zed-local
View file

@ -17,7 +17,7 @@ OPTIONS
--stable Use stable Zed release installed on local machine for all instances (except for the first one).
`.trim();
const { spawn, execFileSync } = require("child_process");
const { spawn, execSync, execFileSync } = require("child_process");
const assert = require("assert");
let users;
@ -68,24 +68,43 @@ while (args.length > 0) {
args.shift();
}
const os = require("os");
const platform = os.platform();
// Parse the resolution of the main screen
const displayInfo = JSON.parse(
execFileSync("system_profiler", ["SPDisplaysDataType", "-json"], {
encoding: "utf8",
}),
);
const mainDisplayResolution = displayInfo?.SPDisplaysDataType?.flatMap(
(display) => display?.spdisplays_ndrvs,
)
?.find((entry) => entry?.spdisplays_main === "spdisplays_yes")
?._spdisplays_resolution?.match(RESOLUTION_REGEX);
if (!mainDisplayResolution) {
throw new Error("Could not parse screen resolution");
let screenWidth, screenHeight;
if (platform === "darwin") {
// macOS
const displayInfo = JSON.parse(
execFileSync("system_profiler", ["SPDisplaysDataType", "-json"], {
encoding: "utf8",
}),
);
const mainDisplayResolution = displayInfo?.SPDisplaysDataType?.flatMap(
(display) => display?.spdisplays_ndrvs,
)
?.find((entry) => entry?.spdisplays_main === "spdisplays_yes")
?._spdisplays_resolution?.match(RESOLUTION_REGEX);
if (!mainDisplayResolution) {
throw new Error("Could not parse screen resolution");
}
screenWidth = parseInt(mainDisplayResolution[1]);
screenHeight = parseInt(mainDisplayResolution[2]) - titleBarHeight;
} else if (platform === "linux") {
// Linux
try {
const xrandrOutput = execSync('xrandr | grep "\\*" | cut -d" " -f4', {
encoding: "utf8",
}).trim();
[screenWidth, screenHeight] = xrandrOutput.split("x").map(Number);
} catch (err) {
console.log(err);
throw new Error("Could not get screen resolution");
}
}
const titleBarHeight = 24;
const screenWidth = parseInt(mainDisplayResolution[1]);
let screenHeight = parseInt(mainDisplayResolution[2]) - titleBarHeight;
screenHeight -= titleBarHeight;
if (isTop) {
screenHeight = Math.floor(screenHeight / 2);
@ -128,7 +147,9 @@ if (isReleaseMode) {
}
try {
execFileSync("cargo", buildArgs, { stdio: "inherit" });
execFileSync("cargo", buildArgs, {
stdio: "inherit",
});
} catch (e) {
process.exit(0);
}