From dfdcbbf6556774f47926d9634d7245c01e7d03d5 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Wed, 27 Nov 2024 22:08:40 +0100
Subject: [PATCH] fix firefox view patch for 133

---
 patches/ui-patches/firefox-view.patch | 52 +++++++++++----------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/patches/ui-patches/firefox-view.patch b/patches/ui-patches/firefox-view.patch
index aeda073..b845aad 100644
--- a/patches/ui-patches/firefox-view.patch
+++ b/patches/ui-patches/firefox-view.patch
@@ -1,33 +1,23 @@
-# LibreWolf firefox-view.patch
-#
-# Author:        Malte Jürgens <maltejur@dismail.de>
-# Description:   Hide "Firefox View" by default
-# Last Updated:  2024-02-23
-# License:       MPL 2.0
-#
-# This patch removes the Firefox View from the toolbar by default. Users can
-# enable it again by using the "Customize Toolbar" mode and dragging it back to
-# the titlebar.
+diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
+index eb2d8670874b..e57694a72bd3 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
-@@ -35,16 +35,6 @@
-       <hbox flex="1" align="end" class="toolbar-items">
-         <toolbartabstop/>
-         <hbox id="TabsToolbar-customization-target" flex="1">
--          <toolbarbutton id="firefox-view-button"
--                         class="toolbarbutton-1 chromeclass-toolbar-additional"
--                         data-l10n-id="toolbar-button-firefox-view-2"
--                         role="button"
--                         aria-pressed="false"
--                         oncommand="FirefoxViewHandler.openTab();"
--                         onmousedown="FirefoxViewHandler.openToolbarMouseEvent(event);"
--                         cui-areatype="toolbar"
--                         removable="true"/>
+@@ -35,14 +35,6 @@
+     <hbox flex="1" align="end" class="toolbar-items">
+       <toolbartabstop/>
+       <hbox id="TabsToolbar-customization-target" flex="1">
+-        <toolbarbutton id="firefox-view-button"
+-                       class="toolbarbutton-1 chromeclass-toolbar-additional"
+-                       data-l10n-id="toolbar-button-firefox-view-2"
+-                       role="button"
+-                       aria-pressed="false"
+-                       cui-areatype="toolbar"
+-                       removable="true"/>
 -
-           <tabs id="tabbrowser-tabs"
-                 is="tabbrowser-tabs"
-                 aria-multiselectable="true"
-@@ -718,5 +708,15 @@
+         <tabs id="tabbrowser-tabs"
+               is="tabbrowser-tabs"
+               aria-multiselectable="true"
+@@ -667,5 +659,13 @@
                     closemenu="none"
                     cui-areatype="toolbar"
                     data-l10n-id="navbar-library"/>
@@ -37,15 +27,15 @@
 +                   data-l10n-id="toolbar-button-firefox-view-2"
 +                   role="button"
 +                   aria-pressed="false"
-+                   oncommand="FirefoxViewHandler.openTab();"
-+                   onmousedown="FirefoxViewHandler.openToolbarMouseEvent(event);"
 +                   cui-areatype="toolbar"
 +                   removable="true"/>
    </html:template>
  </toolbox>
+diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
+index 45d0e0e4872e..4ed336da6bb5 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
-@@ -287,7 +287,6 @@ var CustomizableUIInternal = {
+@@ -347,7 +347,6 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -53,7 +43,7 @@
            "tabbrowser-tabs",
            "new-tab-button",
            "alltabs-button",
-@@ -616,18 +615,6 @@ var CustomizableUIInternal = {
+@@ -707,18 +706,6 @@ var CustomizableUIInternal = {
        }
      }