From e6bf59705d3a9ec185c6af5f9d9494cff4f265ab Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Sat, 8 Mar 2008 10:15:58 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=83=96=E3=83=90=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E4=BD=8D=E7=BD=AE=E3=82=92=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E6=99=82=E3=82=82=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=92=E8=87=AA=E5=8B=95=E3=81=A7=E9=9A=A0?=
 =?UTF-8?q?=E3=81=9B=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=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@1999 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.js              |  6 +++---
 content/treestyletab/config.xul             |  6 +++---
 content/treestyletab/treestyletabbrowser.js | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index ff5e3475..5fe6d51b 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -68,7 +68,7 @@ function onChangeTabbarPosition(aOnChange)
 
 	var indentCheck   = document.getElementById('extensions.treestyletab.enableSubtreeIndent-check');
 	var collapseCheck = document.getElementById('extensions.treestyletab.allowSubtreeCollapseExpand-check');
-	var autoHideCheck = document.getElementById('extensions.treestyletab.tabbar.autoHide.enabled-check');
+//	var autoHideCheck = document.getElementById('extensions.treestyletab.tabbar.autoHide.enabled-check');
 	var hideAllTabsCheck = document.getElementById('extensions.treestyletab.tabbar.hideAlltabsButton-check');
 
 	if (aOnChange) {
@@ -77,12 +77,12 @@ function onChangeTabbarPosition(aOnChange)
 	}
 	if (pos == 'left' || pos == 'right') {
 		indentCheck.setAttribute('collapsed', true);
-		autoHideCheck.removeAttribute('collapsed');
+//		autoHideCheck.removeAttribute('collapsed');
 		hideAllTabsCheck.removeAttribute('collapsed');
 	}
 	else {
 		indentCheck.removeAttribute('collapsed');
-		autoHideCheck.setAttribute('collapsed', true);
+//		autoHideCheck.setAttribute('collapsed', true);
 		hideAllTabsCheck.setAttribute('collapsed', true);
 	}
 
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 8d8983a3..9c495356 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -99,12 +99,12 @@
 				label="&config.allowSubtreeCollapseExpand;"/>
 		</hbox>
 		<hbox align="center">
-			<checkbox id="extensions.treestyletab.enableSubtreeIndent-check"
-				preference="extensions.treestyletab.enableSubtreeIndent"
-				label="&config.enableSubtreeIndent;"/>
 			<checkbox id="extensions.treestyletab.tabbar.autoHide.enabled-check"
 				preference="extensions.treestyletab.tabbar.autoHide.enabled"
 				label="&config.tabbar.autoHide.enabled;"/>
+			<checkbox id="extensions.treestyletab.enableSubtreeIndent-check"
+				preference="extensions.treestyletab.enableSubtreeIndent"
+				label="&config.enableSubtreeIndent;"/>
 			<checkbox id="extensions.treestyletab.tabbar.hideAlltabsButton-check"
 				preference="extensions.treestyletab.tabbar.hideAlltabsButton"
 				label="&config.tabbar.hideAlltabsButton;"/>
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index d998be6f..cb0581fd 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -776,9 +776,9 @@ TreeStyleTabBrowser.prototype = {
 				switch (aData)
 				{
 					case 'extensions.treestyletab.tabbar.position':
-						if (value != 'left' && value != 'right') {
-							this.endAutoHide();
-						}
+//						if (value != 'left' && value != 'right') {
+//							this.endAutoHide();
+//						}
 						this.initTabbar();
 						tabs.forEach(function(aTab) {
 							self.initTabAttributes(aTab);
@@ -851,7 +851,7 @@ TreeStyleTabBrowser.prototype = {
 
 					case 'extensions.treestyletab.tabbar.autoHide.enabled':
 						var pos = this.mTabBrowser.getAttribute(this.kTABBAR_POSITION);
-						if (value && (pos == 'left' || pos == 'right'))
+						if (value/* && (pos == 'left' || pos == 'right')*/)
 							this.startAutoHide();
 						else
 							this.endAutoHide();
@@ -1555,8 +1555,8 @@ TreeStyleTabBrowser.prototype = {
 			XPathResult.FIRST_ORDERED_NODE_TYPE
 		).singleNodeValue;
 		var pos = b.getAttribute(this.kTABBAR_POSITION);
-		if (this.getTreePref('show.'+this.kMENUITEM_AUTOHIDE) &&
-			(pos == 'left' || pos == 'right')) {
+		if (this.getTreePref('show.'+this.kMENUITEM_AUTOHIDE)/* &&
+			(pos == 'left' || pos == 'right')*/) {
 			autohide.removeAttribute('hidden');
 			if (this.getTreePref('tabbar.autoHide.enabled'))
 				autohide.setAttribute('checked', true);