From d0a2c3b63390a3d5b64bd640a99a7c2cf2b2e3bd Mon Sep 17 00:00:00 2001 From: piro Date: Sun, 29 Mar 2009 19:06:25 +0000 Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E6=9D=A5=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=81=AB=E6=88=BB=E3=81=99=E9=9A=A0=E3=81=97=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= 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@3951 599a83e7-65a4-db11-8015-0010dcdd6dc2 --- content/treestyletab/treestyletab.js | 2 +- content/treestyletab/treestyletabbrowser.js | 5 +++-- defaults/preferences/treestyletab.js | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js index 5ffb65d5..e48de542 100644 --- a/content/treestyletab/treestyletab.js +++ b/content/treestyletab/treestyletab.js @@ -82,7 +82,7 @@ var TreeStyleTabService = { kSHOWN_BY_SHORTCUT : 1 << 0, kSHOWN_BY_MOUSEMOVE : 1 << 1, kSHOWN_BY_FEEDBACK : 1 << 2, - kSTAY_ON_MOUSEOVER : (1 << 0) | (1 << 1) | (1 << 2), + kKEEP_SHOWN_ON_MOUSEOVER : (1 << 0) | (1 << 1) | (1 << 2), kTRANSPARENT_NONE : 0, kTRANSPARENT_PART : 1, diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js index ab226cb1..07a1a0c8 100644 --- a/content/treestyletab/treestyletabbrowser.js +++ b/content/treestyletab/treestyletabbrowser.js @@ -1208,7 +1208,7 @@ TreeStyleTabBrowser.prototype = { !this.tabContextMenuShown && ( !this.autoHideShown || - this.showHideTabbarReason & this.kSTAY_ON_MOUSEOVER + this.showHideTabbarReason & this.kKEEP_SHOWN_ON_MOUSEOVER ) ) this.showHideTabbarOnMousemove(aEvent); @@ -3646,7 +3646,8 @@ TreeStyleTabBrowser.prototype = { if (this.autoHideShown) { if ( shouldKeepShown && - this.showHideTabbarReason & this.kSTAY_ON_MOUSEOVER + this.showHideTabbarReason & this.kKEEP_SHOWN_ON_MOUSEOVER && + this.getTreePref('tabbar.autoShow.keepShownOnMouseover') ) { this.showHideTabbarReason = this.kSHOWN_BY_MOUSEMOVE; this.cancelDelayedAutoShowForShortcut(); diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js index 75814f6e..feff1d80 100644 --- a/defaults/preferences/treestyletab.js +++ b/defaults/preferences/treestyletab.js @@ -27,6 +27,7 @@ pref("extensions.treestyletab.tabbar.autoShow.accelKeyDown.delay", 800); pref("extensions.treestyletab.tabbar.autoShow.tabSwitch", true); pref("extensions.treestyletab.tabbar.autoShow.feedback", false); pref("extensions.treestyletab.tabbar.autoShow.feedback.delay", 3000); +pref("extensions.treestyletab.tabbar.autoShow.keepShownOnMouseover", true); pref("extensions.treestyletab.tabbar.fixed", false); pref("extensions.treestyletab.tabbar.syncRelatedPrefsForDynamicPosition", true); pref("extensions.treestyletab.enableSubtreeIndent", true);