Merge branch 'dev' into feat/9324

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

README.md

@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0.1`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.1`!
 
 ### Contributing
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-01604ce201d4de3c6d4b930d271ce4fe05e8d0c8
+2960f4c1ce58d289d3b9ec885695f0017d2636ab

prefs/firefox/browser.yaml

@@ -95,6 +95,9 @@
 - name: browser.search.widget.new
   value: true
 
+- name: layout.css.corner-shape.enabled
+  value: true
+
 # Disabled from https://searchfox.org/firefox-main/rev/d6bfff43852356ca98af848b4705d37f8d41856f/modules/libpref/init/StaticPrefList.yaml#2008
 # Only enabled for windows, doesn't really fit inside Zen.
 - name: browser.startup.preXulSkeletonUI

prefs/zen/windows.yaml

@@ -7,10 +7,6 @@
   value: true
   condition: "defined(XP_WIN)"
 
-- name: widget.windows.mica.popups
-  value: true
-  condition: "defined(XP_WIN)"
-
 # 1 = DWMSBT_MAINWINDOW
 # 2 = DWMSBT_TRANSIENTWINDOW (default, also used for popups)
 # 3 = DWMSBT_TABBEDWINDOW

src/browser/base/content/zen-panels/theme-picker.inc

@@ -131,10 +131,10 @@
             </box>
             <html:input type="range" value="0.4" step="0.001" id="PanelUI-zen-gradient-generator-opacity"
 #ifdef XP_MACOSX
-              max="0.9"
+              max="0.8"
               min="0.30"
 #else
-              max="0.9"
+              max="0.8"
               min="0.25"
 #endif
               />

