Enhance compact mode and URL bar behavior with improved transitions and offset handling; update version numbers in surfer.json

src/browser/components/preferences/zen-settings.js

@@ -719,6 +719,8 @@ var zenMissingKeyboardShortcutL10n = {
   goHome: 'zen-key-go-home',
   key_redo: 'zen-key-redo',
 
+  key_inspectorMac: 'zen-key-inspector-mac',
+
   // Devtools
   key_toggleToolbox: 'zen-devtools-toggle-shortcut',
   key_browserToolbox: 'zen-devtools-toggle-browser-toolbox-shortcut',

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b9417f545 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b1c975652 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -225,7 +225,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        this.removeTabs(selectedTabs);
      }
  
-@@ -4443,6 +4528,12 @@
+@@ -4427,6 +4512,7 @@
+         skipSessionStore,
+       } = {}
+     ) {
++      gZenUIManager.saveScrollbarState();
+       if (UserInteraction.running("browser.tabs.opening", window)) {
+         UserInteraction.finish("browser.tabs.opening", window);
+       }
+@@ -4443,6 +4529,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -238,7 +246,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4548,9 @@
+@@ -4457,7 +4549,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -249,7 +257,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4564,6 @@
+@@ -4471,7 +4565,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -257,7 +265,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4702,14 @@
+@@ -4610,14 +4703,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -274,7 +282,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5557,10 @@
+@@ -5465,10 +5558,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -287,7 +295,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5727,6 +5819,9 @@
+@@ -5727,6 +5820,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -297,7 +305,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -7443,6 +7538,7 @@
+@@ -7443,6 +7539,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -305,7 +313,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8507,7 @@ var TabContextMenu = {
+@@ -8411,7 +8508,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -314,7 +322,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8540,7 @@ var TabContextMenu = {
+@@ -8444,7 +8541,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -323,7 +331,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8773,7 @@ var TabContextMenu = {
+@@ -8677,6 +8774,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {