diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 8a76dfc6..0fa058f8 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -449,6 +449,7 @@ export class CodeApplication extends Disposable { this.openInstallWizard(false); } else { + this.win.show(); this.win.focus(); } }); @@ -1384,6 +1385,7 @@ export class CodeApplication extends Disposable { ipcMain.removeAllListeners('kylinide.installWizard.justDownLoad'); ipcMain.removeAllListeners('kylinide.installWizard.removeFileLister'); ipcMain.removeAllListeners('kylinide.installWizard.show'); + ipcMain.removeAllListeners('kylinide.installWizard.minw'); //读取selectfile.json中selecdir的值，如果值不同，则删除当前的时间戳目录 if (updateConfigDir) { console.log("updateConfig:" + updateConfigDir) @@ -1445,6 +1447,11 @@ export class CodeApplication extends Disposable { this.win.close(); resolve(void 0); }); + //最小化窗口 + ipcMain.on('kylinide.installWizard.minw', async (evevt) => { + if (this.win && this.win != undefined) + this.win.minimize(); + }); //渲染进程发送删除文件的命令 ipcMain.on('kylinide.installWizard.cleanDir', async (event, arg) => { diff --git a/src/vs/code/electron-main/installWizard/page/images/close.svg b/src/vs/code/electron-main/installWizard/page/images/close.svg new file mode 100644 index 00000000..ce5dace7 --- /dev/null +++ b/src/vs/code/electron-main/installWizard/page/images/close.svg @@ -0,0 +1 @@ + diff --git a/src/vs/code/electron-main/installWizard/page/images/close_white.png b/src/vs/code/electron-main/installWizard/page/images/close_white.png new file mode 100644 index 00000000..b892826b Binary files /dev/null and b/src/vs/code/electron-main/installWizard/page/images/close_white.png differ diff --git a/src/vs/code/electron-main/installWizard/page/images/minw.png b/src/vs/code/electron-main/installWizard/page/images/minw.png new file mode 100644 index 00000000..0d9a92ab Binary files /dev/null and b/src/vs/code/electron-main/installWizard/page/images/minw.png differ diff --git a/src/vs/code/electron-main/installWizard/page/view/index.css b/src/vs/code/electron-main/installWizard/page/view/index.css index 99f3808d..e5116a82 100644 --- a/src/vs/code/electron-main/installWizard/page/view/index.css +++ b/src/vs/code/electron-main/installWizard/page/view/index.css @@ -104,9 +104,24 @@ margin: 5px; } + .minw { + width: 15px; + height: 25px; + float: right; + -webkit-app-region: no-drag; + cursor: pointer; + margin: 5px; + text-align: center; + opacity:0.5; + background: url(../images/minw.png) no-repeat; + display:flex; + justify-content:center; + align-items:center; + background-position:center; +} .close { - width: 25px; + width: 20px; height: 25px; float: right; -webkit-app-region: no-drag; @@ -114,16 +129,21 @@ margin: 5px; text-align: center; opacity:0.5; - background: url(../images/close_gray.png) no-repeat; + background: url(../images/close_white.png) no-repeat; + display:flex; + justify-content:center; + align-items:center; + background-position:center; + } - .close:hover{ + .close:hover , .minw:hover{ opacity:1; transform: scale(1.2); } - .dark .close { - background: url(../images/close.png); - } + /* .dark .close { + background: url(../images/close.svg); + } */ /*页面中间区域 start {*/ diff --git a/src/vs/code/electron-main/installWizard/page/view/index.html b/src/vs/code/electron-main/installWizard/page/view/index.html index a06d94ee..f50645b5 100644 --- a/src/vs/code/electron-main/installWizard/page/view/index.html +++ b/src/vs/code/electron-main/installWizard/page/view/index.html @@ -14,6 +14,7 @@
+
diff --git a/src/vs/code/electron-main/installWizard/page/view/index.js b/src/vs/code/electron-main/installWizard/page/view/index.js index 12190fcf..31dc3e48 100644 --- a/src/vs/code/electron-main/installWizard/page/view/index.js +++ b/src/vs/code/electron-main/installWizard/page/view/index.js @@ -51,8 +51,13 @@ document.getElementById('closeBtn').addEventListener('click', () => { ipcRenderer.send('kylinide.installWizard.closeWizard', { type: "close" }); removeAllListeners(); } +}); - +/** + * 窗口最小化按钮动作 + */ +document.getElementById('minwBtn').addEventListener('click', () => { + ipcRenderer.send('kylinide.installWizard.minw', { type: "minw" }); }); document.getElementById('helpLink').addEventListener('click', (e) => { diff --git a/src/vs/code/electron-main/installWizard/page/view/logger.js b/src/vs/code/electron-main/installWizard/page/view/logger.js index 02a4126a..9b441629 100644 --- a/src/vs/code/electron-main/installWizard/page/view/logger.js +++ b/src/vs/code/electron-main/installWizard/page/view/logger.js @@ -2,10 +2,10 @@ const os = require('os'); const fs = require('fs'); const log4js = require('log4js'); -log4js.configure({ - appenders: { file: { type: 'file', filename: 'instguide.log' } }, - categories: { default: { appenders: ['file'], level: 'info' } } -}); +// log4js.configure({ +// appenders: { file: { type: 'file', filename: 'instguide.log' } }, +// categories: { default: { appenders: ['file'], level: 'info' } } +// }); // 获取用户目录 const userHome = os.homedir();