From 0f44906526db2dafb0236bb5c954c303daaceb40 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Fri, 25 Jun 2010 17:43:30 +0000
Subject: [PATCH] =?UTF-8?q?Trunk=E3=81=A7=E3=82=BF=E3=83=96=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E3=83=89=E3=83=A9=E3=83=83=E3=82=B0=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=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@6724 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletabbrowser.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 0b219bea..7f8559e4 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -2886,11 +2886,22 @@ TreeStyleTabBrowser.prototype = {
  
 	onMouseDown : function TSTBrowser_onMouseDown(aEvent) 
 	{
-		if (aEvent.button != 0 ||
-			!this.isEventFiredOnTwisty(aEvent))
-			return;
-
-		this.getTabFromEvent(aEvent).__treestyletab__preventSelect = true;
+		if (
+			aEvent.button == 0 &&
+			this.isEventFiredOnTwisty(aEvent)
+			) {
+			this.getTabFromEvent(aEvent).__treestyletab__preventSelect = true;
+		}
+		else if (
+			'TabsOnTop' in window &&
+			(
+				this.currentTabbarPosition != 'top' ||
+				!TabsOnTop.enabled
+			) &&
+			this.tabbarDNDObserver.canDragTabbar(aEvent)
+			) {
+			aEvent.stopPropagation();
+		}
 	},
  
 	onMouseUp : function TSTBrowser_onMouseUp(aEvent)