From b13ba8986aff0863fc122db2346ce91a551b5d47 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Sun, 2 Mar 2008 17:34:39 +0000
Subject: [PATCH] =?UTF-8?q?Firefox=203=E3=81=A8Tab=20Mix=20Plus=E3=81=AE?=
 =?UTF-8?q?=E7=B5=84=E3=81=BF=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A7=E6=AD=A3?=
 =?UTF-8?q?=E3=81=97=E3=81=8F=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E6=94=B9?=
 =?UTF-8?q?=E5=96=84?=
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@1963 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/hacks.js               | 15 +++++++++------
 content/treestyletab/treestyletab.css       |  3 ++-
 content/treestyletab/treestyletabbrowser.js |  6 ++++--
 skin/classic/treestyletab/treestyletab.css  |  4 ++++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 2007f07f..ae18b845 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -383,12 +383,15 @@ TreeStyleTabService.overrideExtensionsOnInitAfter = function() {
 			)
 		);
 
-		eval('window.setMultibarAttribute = '+
-			window.setMultibarAttribute.toSource().replace(
-				/tabBar.lastChild/g,
-				'TreeStyleTabService.getLastVisibleTab($&)'
-			)
-		);
+		'setMultibarAttribute getMultiRowAttribute tabxTabClosed'.split(' ').forEach(function(aFunc) {
+			if (aFunc in window)
+				eval('window.'+aFunc+' = '+
+					window[aFunc].toSource().replace(
+						/(tabBar.lastChild)/g,
+						'TreeStyleTabService.getLastVisibleTab($1)'
+					)
+				);
+		});
 
 		eval('window.getRowHeight = '+
 			window.getRowHeight.toSource().replace(
diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css
index 7c56359a..c4140ff6 100644
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@@ -50,7 +50,8 @@ tabbrowser[treestyletab-mode="vertical"] tabs[flowing] > * .tabs-frame /* Tab Mi
 	overflow-y: auto !important;
 }
 
-tabbrowser[treestyletab-mode="vertical"] .tabs-stack > * + * > hbox {
+tabbrowser[treestyletab-mode="vertical"] .tabs-stack > * + * > hbox,
+tabbrowser[treestyletab-mode="vertical"] tabs[flowing] > * .tabs-frame /* Tab Mix Plus */ {
 	-moz-box-flex: 1 !important;
 }
 
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 1294df6c..7cfd2526 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -537,8 +537,10 @@ TreeStyleTabBrowser.prototype = {
 			ref.parentNode.insertBefore(splitter, ref);
 		}
 
-		var scrollInnerBox = document.getAnonymousNodes(b.mTabContainer.mTabstrip._scrollbox)[0];
-		var allTabsButton = document.getAnonymousElementByAttribute(b.mTabContainer, 'class', 'tabs-alltabs-button');
+		var scrollInnerBox = b.mTabContainer.mTabstrip._scrollbox ? document.getAnonymousNodes(b.mTabContainer.mTabstrip._scrollbox)[0] :
+				document.getAnonymousElementByAttribute(b.mTabContainer, 'class', 'tabs-frame'); // Tab Mix Plus
+		var allTabsButton = document.getAnonymousElementByAttribute(b.mTabContainer, 'class', 'tabs-alltabs-button') ||
+				document.getAnonymousElementByAttribute(b.mTabContainer, 'anonid', 'alltabs-button'); // Tab Mix Plus
 
 		// Tab Mix Plus
 		var scrollFrame = document.getAnonymousElementByAttribute(b.mTabContainer, 'id', 'scroll-tabs-frame') ||
diff --git a/skin/classic/treestyletab/treestyletab.css b/skin/classic/treestyletab/treestyletab.css
index 1bd4efff..b608873c 100644
--- a/skin/classic/treestyletab/treestyletab.css
+++ b/skin/classic/treestyletab/treestyletab.css
@@ -121,6 +121,10 @@ tabbrowser[treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] {
 	-moz-border-right-colors: ThreeDLightShadow ThreeDHighlight !important;
 }
 
+tabbrowser[treestyletab-mode="vertical"] .tabbrowser-tab .tab-close-button {
+	margin-right: 0 !important;
+}
+
 tabbrowser[treestyletab-tabbar-position="bottom"] .tabbrowser-tab,
 tabbrowser[treestyletab-tabbar-position="bottom"] .tabbrowser-tab:not([selected="true"]) {
 	border-right: 2px solid !important;