diff --git a/src/main/base/win.ts b/src/main/base/win.ts index b4e7dc3c..5ffcd846 100644 --- a/src/main/base/win.ts +++ b/src/main/base/win.ts @@ -408,7 +408,7 @@ export class Win { // Set scale electron.ipcMain.on("windowresize", (event, width, height, lock = false) => { - this.win.setMinimumSize(300,300); + this.win.setMinimumSize(250,250); this.win.setContentSize(width, height); this.win.setResizable(!lock); }); @@ -417,6 +417,11 @@ export class Win { electron.ipcMain.on('setFullScreen', (event, flag) => { this.win.setFullScreen(flag) }) + //Fullscreen + electron.ipcMain.on('detachDT', (event, _) => { + this.win.webContents.openDevTools({ mode: 'detach' }); + }) + function getIp() { let ip = false; diff --git a/src/renderer/index.js b/src/renderer/index.js index 0602ac8b..ccadaed6 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3279,9 +3279,10 @@ const app = new Vue({ }, miniPlayer(flag) { if (flag) { - this.tmpWidth = screen.width; - this.tmpHeight = screen.height; - ipcRenderer.send('windowresize', 350, 350, false) + this.tmpWidth = window.innerWidth; + this.tmpHeight = window.innerHeight; + ipcRenderer.send('setFullScreen', false); + ipcRenderer.send('windowresize', 250, 250, false) app.appMode = 'mini'; } else { ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false) @@ -3606,4 +3607,12 @@ document.addEventListener('keydown', function(event) { app.mk._services.mediaItemPlayback._currentPlayer.destroy() } catch (e) { } } +}); + +document.addEventListener('keydown', function(event) { + if (event.ctrlKey && event.keyCode == 122) { + try { + ipcRenderer.send('detachDT','') + } catch (e) { } + } }); \ No newline at end of file diff --git a/src/renderer/style.less b/src/renderer/style.less index 1f314d35..0d36f0bb 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -4713,6 +4713,14 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { background-color: rgba(200, 200, 200, 0.7); } + .player-exit { + z-index: 3; + position: absolute; + top: 5px; + right: 5px; + -webkit-app-region: no-drag; + } + .playback-button--small { opacity: 0.7; } @@ -4932,14 +4940,27 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { flex-direction: column; .artwork { - width: 50vh; - height: 50vh; - -webkit-app-region: no-drag; + width: 100%; + height: 100%; + + .mediaitem-artwork{ + border-radius: unset; + } } .controls-parents { - width: 50vh; + width: 100%; + position: absolute; + background: black; + bottom: 0px; + z-index: 3; + opacity: 0; + padding: 3%; + &:hover { + opacity : 1; + } } + .app-playback-controls { -webkit-app-region: no-drag; @@ -5005,7 +5026,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { @bgColor: transparent; //height: 16px; position: absolute; - bottom: -1.5vh; + bottom: -3.5vh; left: 0px; background: @bgColor; @@ -5059,7 +5080,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } .control-buttons { - margin-top: 2vh; + margin-top: 3.5vh; display: inline-flex; width: 100%; justify-content: center; diff --git a/src/renderer/views/components/miniplayer.ejs b/src/renderer/views/components/miniplayer.ejs index 94b18eff..0d798608 100644 --- a/src/renderer/views/components/miniplayer.ejs +++ b/src/renderer/views/components/miniplayer.ejs @@ -1,7 +1,15 @@