diff --git a/README.md b/README.md index 7aeb3a3..e108233 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@
-The only background extension that supports [glob](https://github.com/isaacs/node-glob#glob-primer). Add multiple background images for the window, editors, sidebars, or the panel. No warnings about modified distributions. +The only background extension that supports [glob](https://github.com/isaacs/node-glob#glob-primer). Add multiple background images for the window, editors, sidebars, or the panel.
editor background diff --git a/package-lock.json b/package-lock.json index a4ad0db..e618a78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,13 +14,13 @@ "devDependencies": { "@types/glob": "8.0.0", "@types/node": "18.8.1", - "@types/vscode": "1.71.0", + "@types/vscode": "1.72.0", "rimraf": "3.0.2", "typescript": "4.8.4", "vsce": "2.11.0" }, "engines": { - "vscode": "^1.71.0" + "vscode": "^1.72.0" } }, "node_modules/@types/glob": { @@ -46,9 +46,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.71.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.71.0.tgz", - "integrity": "sha512-nB50bBC9H/x2CpwW9FzRRRDrTZ7G0/POttJojvN/LiVfzTGfLyQIje1L1QRMdFXK9G41k5UJN/1B9S4of7CSzA==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.72.0.tgz", + "integrity": "sha512-WvHluhUo+lQvE3I4wUagRpnkHuysB4qSyOQUyIAS9n9PYMJjepzTUD8Jyks0YeXoPD0UGctjqp2u84/b3v6Ydw==", "dev": true }, "node_modules/ansi-styles": { @@ -718,9 +718,9 @@ "dev": true }, "node_modules/node-abi": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz", - "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==", + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz", + "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==", "dev": true, "dependencies": { "semver": "^7.3.5" @@ -730,9 +730,9 @@ } }, "node_modules/node-abi/node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1363,9 +1363,9 @@ "dev": true }, "@types/vscode": { - "version": "1.71.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.71.0.tgz", - "integrity": "sha512-nB50bBC9H/x2CpwW9FzRRRDrTZ7G0/POttJojvN/LiVfzTGfLyQIje1L1QRMdFXK9G41k5UJN/1B9S4of7CSzA==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.72.0.tgz", + "integrity": "sha512-WvHluhUo+lQvE3I4wUagRpnkHuysB4qSyOQUyIAS9n9PYMJjepzTUD8Jyks0YeXoPD0UGctjqp2u84/b3v6Ydw==", "dev": true }, "ansi-styles": { @@ -1861,18 +1861,18 @@ "dev": true }, "node-abi": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz", - "integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==", + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz", + "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==", "dev": true, "requires": { "semver": "^7.3.5" }, "dependencies": { "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "requires": { "lru-cache": "^6.0.0" diff --git a/package.json b/package.json index dd2ea8d..278f403 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "version": "2.0.0", "private": true, "engines": { - "vscode": "^1.71.0" + "vscode": "^1.72.0" }, "categories": [ "Other" @@ -104,12 +104,16 @@ "type": "string" } }, - "background.backgroundAlignment": { "markdownDescription": "The background image alignment.", "type": "array", "order": 4, - "default": ["Center Center", "Center Center", "Center Center", "Center Center"], + "default": [ + "Center Center", + "Center Center", + "Center Center", + "Center Center" + ], "minItems": 4, "maxItems": 4, "items": { @@ -132,7 +136,12 @@ "markdownDescription": "If `#background.backgroundAlignment#` is set to `Manual`, this is the literal value for the `background-position` css property.", "type": "array", "order": 5, - "default": ["50%", "50%", "50%", "50%"], + "default": [ + "50%", + "50%", + "50%", + "50%" + ], "minItems": 4, "maxItems": 4, "items": { @@ -144,7 +153,12 @@ "markdownDescription": "The background image blur amount in css units.", "type": "array", "order": 6, - "default": ["0", "0", "0", "0"], + "default": [ + "0", + "0", + "0", + "0" + ], "minItems": 4, "maxItems": 4, "items": { @@ -156,7 +170,12 @@ "markdownDescription": "The UI opacity, make sure this number is not to low, otherwise you may not be able to see the UI and revert this change. 0 is fully visible and 1 is invisible.", "type": "array", "order": 7, - "default": [0.9, 0.9, 0.9, 0.9], + "default": [ + 0.9, + 0.9, + 0.9, + 0.9 + ], "minItems": 4, "maxItems": 4, "items": { @@ -169,7 +188,12 @@ "markdownDescription": "The background image repeat.", "type": "array", "order": 8, - "default": ["No Repeat", "No Repeat", "No Repeat", "No Repeat"], + "default": [ + "No Repeat", + "No Repeat", + "No Repeat", + "No Repeat" + ], "minItems": 4, "maxItems": 4, "items": { @@ -196,7 +220,12 @@ "markdownDescription": "The background image size.", "type": "array", "order": 9, - "default": ["Cover", "Cover", "Cover", "Cover"], + "default": [ + "Cover", + "Cover", + "Cover", + "Cover" + ], "minItems": 4, "maxItems": 4, "items": { @@ -219,7 +248,12 @@ "markdownDescription": "If `#background.windowBackgroundSize#` is set to `Manual`, this is the literal value for the `background-size` css property.", "type": "array", "order": 10, - "default": ["100%", "100%", "100%", "100%"], + "default": [ + "100%", + "100%", + "100%", + "100%" + ], "minItems": 4, "maxItems": 4, "items": { @@ -227,14 +261,12 @@ "pattern": "^[\\w.% +-]*$" } }, - "background.useWindowOptionsForAllBackgrounds": { "markdownDescription": "If enabled, all backgrounds will use the options set for the windows background.", "order": 11, "type": "boolean", "default": false }, - "background.CSS": { "markdownDescription": "**Advanced Users Only.** Apply raw CSS to VSCode.", "order": 12, @@ -279,7 +311,7 @@ "devDependencies": { "@types/glob": "8.0.0", "@types/node": "18.8.1", - "@types/vscode": "1.71.0", + "@types/vscode": "1.72.0", "rimraf": "3.0.2", "typescript": "4.8.4", "vsce": "2.11.0" diff --git a/src/command/install.ts b/src/command/install.ts index fa3d641..6713898 100644 --- a/src/command/install.ts +++ b/src/command/install.ts @@ -28,8 +28,7 @@ export const command: vscode.Disposable = vscode.commands.registerCommand("backg }); export const notify: () => void = () => { - vscode.window.showWarningMessage("Background has been modified, a reinstall is required to see changes.", "Install and Restart", "Ignore").then((value?: string) => { - if(value === "Install and Restart") - vscode.commands.executeCommand("background.install"); + vscode.window.showWarningMessage("Background has been modified, a reinstall is required to see changes.", "Install and Reload", "Ignore").then((value?: string) => { + value === "Install and Reload" && vscode.commands.executeCommand("background.install"); }); } \ No newline at end of file diff --git a/src/extension.ts b/src/extension.ts index af0720a..0f60dcd 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -53,18 +53,21 @@ export const activate: (context: vscode.ExtensionContext) => void = (context: vs if(require.main && require.main.filename){ - // %appdata%/Local/Programs/Microsoft VS Code/resources/app/out/bootstrap-window.js + // %appdata%/Local/Programs/Microsoft VS Code/resources/app/out/vs/workbench/workbench.desktop.main.js - const file: string = path.join(path.dirname(require.main.filename), "bootstrap-window.js"); + const base: string = path.join(path.dirname(require.main.filename), "vs", "workbench"); + + const file: string = path.join(base, "workbench.desktop.main.js"); + const name: string = path.basename(file); if(fs.existsSync(file)){ js = file; - const backup: string = path.join(path.dirname(require.main.filename), "bootstrap-window-backup.js"); + const backup: string = path.join(base, `${path.parse(name).name}-backup.js`); if(!fs.existsSync(backup)){ fs.copyFileSync(file, backup); - vscode.window.showInformationMessage(`A backup was created for 'bootstrap-window.js'`); + vscode.window.showInformationMessage(`A backup was created for '${name}'`); } }else - vscode.window.showErrorMessage(`Failed to find 'bootstrap-window.js'`); + vscode.window.showErrorMessage(`Failed to find '${name}'`); }else vscode.window.showErrorMessage("Failed to find main file"); @@ -96,9 +99,7 @@ export const uninstallJS: () => void = () => { } export const restartVS: () => void = () => { - vscode.commands.executeCommand("workbench.action.newWindow").then(() => { - vscode.commands.executeCommand("workbench.action.closeWindow"); - }); + vscode.commands.executeCommand("workbench.action.reloadWindow"); } //