From 127e38159ec7a2cdab270af91be2269711549a21 Mon Sep 17 00:00:00 2001 From: purocean Date: Mon, 19 Aug 2019 20:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/assets/icon.png | Bin 0 -> 4880 bytes frontend/src/assets/logo.png | Bin 6849 -> 0 bytes frontend/src/assets/window-close.svg | 1 + frontend/src/assets/window-maximize.svg | 1 + frontend/src/assets/window-minimize.svg | 1 + frontend/src/assets/window-unmaximize.svg | 1 + frontend/src/components/TitleBar.vue | 146 +++++++++++++++++++++- src/app.ts | 7 +- 8 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 frontend/src/assets/icon.png delete mode 100644 frontend/src/assets/logo.png create mode 100644 frontend/src/assets/window-close.svg create mode 100644 frontend/src/assets/window-maximize.svg create mode 100644 frontend/src/assets/window-minimize.svg create mode 100644 frontend/src/assets/window-unmaximize.svg diff --git a/frontend/src/assets/icon.png b/frontend/src/assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b504b3c6dac102af234b32c364c5c7db50c8016a GIT binary patch literal 4880 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 \ No newline at end of file diff --git a/frontend/src/assets/window-maximize.svg b/frontend/src/assets/window-maximize.svg new file mode 100644 index 00000000..6f76d581 --- /dev/null +++ b/frontend/src/assets/window-maximize.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/window-minimize.svg b/frontend/src/assets/window-minimize.svg new file mode 100644 index 00000000..869a1c1f --- /dev/null +++ b/frontend/src/assets/window-minimize.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/window-unmaximize.svg b/frontend/src/assets/window-unmaximize.svg new file mode 100644 index 00000000..0ac7922d --- /dev/null +++ b/frontend/src/assets/window-unmaximize.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/components/TitleBar.vue b/frontend/src/components/TitleBar.vue index 8ea7bd80..4ce29b7a 100644 --- a/frontend/src/components/TitleBar.vue +++ b/frontend/src/components/TitleBar.vue @@ -1,28 +1,73 @@ @@ -82,10 +152,82 @@ export default { display: flex; align-items: center; justify-content: center; + -webkit-user-select: none; + -webkit-app-region: drag; } .title { margin: 0; text-align: center; + height: 100%; + display: flex; + align-items: center; +} + +.logo { + height: 60%; + margin: 0 5px; + -webkit-app-region: no-drag; +} + +.action { + display: flex; + flex-grow: 0; + flex-shrink: 0; + text-align: center; + position: relative; + z-index: 3000; + -webkit-app-region: no-drag; + height: 100%; + width: 138px; + margin-left: auto; +} + +.action .btn { + display: inline-block; + -webkit-app-region: no-drag; + height: 100%; + width: 33.34%; +} + +.action .icon { + background-color: #cccccc; + height: 100%; + width: 100%; + mask-size: 23.1%; +} + +.action .icon.unmaximize { + mask: url(~@/assets/window-unmaximize.svg) no-repeat 50% 50%; +} + +.action .icon.maximize { + mask: url(~@/assets/window-maximize.svg) no-repeat 50% 50%; +} + +.action .icon.minimize { + mask: url(~@/assets/window-minimize.svg) no-repeat 50% 50%; +} + +.action .icon.close { + mask: url(~@/assets/window-close.svg) no-repeat 50% 50%; +} + +.action .btn:hover { + background-color: hsla(0, 0%, 100%, .1) +} + +.action .btn.pin { + display: flex; + align-items: center; + justify-content: center; +} + +.action .btn.pin.ontop { + background-color: hsla(0, 0%, 100%, .3) +} + +.action .btn.pin .pin-icon { + fill: hsla(0, 0%, 100%, .5) } diff --git a/src/app.ts b/src/app.ts index 85197d04..12a39abb 100644 --- a/src/app.ts +++ b/src/app.ts @@ -32,8 +32,9 @@ const createWindow = () => { win = new BrowserWindow({ maximizable: true, show: false, - minWidth: 700, + minWidth: 800, minHeight: 500, + frame: false, backgroundColor: '#282a2b', webPreferences: { webSecurity: false, @@ -41,7 +42,7 @@ const createWindow = () => { }, }) - win.maximize() + // win.maximize() win.show() win.setMenu(null) @@ -90,7 +91,7 @@ const showWindow = () => { win.setSkipTaskbar(false) win.show() } - if (win.isFocused() && win.isVisible()) { + if (win.isVisible()) { hide() } else { // 先隐藏再显示,以便在 windows 10 当前虚拟窗口展示