タブバーの自動表示に関する処理を全面的に修正

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@2014 599a83e7-65a4-db11-8015-0010dcdd6dc2

content/treestyletab/treestyletab.js

@@ -56,6 +56,7 @@ var TreeStyleTabService = {
 	kSHOWN_BY_UNKNOWN   : 0,
 	kSHOWN_BY_SHORTCUT  : 1,
 	kSHOWN_BY_MOUSEMOVE : 2,
+	kSHOWN_BY_FEEDBACK  : 3,
 
 	kINSERT_FISRT : 0,
 	kINSERT_LAST  : 1,
@@ -1248,21 +1249,29 @@ catch(e) {
 		if (!b || !b.treeStyleTab) return;
 		var sv = b.treeStyleTab;
 
-		this.cancelDelayedAutoShow();
+		if (this.delayedAutoShowDone)
+			this.cancelDelayedAutoShow();
 
 		if (
 			b.mTabContainer.childNodes.length > 1 &&
 			!aEvent.altKey &&
 			(navigator.platform.match(/mac/i) ? aEvent.metaKey : aEvent.ctrlKey )
 			) {
-			if (this.getTreePref('tabbar.autoShow.ctrlKeyDown')) {
+			if (this.getTreePref('tabbar.autoShow.ctrlKeyDown') && 
-				this.delayedAutoShowTimer = window.setTimeout(function() {
+				!sv.tabbarShown) {
-					sv.showTabbar(sv.kSHOWN_BY_SHORTCUT);
+				this.delayedAutoShowTimer = window.setTimeout(
-				}, this.getTreePref('tabbar.autoShow.ctrlKeyDown.delay'));
+					function(aSelf) {
+						aSelf.delayedAutoShowDone = true;
+						sv.showTabbar(sv.kSHOWN_BY_SHORTCUT);
+					},
+					this.getTreePref('tabbar.autoShow.ctrlKeyDown.delay'),
+					this
+				);
+				this.delayedAutoShowDone = false;
 			}
 		}
 		else
-			sv.hideTabbar(sv.kSHOWN_BY_SHORTCUT);
+			sv.hideTabbar();
 	},
 	cancelDelayedAutoShow : function()
 	{
@@ -1272,6 +1281,7 @@ catch(e) {
 		}
 	},
 	delayedAutoShowTimer : null,
+	delayedAutoShowDone : true,
  
 	onKeyRelease : function(aEvent) 
 	{
@@ -1308,15 +1318,13 @@ catch(e) {
 				aEvent.charCode == 0 && aEvent.keyCode == 16
 			)
 			) {
-			sv.showTabbar();
+dump('show/onKeyRelease\n');
+			sv.showTabbar(sv.kSHOWN_BY_SHORTCUT);
 			return;
 		}
 
-		var switchTabAction = aEvent.keyCode == (isMac ? aEvent.DOM_VK_META : aEvent.DOM_VK_CONTROL );
+		if (sv.showHideTabbarReason == sv.kSHOWN_BY_SHORTCUT)
-
+			sv.hideTabbar();
-		var shown  = sv.tabbarShown;
-
-		sv.hideTabbar(!switchTabAction);
 	},
  	
 	keyEventListening : false, 

content/treestyletab/treestyletabbrowser.js

@@ -907,20 +907,6 @@ TreeStyleTabBrowser.prototype = {
 					this.onTabClick(aEvent);
 					return;
 				}
-/*
-				var isMiddleClick = (
-					aEvent.button == 1 ||
-					aEvent.button == 0 && (aEvent.ctrlKey || aEvent.metaKey)
-					);
-				var node = aEvent.originalTarget;
-				while (node.parentNode && !node.href)
-				{
-					node = node.parentNode;
-				}
-				if (node.href && isMiddleClick) {
-					this.readyToOpenChildTab(this.mTabBrowser.selectedTab);
-				}
-*/
 				return;
 
 			case 'dblclick':
@@ -941,20 +927,35 @@ TreeStyleTabBrowser.prototype = {
 				else {
 					if (aEvent.originalTarget.getAttribute('class') == this.kSPLITTER)
 						this.tabbarResizing = true;
-					this.cancelShowHideTabbar();
+					this.cancelShowHideTabbarOnMousemove();
+					if (
+						this.autoHideEnabled &&
+						this.tabbarShown &&
+						(
+							aEvent.originalTarget.ownerDocument != document ||
+							!this.getTabBrowserFromChild(aEvent.originalTarget)
+						)
+						)
+						this.hideTabbar();
 				}
 				return;
 
 			case 'mouseup':
 				if (aEvent.originalTarget.getAttribute('class') == this.kSPLITTER)
 					this.tabbarResizing = false;
-				this.cancelShowHideTabbar();
+				this.cancelShowHideTabbarOnMousemove();
 				return;
 
 			case 'mousemove':
 				if (!this.tabbarResizing) {
-					if (!this.tabContextMenuShown)
+					if (
-						this.showHideTabbar(aEvent);
+						!this.tabContextMenuShown &&
+						(
+							!this.tabbarShown ||
+							this.showHideTabbarReason == this.kSHOWN_BY_MOUSEMOVE
+						)
+						)
+						this.showHideTabbarOnMousemove(aEvent);
 					return;
 				}
 			case 'resize':
@@ -1083,6 +1084,8 @@ TreeStyleTabBrowser.prototype = {
 		else {
 			this.multipleCount++;
 		}
+
+		this.showTabbarForFeedback();
 	},
  
 	onTabRemoved : function(aEvent) 
@@ -1180,6 +1183,8 @@ TreeStyleTabBrowser.prototype = {
 			b.selectedTab = nextFocusedTab;
 
 		this.checkTabsIndentOverflow();
+
+		this.showTabbarForFeedback();
 	},
  
 	onTabMove : function(aEvent) 
@@ -1210,6 +1215,8 @@ TreeStyleTabBrowser.prototype = {
 			return;
 
 		this.attachTabFromPosition(tab, aEvent.detail);
+
+		this.showTabbarForFeedback();
 	},
 	
 	attachTabFromPosition : function(aTab, aOldPosition) 
@@ -1434,6 +1441,8 @@ TreeStyleTabBrowser.prototype = {
 			this.redrawContentArea();
 
 		this.updateInvertedTabContentsOrder();
+
+		this.showTabbarForFeedback();
 	},
  
 	onTabClick : function(aEvent) 
@@ -2618,8 +2627,7 @@ TreeStyleTabBrowser.prototype = {
 		}
 	},
    
-/* auto hide */ 
+/* show/hide tab bar */ 
-	autoHideEnabled : false,
 	tabbarShown : true,
 	
 	get tabbarWidth() 
@@ -2654,88 +2662,6 @@ TreeStyleTabBrowser.prototype = {
 	},
 	_tabbarHeight : 0,
  
-	get areaPadding() 
-	{
-		return this.getTreePref('tabbar.autoHide.area');
-	},
- 
-	startAutoHide : function() 
-	{
-		if (this.autoHideEnabled) return;
-		this.autoHideEnabled = true;
-
-		this.mTabBrowser.addEventListener('mousedown', this, true);
-		this.mTabBrowser.addEventListener('mouseup', this, true);
-		this.mTabBrowser.addEventListener('mousemove', this, true);
-		this.mTabBrowser.addEventListener('scroll', this, true);
-		this.mTabBrowser.addEventListener('resize', this, true);
-		this.mTabBrowser.addEventListener('load', this, true);
-
-		this.tabbarShown = true;
-		this.showHideTabbarInternal();
-	},
- 
-	endAutoHide : function() 
-	{
-		if (!this.autoHideEnabled) return;
-		this.autoHideEnabled = false;
-
-		this.mTabBrowser.removeEventListener('mousedown', this, true);
-		this.mTabBrowser.removeEventListener('mouseup', this, true);
-		this.mTabBrowser.removeEventListener('mousemove', this, true);
-		this.mTabBrowser.removeEventListener('scroll', this, true);
-		this.mTabBrowser.removeEventListener('resize', this, true);
-		this.mTabBrowser.removeEventListener('load', this, true);
-
-		this.container.style.margin = 0;
-		this.mTabBrowser.removeAttribute(this.kAUTOHIDE);
-		this.tabbarShown = true;
-	},
- 
-	showHideTabbar : function(aEvent) 
-	{
-		if ('gestureInProgress' in window && window.gestureInProgress) return;
-
-		this.cancelShowHideTabbar();
-
-		var b      = this.mTabBrowser;
-		var pos    = b.getAttribute(this.kTABBAR_POSITION);
-		var expand = this.getTreePref('tabbar.autoHide.expandArea');
-		if (!this.tabbarShown &&
-			(
-				pos == 'left' ?
-					(aEvent.screenX <= b.boxObject.screenX + (expand ? this.tabbarWidth : 0 ) + this.areaPadding) :
-				pos == 'right' ?
-					(aEvent.screenX >= b.boxObject.screenX + b.boxObject.width - (expand ? this.tabbarWidth : 0 ) - this.areaPadding) :
-				pos == 'bottom' ?
-					(aEvent.screenY >= b.boxObject.screenY + b.boxObject.height - (expand ? this.tabbarHeight : 0 ) - this.areaPadding) :
-					(aEvent.screenY <= b.boxObject.screenY + (expand ? this.tabbarHeight : 0 ) + this.areaPadding)
-				))
-				this.showHideTabbarTimer = window.setTimeout(
-					function(aSelf) { aSelf.showHideTabbarInternal(aSelf.kSHOWN_BY_MOUSEMOVE); },
-					this.getTreePref('tabbar.autoHide.delay'),
-					this
-				);
-
-		if (this.tabbarShown &&
-			this.showHideTabbarReason != this.kSHOWN_BY_SHORTCUT &&
-			(
-				pos == 'left' ?
-					(aEvent.screenX > b.mCurrentBrowser.boxObject.screenX + this.areaPadding) :
-				pos == 'right' ?
-					(aEvent.screenX < b.mCurrentBrowser.boxObject.screenX + b.mCurrentBrowser.boxObject.width - this.areaPadding) :
-				pos == 'bottom' ?
-					(aEvent.screenY < b.mCurrentBrowser.boxObject.screenY + b.mCurrentBrowser.boxObject.height - this.areaPadding) :
-					(aEvent.screenY > b.mCurrentBrowser.boxObject.screenY + this.areaPadding)
-				))
-				this.showHideTabbarTimer = window.setTimeout(
-					function(aSelf) { aSelf.showHideTabbarInternal(aSelf.kSHOWN_BY_MOUSEMOVE); },
-					this.getTreePref('tabbar.autoHide.delay'),
-					this
-				);
-	},
-	showHideTabbarTimer : null,
-	 
 	showHideTabbarInternal : function(aReason) 
 	{
 		fullScreenCanvas.show();
@@ -2794,14 +2720,6 @@ TreeStyleTabBrowser.prototype = {
 			this.showHideTabbarInternal(aReason);
 	},
   
-	cancelShowHideTabbar : function() 
-	{
-		if (this.showHideTabbarTimer) {
-			window.clearTimeout(this.showHideTabbarTimer);
-			this.showHideTabbarTimer = null;
-		}
-	},
-  
 	redrawContentArea : function() 
 	{
 		var pos = this.mTabBrowser.getAttribute(this.kTABBAR_POSITION);
@@ -2830,6 +2748,155 @@ TreeStyleTabBrowser.prototype = {
 		}
 		catch(e) {
 		}
+	},
+  
+/* auto hide */ 
+	autoHideEnabled : false,
+	 
+	get areaPadding() 
+	{
+		return this.getTreePref('tabbar.autoHide.area');
+	},
+ 
+	startAutoHide : function() 
+	{
+		if (this.autoHideEnabled) return;
+		this.autoHideEnabled = true;
+
+		this.mTabBrowser.addEventListener('mousedown', this, true);
+		this.mTabBrowser.addEventListener('mouseup', this, true);
+		this.mTabBrowser.addEventListener('mousemove', this, true);
+		this.mTabBrowser.addEventListener('scroll', this, true);
+		this.mTabBrowser.addEventListener('resize', this, true);
+		this.mTabBrowser.addEventListener('load', this, true);
+
+		this.tabbarShown = true;
+		this.showHideTabbarInternal();
+	},
+ 
+	endAutoHide : function() 
+	{
+		if (!this.autoHideEnabled) return;
+		this.autoHideEnabled = false;
+
+		this.mTabBrowser.removeEventListener('mousedown', this, true);
+		this.mTabBrowser.removeEventListener('mouseup', this, true);
+		this.mTabBrowser.removeEventListener('mousemove', this, true);
+		this.mTabBrowser.removeEventListener('scroll', this, true);
+		this.mTabBrowser.removeEventListener('resize', this, true);
+		this.mTabBrowser.removeEventListener('load', this, true);
+
+		this.container.style.margin = 0;
+		this.mTabBrowser.removeAttribute(this.kAUTOHIDE);
+		this.tabbarShown = true;
+	},
+ 
+	showHideTabbarOnMousemove : function(aEvent) 
+	{
+		if ('gestureInProgress' in window && window.gestureInProgress) return;
+
+		this.cancelShowHideTabbarOnMousemove();
+
+		var b      = this.mTabBrowser;
+		var pos    = b.getAttribute(this.kTABBAR_POSITION);
+		var expand = this.getTreePref('tabbar.autoHide.expandArea');
+		if (
+			(
+				!this.tabbarShown ||
+				this.showHideTabbarReason == this.kSHOWN_BY_FEEDBACK
+			) &&
+			(
+				pos == 'left' ?
+					(aEvent.screenX <= b.boxObject.screenX + (expand ? this.tabbarWidth : 0 ) + this.areaPadding) :
+				pos == 'right' ?
+					(aEvent.screenX >= b.boxObject.screenX + b.boxObject.width - (expand ? this.tabbarWidth : 0 ) - this.areaPadding) :
+				pos == 'bottom' ?
+					(aEvent.screenY >= b.boxObject.screenY + b.boxObject.height - (expand ? this.tabbarHeight : 0 ) - this.areaPadding) :
+					(aEvent.screenY <= b.boxObject.screenY + (expand ? this.tabbarHeight : 0 ) + this.areaPadding)
+				))
+				this.showHideTabbarOnMousemoveTimer = window.setTimeout(
+					function(aSelf) {
+						if (aSelf.showHideTabbarReason == aSelf.kSHOWN_BY_FEEDBACK) {
+							aSelf.showHideTabbarReason = aSelf.kSHOWN_BY_MOUSEMOVE;
+							aSelf.cancelHideTabbarForFeedback();
+						}
+						else
+							aSelf.showTabbar(aSelf.kSHOWN_BY_MOUSEMOVE);
+					},
+					this.getTreePref('tabbar.autoHide.delay'),
+					this
+				);
+
+		if (this.tabbarShown &&
+			(
+				pos == 'left' ?
+					(aEvent.screenX > b.mCurrentBrowser.boxObject.screenX + this.areaPadding) :
+				pos == 'right' ?
+					(aEvent.screenX < b.mCurrentBrowser.boxObject.screenX + b.mCurrentBrowser.boxObject.width - this.areaPadding) :
+				pos == 'bottom' ?
+					(aEvent.screenY < b.mCurrentBrowser.boxObject.screenY + b.mCurrentBrowser.boxObject.height - this.areaPadding) :
+					(aEvent.screenY > b.mCurrentBrowser.boxObject.screenY + this.areaPadding)
+				))
+				this.showHideTabbarOnMousemoveTimer = window.setTimeout(
+					function(aSelf) {
+						if (aSelf.showHideTabbarReason == aSelf.kSHOWN_BY_MOUSEMOVE)
+							aSelf.hideTabbar(aSelf.kSHOWN_BY_MOUSEMOVE);
+					},
+					this.getTreePref('tabbar.autoHide.delay'),
+					this
+				);
+	},
+	showHideTabbarOnMousemoveTimer : null,
+	 
+	cancelShowHideTabbarOnMousemove : function() 
+	{
+		if (this.showHideTabbarOnMousemoveTimer) {
+			window.clearTimeout(this.showHideTabbarOnMousemoveTimer);
+			this.showHideTabbarOnMousemoveTimer = null;
+		}
+	},
+  	
+	showTabbarForFeedback : function() 
+	{
+		if (!this.autoHideEnabled ||
+			!this.getTreePref('tabbar.autoShow.feedback'))
+			return;
+
+		if (this.delayedShowTabbarForFeedbackTimer) {
+			window.clearTimeout(this.delayedShowTabbarForFeedbackTimer);
+			this.delayedShowTabbarForFeedbackTimer = null;
+		}
+		this.cancelHideTabbarForFeedback();
+		this.delayedShowTabbarForFeedbackTimer = window.setTimeout(
+			function(aSelf) {
+				aSelf.delayedShowTabbarForFeedbackTimer = null;
+				aSelf.delayedShowTabbarForFeedback();
+			},
+			100,
+			this
+		);
+	},
+	delayedShowTabbarForFeedback : function()
+	{
+		this.showTabbar(this.kSHOWN_BY_FEEDBACK);
+		this.cancelHideTabbarForFeedback();
+		this.delayedHideTabbarForFeedbackTimer = window.setTimeout(
+			function(aSelf) {
+				aSelf.delayedHideTabbarForFeedbackTimer = null;
+				if (aSelf.showHideTabbarReason == aSelf.kSHOWN_BY_FEEDBACK)
+					aSelf.hideTabbar();
+			},
+			this.getTreePref('tabbar.autoShow.feedback.delay'),
+			this
+		);
+	},
+	 
+	cancelHideTabbarForFeedback : function() 
+	{
+		if (this.delayedHideTabbarForFeedbackTimer) {
+			window.clearTimeout(this.delayedHideTabbarForFeedbackTimer);
+			this.delayedHideTabbarForFeedbackTimer = null;
+		}
 	}
     
 }; 

defaults/preferences/treestyletab.js

@@ -14,6 +14,8 @@ pref("extensions.treestyletab.tabbar.autoHide.expandArea", false);
 pref("extensions.treestyletab.tabbar.autoShow.ctrlKeyDown", true);
 pref("extensions.treestyletab.tabbar.autoShow.ctrlKeyDown.delay", 800);
 pref("extensions.treestyletab.tabbar.autoShow.tabSwitch", true);
+pref("extensions.treestyletab.tabbar.autoShow.feedback", true);
+pref("extensions.treestyletab.tabbar.autoShow.feedback.delay", 3000);
 pref("extensions.treestyletab.tabbar.fixed", false);
 pref("extensions.treestyletab.tabbar.syncRelatedPrefsForDynamicPosition", true);
 pref("extensions.treestyletab.enableSubtreeIndent",    true);