From 035e5931fce3877083d8f7b1df872e906653ac8d Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 20 May 2026 11:53:23 +0200
Subject: [PATCH] gh-10594: Video controls going under the screen when in
 fullscreen (gh-13769)

---
 .../tabbrowser/content/tabgroup-js.patch      | 23 +++++++++++--------
 src/zen/common/zenThemeModifier.js            | 11 +++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabgroup-js.patch b/src/browser/components/tabbrowser/content/tabgroup-js.patch
index 5b242496c..60b9eafae 100644
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c1a15b335 100644
+index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a064fea9b 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -147,7 +147,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
          });
      }
  
-@@ -478,13 +511,65 @@
+@@ -478,13 +511,68 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -162,8 +162,9 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
 +        tabsCollect.push(item);
 +        if (gBrowser.isTabGroup(item)) {
 +          tabsCollect.push(...item.tabs);
-+        }
-+      }
+         }
+       }
+-      return childrenArray.filter(node => node.matches("tab"));
 +      return tabsCollect.filter(node => node.matches("tab"));
 +    }
 +
@@ -189,9 +190,8 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
 +            result.push(labelContainer);
 +          }
 +          result.push(...item.childGroupsAndTabs);
-         }
-       }
--      return childrenArray.filter(node => node.matches("tab"));
++        }
++      }
 +      return result;
 +    }
 +
@@ -210,6 +210,9 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
 +          return false;
 +        }
 +      }
++      if (this.pinned && gZenWorkspaces.activeWorkspaceElement?.hasCollapsedPinnedTabs) {
++        return false;
++      }
 +      return true;
 +    }
 +
@@ -218,7 +221,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
      }
  
      /**
-@@ -592,7 +677,6 @@
+@@ -592,7 +680,6 @@
            );
          } else {
            if (tabOrSplitView.pinned) {
@@ -226,7 +229,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
            }
            let tabToMove =
              this.ownerGlobal === tabOrSplitView.ownerGlobal
-@@ -661,7 +745,7 @@
+@@ -661,7 +748,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -235,7 +238,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..30e8dda663df8e96dbed5fe5f12f828c
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -740,5 +824,6 @@
+@@ -740,5 +827,6 @@
      }
    }
  
diff --git a/src/zen/common/zenThemeModifier.js b/src/zen/common/zenThemeModifier.js
index 109a6a63c..d3e70d28f 100644
--- a/src/zen/common/zenThemeModifier.js
+++ b/src/zen/common/zenThemeModifier.js
@@ -168,6 +168,17 @@
         document.documentElement.setAttribute("zen-no-padding", true);
       } else {
         document.documentElement.removeAttribute("zen-no-padding");
+        if (domFullscreen) {
+          const selectedBrowser = gBrowser.selectedBrowser;
+          selectedBrowser.style.paddingRight = "env(hairline)";
+          window.addEventListener(
+            "MozAfterPaint",
+            () => {
+              selectedBrowser.style.paddingRight = "";
+            },
+            { once: true }
+          );
+        }
       }
     },