Merge pull request #1334 from ipy/develop

feat(streaming): focus streaming window
chiflix · Aug 11, 2020 · 225dc83 · 225dc83
2 parents 2432c45 + 03037c3
commit 225dc83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/index.js b/src/main/index.js
@@ -802,6 +802,10 @@ function createPaymentWindow(url, orderID, channel) {
 }
 
 function createLosslessStreamingWindow() {
+  if (losslessStreamingWindow && !losslessStreamingWindow.webContents.isDestroyed()) {
+    losslessStreamingWindow.focus();
+    return;
+  }
   const losslessStreamingWindowOptions = {
     frame: false,
     titleBarStyle: 'none',
@@ -833,6 +837,7 @@ function createLosslessStreamingWindow() {
   }
   losslessStreamingWindow.once('ready-to-show', () => {
     losslessStreamingWindow.show();
+    losslessStreamingWindow.focus();
   });
   if (process.platform === 'win32') {
     hackWindowsRightMenu(losslessStreamingWindow);

diff --git a/src/renderer/components/LosslessStreaming.vue b/src/renderer/components/LosslessStreaming.vue
@@ -131,7 +131,7 @@ export default Vue.extend({
         const width = Math.ceil(content.offsetWidth);
         const height = Math.ceil(content.offsetHeight);
         remote.getCurrentWindow().setSize(width, height);
-      }, 100);
+      }, 300);
     },
     handleClose() {
       const win = remote.BrowserWindow.getFocusedWindow();
@@ -194,7 +194,7 @@ export default Vue.extend({
     margin: 40px auto 0;
   }
   .info {
-    font-size: 16px;
+    font-size: 14px;
     color: rgba(255, 255, 255, 0.7);
     line-height: 1.75em;
     &>div {
@@ -209,7 +209,7 @@ export default Vue.extend({
   }
   .file {
     .title {
-      font-size: 16px;
+      font-size: 14px;
       margin-bottom: 5px;
       color: rgba(255, 255, 255, 0.7);
     }