File tree Expand file tree Collapse file tree 3 files changed +32
-15
lines changed Expand file tree Collapse file tree 3 files changed +32
-15
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/
2
2
index c61a424d3871d94e7086418c72ce22d5aef0a047..b6e3939b1ce67185acc3b9a66385869bd5490a39 100644
3
3
--- a/browser/base/content/browser-fullScreenAndPointerLock.js
4
4
+++ b/browser/base/content/browser-fullScreenAndPointerLock.js
5
- @@ -431,10 +431,10 @@ var FullScreen = {
5
+ @@ -426,10 +426,10 @@ var FullScreen = {
6
+ shiftSize = shiftSize.toFixed(2);
6
7
gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
7
8
8
- let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
9
+ - let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
9
10
- gNavToolbox.style.transform = transform;
10
11
- gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
11
12
- ? 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
+ : "";
17
18
if (shiftSize > 0) {
18
19
// 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 @@ -578,6 +578,15 @@ var gZenCompactModeManager = {
578
578
if ( event . target . matches ( ':hover' ) ) {
579
579
return ;
580
580
}
581
+ if ( AppConstants . platform == 'macosx' && FullScreen . _currentToolbarShift > 0 ) {
582
+ this . flashElement (
583
+ target ,
584
+ this . hideAfterHoverDuration ,
585
+ 'has-hover' + target . id ,
586
+ 'zen-has-hover'
587
+ ) ;
588
+ return ;
589
+ }
581
590
582
591
if (
583
592
event . explicitOriginalTarget . closest ( '#urlbar[zen-floating-urlbar]' ) ||
@@ -624,12 +633,20 @@ var gZenCompactModeManager = {
624
633
}
625
634
window . cancelAnimationFrame ( this . _removeHoverFrames [ target . id ] ) ;
626
635
627
- this . flashElement (
628
- target ,
629
- this . hideAfterHoverDuration ,
630
- 'has-hover' + target . id ,
631
- 'zen-has-hover'
632
- ) ;
636
+ if (
637
+ AppConstants . platform == 'macosx' &&
638
+ window . fullScreen &&
639
+ entry . screenEdge === 'top'
640
+ ) {
641
+ target . setAttribute ( 'zen-has-hover' , 'true' ) ;
642
+ } else {
643
+ this . flashElement (
644
+ target ,
645
+ this . hideAfterHoverDuration ,
646
+ 'has-hover' + target . id ,
647
+ 'zen-has-hover'
648
+ ) ;
649
+ }
633
650
document . addEventListener (
634
651
'mousemove' ,
635
652
( ) => {
Original file line number Diff line number Diff line change 339
339
top : calc (-1 * var (--zen-toolbar-height ) + 1px );
340
340
left : 0 ;
341
341
z-index : 20 ;
342
- transition : all 0.15s ease;
342
+ transition : all 0.15s ease, padding 0 s ;
343
343
width : 100% ;
344
344
345
345
max-height : var (--zen-toolbar-height );
You can’t perform that action at this time.
0 commit comments