Merge pull request #499 from feross/fix-fullscreen-button

Fix for overflowing captions icon
webtorrent · May 13, 2016 · f10aa6a · f10aa6a
2 parents e2423d7 + ee1c68c
commit f10aa6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/main/windows.js b/main/windows.js
@@ -94,7 +94,7 @@ function createMainWindow () {
     icon: config.APP_ICON + 'Smaller.png', // Window and Volume Mixer icon.
     minWidth: config.WINDOW_MIN_WIDTH,
     minHeight: config.WINDOW_MIN_HEIGHT,
-    show: false, // Hide window until DOM finishes loading
+    show: false, // Hide window until renderer sends 'ipcReady' event
     title: config.APP_WINDOW_TITLE,
     titleBarStyle: 'hidden-inset', // Hide OS chrome, except traffic light buttons (OS X)
     useContentSize: true, // Specify web page size without OS chrome

diff --git a/renderer/index.css b/renderer/index.css
@@ -751,9 +751,15 @@ body.drag .app::after {
 .player-controls .volume-icon,
 .player-controls .back {
   display: block;
-  width: 20px;
   height: 20px;
   margin: 5px;
+
+  /*
+   * Fix for overflowing captions icon
+   * https://github.com/feross/webtorrent-desktop/issues/467
+   */
+  max-width: 22px;
+  overflow: hidden;
 }
 
 .player-controls .volume,