Fix: DragSpace - Like firefox 88

https://searchfox.org/mozilla-esr78/search?q=--space-above-tabbar&path=&case=false&regexp=false
black7375 · May 5, 2022 · 0ad35b4 · 0ad35b4
1 parent 30cdbf6
commit 0ad35b4
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 11 deletions.
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
@@ -3169,13 +3169,43 @@
     /* If the option is not specified, it is equivalent to 0px. */
   }
 
-  :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] {
-    height: calc(var(--tab-min-height) + var(--space-above-tabbar));
+  @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
+    :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] {
+      height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tabs-navbar-shadow-size));
+    }
   }
-
-  :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
-  :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
-    padding-top: var(--space-above-tabbar) !important;
+  @media (-moz-os-version: windows-win7),
+    (-moz-platform: windows-win7),
+    (-moz-os-version: windows-win8),
+    (-moz-platform: windows-win8),
+    (-moz-gtk-csd-available) {
+    :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] {
+      height: calc(var(--tab-min-height) + var(--space-above-tabbar));
+    }
+  }
+  @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+    #TabsToolbar > .toolbar-items {
+      padding-top: var(--space-above-tabbar) !important;
+    }
+  }
+  @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
+    /* Add 4px extra margin on top of the tabs toolbar on Windows 7. */
+    /* Add extra space to titlebar for dragging */
+    :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+    :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+      padding-top: calc(var(--space-above-tabbar) + 4px) !important;
+    }
+  }
+  @media (-moz-os-version: windows-win8),
+    (-moz-platform: windows-win8),
+    (-moz-os-version: windows-win10),
+    (-moz-platform: windows-win10),
+    (-moz-gtk-csd-available) {
+    /* Add extra space to titlebar for dragging */
+    :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+    :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+      padding-top: var(--space-above-tabbar) !important;
+    }
   }
 }
 @supports -moz-bool-pref("userChrome.padding.tabbar_height") {

diff --git a/src/padding/_drag_space.scss b/src/padding/_drag_space.scss
@@ -1,12 +1,46 @@
 /* for Extra Drag Space */
+// https://searchfox.org/mozilla-esr78/search?q=--space-above-tabbar&path=&case=false&regexp=false
 :root {
   --space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */
 }
 
-:root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] {
-  height: calc(var(--tab-min-height) + var(--space-above-tabbar));
+@mixin dragSpaceHeight {
+  :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] {
+    @content;
+  }
 }
-:root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
-:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
-  padding-top: var(--space-above-tabbar) !important;
+@mixin dragSpacePadding {
+  /* Add extra space to titlebar for dragging */
+  :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
+  :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
+    @content;
+  }
+}
+
+@include OS($win10) {
+  @include dragSpaceHeight {
+    height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tabs-navbar-shadow-size));
+  }
+}
+@include OS($win7, $win8, $linux) {
+  @include dragSpaceHeight {
+    height: calc(var(--tab-min-height) + var(--space-above-tabbar));
+  }
+}
+
+@include OS($mac) {
+  #TabsToolbar > .toolbar-items {
+    padding-top: var(--space-above-tabbar) !important;
+  }
+}
+@include OS($win7) {
+  /* Add 4px extra margin on top of the tabs toolbar on Windows 7. */
+  @include dragSpacePadding {
+    padding-top: calc(var(--space-above-tabbar) + 4px) !important;
+  }
+}
+@include OS($win8, $win10, $linux) {
+  @include dragSpacePadding {
+    padding-top: var(--space-above-tabbar) !important;
+  }
 }