From 7e7fde72271c4aabd45163ea97d851fabe2821aa Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Sat, 27 Mar 2010 13:07:31 +0000
Subject: [PATCH] =?UTF-8?q?3.7a4pre=E3=81=A7=E3=83=95=E3=83=AB=E3=82=B9?=
 =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3=E3=83=A2=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=8F=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6474 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletab.js              | 15 ++++++++++++---
 .../treestyletab/treestyletabbrowser_autoHide.js  |  5 ++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index d6f74f2a..829cf664 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -1083,12 +1083,21 @@ catch(e) {
 		// Firefox 3 full screen
 		eval('FullScreen._animateUp = '+
 			FullScreen._animateUp.toSource().replace(
-				'gBrowser.mStrip.boxObject.height',
-				'((gBrowser.getAttribute(TreeStyleTabService.kTABBAR_POSITION) != "top") ? 0 : gBrowser.mStrip.boxObject.height)'
+				/((?:gBrowser\.mStrip|gNavToolbox)\.boxObject\.height)/,
+				'((gBrowser.getAttribute(TreeStyleTabService.kTABBAR_POSITION) != "top") ? 0 : $1)'
 			)
 		);
 		eval('FullScreen.mouseoverToggle = '+
-			FullScreen.mouseoverToggle.toSource().replace(
+			FullScreen.mouseoverToggle.toSource().replace(
+				// Firefox 3.7 or later
+				'allFSToolbars[i].setAttribute("moz-collapsed", !aShow);',
+				'if (allFSToolbars[i].id != "TabsToolbar" || gBrowser.getAttribute(TreeStyleTabService.kTABBAR_POSITION) == "top") { $& }'
+			).replace(
+				// Firefox 3.7 or later
+				'this._isChromeCollapsed = !aShow;',
+				'gBrowser.treeStyleTab.updateFloatingTabbar(); $&'
+			).replace(
+				// Firefox 3.6 or older
 				'gBrowser.mStrip.setAttribute("moz-collapsed", !aShow);',
 				'if (gBrowser.getAttribute(TreeStyleTabService.kTABBAR_POSITION) == "top") { $& }'
 			)
diff --git a/content/treestyletab/treestyletabbrowser_autoHide.js b/content/treestyletab/treestyletabbrowser_autoHide.js
index 0e09bcea..b15034f2 100644
--- a/content/treestyletab/treestyletabbrowser_autoHide.js
+++ b/content/treestyletab/treestyletabbrowser_autoHide.js
@@ -490,12 +490,11 @@ TreeStyleTabBrowserAutoHide.prototype = {
 
 			default:
 			case this.kMODE_SHRINK:
-				if (pos == 'left' || pos == 'right') {
+				if (pos == 'left' || pos == 'right')
 					sv.setTabStripAttribute('width', this.getTreePref('tabbar.width'));
-					sv.updateFloatingTabbar();
-				}
 				break;
 		}
+		sv.updateFloatingTabbar();
 	},
  
 	onHiding : function TSTAutoHide_onHiding()