[Pkg-mozext-commits] [tabmixplus] 39/73: Backed out changeset 8cb54b08cd25 (bug 729011) for bug 1257686

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit d862883b096e1e6a65a0af28c417f965046ae4ad
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Apr 8 00:31:27 2016 +0300

    Backed out changeset 8cb54b08cd25 (bug 729011) for bug 1257686
---
 chrome/content/tabmix.js | 21 +++++++++++++++++----
 chrome/skin/tab.css      |  6 +-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 52870a3..b083c89 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -615,8 +615,8 @@ var TMP_eventListener = {
         fullScrToggler.addEventListener("mouseover", this._expandCallback, false);
         fullScrToggler.addEventListener("dragenter", this._expandCallback, false);
         fullScrToggler.hidden = true;
-        let main = document.getElementById("main-window");
-        main.appendChild(fullScrToggler);
+        let bottombox = document.getElementById("browser-bottombox");
+        bottombox.appendChild(fullScrToggler);
 
         if (Tabmix.isVersion(400)) {
           let $LF = '\n    ';
@@ -624,7 +624,7 @@ var TMP_eventListener = {
             'this._isChromeCollapsed = true;',
             'TMP_eventListener._updateMarginBottom(gNavToolbox.style.marginTop);' + $LF +
             '$&' + $LF +
-            'TMP_eventListener.toggleTabbarVisibility(false);'
+            'TMP_eventListener.toggleTabbarVisibility(false, aAnimate);'
           ).toCode();
         } else {
           Tabmix.changeCode(FullScreen, "FullScreen.sample")._replace(
@@ -704,7 +704,7 @@ var TMP_eventListener = {
   },
 
   // for tabs bellow content
-  toggleTabbarVisibility: function(aShow) {
+  toggleTabbarVisibility: function(aShow, aAnimate) {
     let fullScrToggler = document.getElementById("fullscr-bottom-toggler");
     if (TabmixTabbar.position != 1 || !fullScrToggler) {
       return;
@@ -719,6 +719,19 @@ var TMP_eventListener = {
       bottomToolbox.style.marginBottom =
           -(bottomToolbox.getBoundingClientRect().height +
           bottombox.getBoundingClientRect().height) + "px";
+
+      if (Tabmix.isVersion(400) && aAnimate &&
+          Services.prefs.getBoolPref("browser.fullscreen.animate")) {
+        // Hide the fullscreen toggler until the transition ends.
+        let listener = function() {
+          gNavToolbox.removeEventListener("transitionend", listener, true);
+          if (FullScreen._isChromeCollapsed)
+            fullScrToggler.hidden = false;
+        };
+        gNavToolbox.addEventListener("transitionend", listener, true);
+        fullScrToggler.hidden = true;
+      }
+
       // Until Firefox 41 changing the margin trigger resize event that calls
       // updateTabbarBottomPosition
       if (Tabmix.isVersion(410))
diff --git a/chrome/skin/tab.css b/chrome/skin/tab.css
index 3ef5267..20529a5 100644
--- a/chrome/skin/tab.css
+++ b/chrome/skin/tab.css
@@ -165,12 +165,8 @@ toolbar[mode="full"] .tabmix-button[type="menu"] {
 
 /* ::::: Fullscreen pseudo-toolbar ::::: */
 #fullscr-bottom-toggler {
-  bottom: 0;
-  left: 0;
-  width: 100%;
   height: 1px;
-  position: fixed;
-  z-index: 2147483647;
+  background: black;
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git