src/browser/components/nova/NovaPrefs-sys-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/browser/components/nova/NovaPrefs.sys.mjs b/browser/components/nova/NovaPrefs.sys.mjs
+index 3d22c881c481643fcffbc581523905a1847a7d41..453dd4d9c43d7483c037a993afbf2b854533497c 100644
+--- a/browser/components/nova/NovaPrefs.sys.mjs
++++ b/browser/components/nova/NovaPrefs.sys.mjs
+@@ -18,7 +18,7 @@ const PLATFORM_PREFS = (() => {
+ })();
+ 
+ function applyNovaPlatformDefaults() {
+-  const on = Services.prefs.getBoolPref("browser.nova.enabled", false);
++  const on = true;
+   const defaults = Services.prefs.getDefaultBranch("");
+   for (const pref of PLATFORM_PREFS) {
+     defaults.setBoolPref(pref, on);

src/browser/components/preferences/preferences-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 57add34d876fb885275f1147209c6fbeee367a7c..5f4616d5f7d3d077326246e843775f58c293ee48 100644
+index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070c1574714 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -132,6 +132,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
@@ -39,9 +39,12 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..5f4616d5f7d3d077326246e843775f58
  
    // Restore the cached Firefox Labs nav button visibility so it shows
    // immediately when recipes are expected to be available, before
-@@ -653,7 +660,7 @@ async function gotoPref(
+@@ -651,9 +658,9 @@ async function gotoPref(
+   let redesignEnabled = srdSectionPrefs.all;
+   let categories = document.getElementById("categories");
    const kDefaultCategoryInternalName = redesignEnabled
-     ? "paneSync"
+-    ? "paneSync"
++    ? "paneTabsBrowsing"
      : "paneGeneral";
 -  const kDefaultCategory = redesignEnabled ? "sync" : "general";
 +  const kDefaultCategory = redesignEnabled ? "tabsBrowsing" : "general";

src/external-patches/firefox/corner_shape_support/D303334.patch

@@ -0,0 +1,15 @@
+diff --git a/servo/components/style/values/generics/border.rs b/servo/components/style/values/generics/border.rs
+--- a/servo/components/style/values/generics/border.rs
++++ b/servo/components/style/values/generics/border.rs
+@@ -296,9 +296,9 @@
+     pub fn all(s: S) -> Self {
+         Self {
+             top_left: s.clone(),
+             top_right: s.clone(),
+             bottom_right: s.clone(),
+-            bottom_left: s.clone(),
++            bottom_left: s,
+         }
+     }
+ }
+

src/external-patches/firefox/corner_shape_support/D304517.patch

@@ -0,0 +1,38 @@
+diff --git a/gfx/wr/glsl-to-cxx/src/hir.rs b/gfx/wr/glsl-to-cxx/src/hir.rs
+--- a/gfx/wr/glsl-to-cxx/src/hir.rs
++++ b/gfx/wr/glsl-to-cxx/src/hir.rs
+@@ -3531,10 +3531,11 @@
+         None,
+         Type::new(Float),
+         vec![Type::new(Vec2)],
+     );
+     declare_function(state, "pow", None, Type::new(Vec3), vec![Type::new(Vec3)]);
++    declare_function(state, "pow", None, Type::new(Vec2), vec![Type::new(Vec2)]);
+     declare_function(state, "pow", None, Type::new(Float), vec![Type::new(Float)]);
+     declare_function(state, "exp", None, Type::new(Float), vec![Type::new(Float)]);
+     declare_function(state, "exp2", None, Type::new(Float), vec![Type::new(Float)]);
+     declare_function(state, "log", None, Type::new(Float), vec![Type::new(Float)]);
+     declare_function(state, "log2", None, Type::new(Float), vec![Type::new(Float)]);
+diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h
+--- a/gfx/wr/swgl/src/glsl.h
++++ b/gfx/wr/swgl/src/glsl.h
+@@ -800,10 +800,18 @@
+ 
+ Float pow(Float x, Float y) {
+   return if_then_else((x == 0) | (x == 1), x, approx_pow2(approx_log2(x) * y));
+ }
+ 
++vec2 pow(vec2 a, vec2 b) {
++  return vec2(pow(a.x, b.x), pow(a.y, b.y));
++}
++
++vec2_scalar pow(vec2_scalar a, vec2_scalar b) {
++  return vec2_scalar(pow(a.x, b.x), pow(a.y, b.y));
++}
++
+ #define exp __glsl_exp
+ 
+ SI float exp(float x) { return expf(x); }
+ 
+ Float exp(Float y) {
+

src/external-patches/manifest.json

@@ -2,6 +2,16 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 [
+  {
+    "type": "phabricator",
+    "ids": [
+      "D296935",
+      "D303334",
+      "D297660",
+      "D304517"
+    ],
+    "name": "Corner shape support"
+  },
   {
     "type": "phabricator",
     "id": "D299584",

src/zen/common/styles/zen-single-components.css

@@ -185,7 +185,7 @@
 .toolbarbutton-1:not(#tabs-newtab-button),
 .urlbar-page-action,
 .identity-box-button {
-  --tab-border-radius: 6px;
+  --tab-border-radius: 8px;
   --toolbarbutton-border-radius: var(--tab-border-radius);
   --toolbarbutton-padding-inner: 6px;
   --toolbarbutton-padding-outer: 1px;

src/zen/common/styles/zen-theme.css

@@ -213,6 +213,8 @@
   --toolbarbutton-border-radius: 6px;
   --urlbar-margin-inline: 1px !important;
 
+  --zen-squircle-value: 1.3;
+
   --tab-icon-overlay-stroke: light-dark(white, black) !important;
   --tab-close-button-padding: 4px !important;
 
@@ -343,3 +345,7 @@
 }
 
 %include zen-buttons.css
+
+*:not(.no-squircles) {
+  corner-shape: superellipse(var(--zen-squircle-value));
+}

src/zen/glance/zen-glance.css

@@ -41,11 +41,11 @@
 
     &:hover {
       background: light-dark(rgb(41, 41, 41), rgb(204, 204, 204));
-      scale: 1.05;
+      scale: 1.02;
     }
 
     &:hover:active {
-      scale: 0.95;
+      scale: 0.98;
     }
 
     & label {

src/zen/glance/zen-glance.inc.xhtml

@@ -4,8 +4,8 @@
 
 <html:template id="zen-glance-sidebar-template">
   <vbox class="zen-glance-sidebar-container">
-    <toolbarbutton class="zen-glance-sidebar-close toolbarbutton-1" command="cmd_zenGlanceClose" data-l10n-id="zen-general-confirm" />
-    <toolbarbutton class="zen-glance-sidebar-open toolbarbutton-1" command="cmd_zenGlanceExpand" />
-    <toolbarbutton class="zen-glance-sidebar-split toolbarbutton-1" command="cmd_zenGlanceSplit" />
+    <toolbarbutton class="no-squircles zen-glance-sidebar-close toolbarbutton-1" command="cmd_zenGlanceClose" data-l10n-id="zen-general-confirm" />
+    <toolbarbutton class="no-squircles zen-glance-sidebar-open toolbarbutton-1" command="cmd_zenGlanceExpand" />
+    <toolbarbutton class="no-squircles zen-glance-sidebar-split toolbarbutton-1" command="cmd_zenGlanceSplit" />
   </vbox>
 </html:template>

src/zen/spaces/zen-workspaces.css

@@ -31,6 +31,7 @@
   & toolbarbutton {
     margin: 0;
     max-width: 28px;
+    border-radius: var(--toolbarbutton-border-radius);
     height: 28px;
     display: flex;
     justify-content: center;

src/zen/tabs/zen-tabs/vertical-tabs.css

@@ -235,7 +235,7 @@
   }
 
   @media (-moz-platform: macos) {
-    --border-radius-medium: 12px;
+    --border-radius-medium: 14px;
     --tab-border-radius: 8px;
   }
 
@@ -1232,6 +1232,8 @@
         background: var(--zen-essential-tab-selected-bg);
         margin: var(--zen-essential-bg-margin);
         border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin));
+        /* stylelint-disable-next-line property-no-unknown */
+        corner-shape: var(--zen-squircle-value);
         position: absolute;
         inset: 0;
         z-index: 0;

surfer.json

@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "152.0",
-    "candidate": "152.0",
+    "version": "152.0.1",
+    "candidate": "152.0.1",
     "candidateBuild": 1
   },
   "buildOptions": {
@@ -20,7 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.21.2b",
+        "displayVersion": "1.21.3b",
         "github": {
           "repo": "zen-browser/desktop"
         },