[Pkg-mozext-commits] [tabmixplus] 05/20: Setting flowing to "multibar" in Firefox 57 prevents Tabmix.getButtonsHeight to get proper height when the window opened by SessionStore._openWindowWithState with more than one rows of tabs. Related to bug 1034036

[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 0f623908f5d5de53144218162a29a194ff508ef8
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sun Sep 10 10:18:28 2017 -0700

    Setting flowing to "multibar" in Firefox 57 prevents Tabmix.getButtonsHeight to get proper height when the window opened by SessionStore._openWindowWithState with more than one rows of tabs. Related to bug 1034036
---
 chrome/content/links/setup.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index eb71e1f..1819179 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -277,7 +277,13 @@ Tabmix.beforeStartup = function TMP_beforeStartup(tabBrowser, aTabContainer) {
     tabscroll = 1;
   }
   TabmixTabbar.scrollButtonsMode = tabscroll;
-  TabmixTabbar.flowing = ["singlebar", "scrollbutton", "multibar", "scrollbutton"][tabscroll];
+
+  // setting flowing to "multibar" in Firefox 57 prevents Tabmix.getButtonsHeight
+  // to get proper height when the window opened by SessionStore._openWindowWithState
+  // with more than one rows of tabs
+  if (!this.isVersion(570) || TabmixSvc.SessionStore._isWindowLoaded(window)) {
+    TabmixTabbar.flowing = ["singlebar", "scrollbutton", "multibar", "scrollbutton"][tabscroll];
+  }
 
   // add flag that we are after SwitchThemes, we use it in Tabmix.isWindowAfterSessionRestore
   if ("SwitchThemesModule" in window) {

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