Merge pull request #4193 from Sh1d0w/feature/top-bar-fullscreen

Show top panel in fullscreen on mouse over
brave · Sep 26, 2016 · 1499d9d · 1499d9d
2 parents 0fcdf0c + 340d012
commit 1499d9d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -901,8 +901,6 @@ class Frame extends ImmutableComponent {
         this.webview.focus()
       }
       windowActions.setNavigated(e.url, this.props.frameKey, false)
-      // force temporary url display for tabnapping protection
-      windowActions.setMouseInTitlebar(true)
 
       // After navigating to the URL, set correct frame title
       let webContents = this.webview.getWebContents()

diff --git a/js/components/main.js b/js/components/main.js
@@ -519,7 +519,7 @@ class Main extends ImmutableComponent {
     }
 
     const height = navigator.getBoundingClientRect().bottom
-    if (this.pageY < height && this.props.windowState.getIn(['ui', 'mouseInTitlebar']) !== true) {
+    if (this.pageY <= height && this.props.windowState.getIn(['ui', 'mouseInTitlebar']) !== true) {
       windowActions.setMouseInTitlebar(true)
     } else if (this.pageY === undefined || this.pageY >= height && this.props.windowState.getIn(['ui', 'mouseInTitlebar']) !== false) {
       windowActions.setMouseInTitlebar(false)
@@ -844,7 +844,13 @@ class Main extends ImmutableComponent {
     return <div id='window'
       className={cx({
         isFullScreen: activeFrame && activeFrame.get('isFullScreen'),
-        frameless: customTitlebar.captionButtonsVisible
+        isWindowFullScreen: this.props.windowState.getIn(['ui', 'isFullScreen']),
+        frameless: customTitlebar.captionButtonsVisible,
+        visible: this.props.windowState.getIn(['ui', 'isFullScreen']) &&
+         (
+            (activeFrame && activeFrame.getIn(['navbar', 'urlbar', 'focused'])) ||
+            (this.props.windowState.getIn(['ui', 'mouseInTitlebar']))
+         )
       })}
       ref={(node) => { this.mainWindow = node }}
       onMouseDown={this.onMouseDown}

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -345,6 +345,11 @@ const doAction = (action) => {
       if (!(action.location === 'about:newtab' && !FrameStateUtil.getActiveFrame(windowState).get('canGoForward'))) {
         updateNavBarInput(action.location, frameStatePath(key))
       }
+
+      if (!windowState.getIn(['ui', 'isFullScreen'])) {
+        // force temporary url display for tabnapping protection
+        windowState = windowState.setIn(['ui', 'mouseInTitlebar'], true)
+      }
       break
     case WindowConstants.WINDOW_SET_NAVBAR_INPUT:
       updateNavBarInput(action.location)

diff --git a/less/window.less b/less/window.less
@@ -34,16 +34,35 @@ html,
   width: 100%;
 
   &.isFullScreen {
-    .top, .downloadsBar, .hrefPreview {
-      display: none;
-    }
-  }
+     .top, .downloadsBar, .hrefPreview {
+       display: none;
+     }
+   }
 }
 
 #windowContainer {
   width: 100%;
   height: 100%;
   position: absolute;
+
+  .platform--linux, .platform--win32 {
+    #window {
+      &.isWindowFullScreen {
+        .top, .downloadsBar, .hrefPreview {
+          transition: all 0.4s ease-out;
+          opacity: 0;
+          max-height: 0px;
+        }
+      }
+
+      &.visible {
+        .top, .downloadsBar, .hrefPreview {
+          max-height: 500px;
+          opacity: 1;
+        }
+      }
+    }
+  }
 }
 
 .top {