File tree Expand file tree Collapse file tree 2 files changed +31
-14
lines changed Expand file tree Collapse file tree 2 files changed +31
-14
lines changed Original file line number Diff line number Diff line change @@ -2,18 +2,18 @@ diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/
22index bef746dc594ad974c91075cf3657c199f8f8830f..bb671341b6715c42df76f7298ba55e1fac73f33b 100644
33--- a/browser/base/content/browser-fullScreenAndPointerLock.js
44+++ b/browser/base/content/browser-fullScreenAndPointerLock.js
5- @@ -424,10 +424,10 @@ var FullScreen = {
5+ @@ -423,10 +423,10 @@ var FullScreen = {
6+ shiftSize = shiftSize.toFixed(2);
67 gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
78
8- let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
9+ - let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
910- gNavToolbox.style.transform = transform;
1011- gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
1112- ? transform
12- - : "";
13- + //gNavToolbox.style.transform = transform ;
14- + //gURLBar.textbox. style.transform = gURLBar.textbox.hasAttribute("breakout")
15- + // ? transform
16- + // : "";
13+ + const padding = shiftSize > 0 ? `${shiftSize}px` : "";
14+ + const appContentNavbarWrapper = document.getElementById('zen-appcontent-navbar-wrapper') ;
15+ + appContentNavbarWrapper. style.paddingTop = gURLBar.textbox.hasAttribute("breakout")
16+ + ? padding
17+ : "";
1718 if (shiftSize > 0) {
1819 // If the mouse tracking missed our fullScreenToggler, then the toolbox
19- // might not have been shown before the menubar is animated down. Make
Original file line number Diff line number Diff line change @@ -709,6 +709,15 @@ var gZenCompactModeManager = {
709709 if ( event . target . matches ( ':hover' ) ) {
710710 return ;
711711 }
712+ if ( AppConstants . platform == 'macosx' && FullScreen . _currentToolbarShift > 0 ) {
713+ this . flashElement (
714+ target ,
715+ this . hideAfterHoverDuration ,
716+ 'has-hover' + target . id ,
717+ 'zen-has-hover'
718+ ) ;
719+ return ;
720+ }
712721
713722 if (
714723 event . explicitOriginalTarget ?. closest ?. ( '#urlbar[zen-floating-urlbar]' ) ||
@@ -758,12 +767,20 @@ var gZenCompactModeManager = {
758767 }
759768 window . cancelAnimationFrame ( this . _removeHoverFrames [ target . id ] ) ;
760769
761- this . flashElement (
762- target ,
763- this . hideAfterHoverDuration ,
764- 'has-hover' + target . id ,
765- 'zen-has-hover'
766- ) ;
770+ if (
771+ AppConstants . platform == 'macosx' &&
772+ window . fullScreen &&
773+ entry . screenEdge === 'top'
774+ ) {
775+ target . setAttribute ( 'zen-has-hover' , 'true' ) ;
776+ } else {
777+ this . flashElement (
778+ target ,
779+ this . hideAfterHoverDuration ,
780+ 'has-hover' + target . id ,
781+ 'zen-has-hover'
782+ ) ;
783+ }
767784 document . addEventListener (
768785 'mousemove' ,
769786 ( ) => {
You can’t perform that action at this time.
0 commit comments