stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

自動で隠すモードの切り替え時にタブバーの幅が正しく復元されるようにした

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@2660 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2008-06-17 12:55:05 +00:00
parent 0986e27b7f
commit a3b2a53a7c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/treestyletab/treestyletab.js
View File

@ -1429,8 +1429,7 @@ catch(e) {
onTabbarResized : function(aEvent) onTabbarResized : function(aEvent)
{ {
var b = this.getTabBrowserFromChild(aEvent.currentTarget); var b = this.getTabBrowserFromChild(aEvent.currentTarget);
if (this.autoHideMode == this.kAUTOHIDE_MODE_SHRINK && if (!b.treeStyleTab.tabbarExpanded)
!b.treeStyleTab.tabbarExpanded)
this.setTreePref('tabbar.shrunkenWidth', b.mStrip.boxObject.width); this.setTreePref('tabbar.shrunkenWidth', b.mStrip.boxObject.width);
else else
this.setTreePref('tabbar.width', b.mStrip.boxObject.width); this.setTreePref('tabbar.width', b.mStrip.boxObject.width);
@ -1684,12 +1683,13 @@ catch(e) {
break; break;
case 'extensions.treestyletab.tabbar.autoHide.mode': case 'extensions.treestyletab.tabbar.autoHide.mode':
this.autoHideMode = this.getTreePref('tabbar.autoHide.mode'); // don't set on this time, because appearance of all tabbrowsers are not updated yet.
// this.autoHideMode = this.getTreePref('tabbar.autoHide.mode');
case 'extensions.treestyletab.tabbar.autoShow.accelKeyDown': case 'extensions.treestyletab.tabbar.autoShow.accelKeyDown':
case 'extensions.treestyletab.tabbar.autoShow.tabSwitch': case 'extensions.treestyletab.tabbar.autoShow.tabSwitch':
case 'extensions.treestyletab.tabbar.autoShow.feedback': case 'extensions.treestyletab.tabbar.autoShow.feedback':
if ( if (
this.autoHideMode && this.getTreePref('tabbar.autoHide.mode') &&
( (
this.getTreePref('tabbar.autoShow.accelKeyDown') || this.getTreePref('tabbar.autoShow.accelKeyDown') ||
this.getTreePref('tabbar.autoShow.tabSwitch') || this.getTreePref('tabbar.autoShow.tabSwitch') ||

11
content/treestyletab/treestyletabbrowser.js
View File

@ -877,8 +877,12 @@ TreeStyleTabBrowser.prototype = {
case 'extensions.treestyletab.tabbar.autoHide.mode': case 'extensions.treestyletab.tabbar.autoHide.mode':
this.endAutoHide(); this.endAutoHide();
if (value != this.kAUTOHIDE_MODE_DISABLED) // update internal property after the appearance of the tab bar is updated.
this.startAutoHide(); window.setTimeout(function(aSelf) {
aSelf.autoHideMode = value;
if (value != aSelf.kAUTOHIDE_MODE_DISABLED)
aSelf.startAutoHide();
}, 0, this);
break; break;
case 'extensions.treestyletab.tabbar.autoShow.mousemove': case 'extensions.treestyletab.tabbar.autoShow.mousemove':
@ -3126,6 +3130,9 @@ TreeStyleTabBrowser.prototype = {
if (!this.autoHideEnabled) return; if (!this.autoHideEnabled) return;
this.autoHideEnabled = false; this.autoHideEnabled = false;
if (!this.autoHideShown)
this.showHideTabbarInternal();
this.mTabBrowser.removeEventListener('mousedown', this, true); this.mTabBrowser.removeEventListener('mousedown', this, true);
this.mTabBrowser.removeEventListener('mouseup', this, true); this.mTabBrowser.removeEventListener('mouseup', this, true);
this.mTabBrowser.removeEventListener('scroll', this, true); this.mTabBrowser.removeEventListener('scroll', this, true);