From e0684286013f4015cc22d4fb6495544152becf91 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 5 Jul 2025 22:59:43 +0200
Subject: [PATCH] feat: Improved lightness detection and media sharing
 controls, b=no-bug, c=media, workspaces

---
 src/browser/base/content/browser-commands-js.patch | 10 ++++------
 src/zen/media/zen-media-controls.css               |  6 +-----
 src/zen/workspaces/ZenGradientGenerator.mjs        |  2 +-
 src/zen/workspaces/ZenWorkspaces.mjs               |  6 ++++++
 surfer.json                                        |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index ddc7aaeb..10216d64 100644
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index b0b2383453ef771af3eb9260618f1e2e3022eb4e..7c5844582d9adb55c55fb1627a9980cf0e5c110b 100644
+index b0b2383453ef771af3eb9260618f1e2e3022eb4e..d631cc8db95b4285e892ac8fcb5e72b7da489850 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
 @@ -318,6 +318,10 @@ var BrowserCommands = {
@@ -13,21 +13,19 @@ index b0b2383453ef771af3eb9260618f1e2e3022eb4e..7c5844582d9adb55c55fb1627a9980cf
      // A notification intended to be useful for modular peformance tracking
      // starting as close as is reasonably possible to the time when the user
      // expressed the intent to open a new tab.  Since there are a lot of
-@@ -402,6 +406,13 @@ var BrowserCommands = {
+@@ -402,6 +406,11 @@ var BrowserCommands = {
        return;
      }
  
 +    if (gBrowser.selectedTab.hasAttribute("zen-empty-tab")) {
-+      if (gZenWorkspaces.shouldCloseWindow()) {
-+        closeWindow(true);
-+      }
++      gZenWorkspaces.handleTabCloseWindow();
 +      return;
 +    }
 +
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -409,8 +420,8 @@ var BrowserCommands = {
+@@ -409,8 +418,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {
diff --git a/src/zen/media/zen-media-controls.css b/src/zen/media/zen-media-controls.css
index 7e8f9ee9..3e93068c 100644
--- a/src/zen/media/zen-media-controls.css
+++ b/src/zen/media/zen-media-controls.css
@@ -34,12 +34,8 @@
     gap: 2px;
   }
 
-  &[media-sharing] #zen-media-controls-hbox > toolbarbutton:not(:first-child) {
+  &[media-sharing] :is(#zen-media-playback-buttons, #zen-media-mute-button) {
     display: none;
-
-    #media-device-buttons {
-      display: flex;
-    }
   }
 
   &:not([can-pip]) {
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 0a996d08..fea23333 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -1140,7 +1140,7 @@
     }
 
     shouldBeDarkMode(accentColor) {
-      let minimalLum = 0.5;
+      let minimalLum = 0.6;
       if (!this.canBeTransparent) {
         // Blend the color with the toolbar background
         const toolbarBg = this.getToolbarModifiedBaseRaw();
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index acac8c51..6eb007ed 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2944,4 +2944,10 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
       gBrowser.tabContainer.removeAttribute('overflow');
     }
   }
+
+  handleTabCloseWindow() {
+    if (this.shouldCloseWindow()) {
+      document.getElementById('cmd_closeWindow').doCommand();
+    }
+  }
 })();
diff --git a/surfer.json b/surfer.json
index 32b4a8ae..aa052496 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.14.2b",
+        "displayVersion": "1.14.3b",
         "github": {
           "repo": "zen-browser/desktop"
         },