Tab Mix Plusで複数行表示されたタブバーについては、高さを取り除かないように

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4661 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2009-07-07 15:56:38 +00:00
parent 0e52a352fe
commit 9221be7c05

View File

@ -800,11 +800,10 @@ TreeStyleTabBrowser.prototype = {
b.removeAttribute(this.kRESIZING); b.removeAttribute(this.kRESIZING);
b.mStrip.removeAttribute('width'); b.mStrip.removeAttribute('width');
b.mStrip.removeAttribute('height');
b.mPanelContainer.removeAttribute('width'); b.mPanelContainer.removeAttribute('width');
b.mPanelContainer.removeAttribute('height');
if (pos & this.kTABBAR_VERTICAL) { if (pos & this.kTABBAR_VERTICAL) {
this.collapseProp = 'margin-top'; this.collapseProp = 'margin-top';
this.positionProp = 'screenY'; this.positionProp = 'screenY';
this.sizeProp = 'height'; this.sizeProp = 'height';
@ -839,14 +838,14 @@ TreeStyleTabBrowser.prototype = {
if (toolboxContainer) if (toolboxContainer)
toolboxContainer.orient = 'vertical'; toolboxContainer.orient = 'vertical';
b.mStrip.setAttribute('width', this.getTreePref('tabbar.width'));
if (this.getTreePref('tabbar.fixed.vertical'))
b.setAttribute(this.kFIXED, true);
else
b.removeAttribute(this.kFIXED);
b.setAttribute(this.kMODE, 'vertical'); b.setAttribute(this.kMODE, 'vertical');
b.mStrip.setAttribute('width', this.getTreePref('tabbar.width'));
b.mStrip.removeAttribute('height');
b.mPanelContainer.removeAttribute('height');
this.updateTabbarFixedState();
if (pos == this.kTABBAR_RIGHT) { if (pos == this.kTABBAR_RIGHT) {
b.setAttribute(this.kTABBAR_POSITION, 'right'); b.setAttribute(this.kTABBAR_POSITION, 'right');
if (this.getTreePref('tabbar.invertTab')) { if (this.getTreePref('tabbar.invertTab')) {
@ -917,19 +916,11 @@ TreeStyleTabBrowser.prototype = {
if (toolboxContainer) if (toolboxContainer)
toolboxContainer.orient = 'horizontal'; toolboxContainer.orient = 'horizontal';
if (this.getTreePref('tabbar.fixed.horizontal')) {
b.setAttribute(this.kFIXED, true);
b.mStrip.removeAttribute('height');
b.mPanelContainer.removeAttribute('height');
}
else {
b.removeAttribute(this.kFIXED);
b.mStrip.setAttribute('height', this.getTreePref('tabbar.height'));
}
b.setAttribute(this.kMODE, this.getTreePref('tabbar.multirow') ? 'multirow' : 'horizontal' ); b.setAttribute(this.kMODE, this.getTreePref('tabbar.multirow') ? 'multirow' : 'horizontal' );
b.removeAttribute(this.kTAB_INVERTED); b.removeAttribute(this.kTAB_INVERTED);
this.updateTabbarFixedState();
if (pos == this.kTABBAR_BOTTOM) { if (pos == this.kTABBAR_BOTTOM) {
b.setAttribute(this.kTABBAR_POSITION, 'bottom'); b.setAttribute(this.kTABBAR_POSITION, 'bottom');
this.indentProp = this.getTreePref('indent.property.bottom'); this.indentProp = this.getTreePref('indent.property.bottom');
@ -970,6 +961,29 @@ TreeStyleTabBrowser.prototype = {
scrollInnerBox = null; scrollInnerBox = null;
allTabsButton = null; allTabsButton = null;
}, },
updateTabbarFixedState : function()
{
var b = this.mTabBrowser;
if (this.isVertical) {
if (this.getTreePref('tabbar.fixed.vertical'))
b.setAttribute(this.kFIXED, true);
else
b.removeAttribute(this.kFIXED);
}
else {
if (this.getTreePref('tabbar.fixed.horizontal')) {
b.setAttribute(this.kFIXED, true);
if (!this.isMultiRow) {
b.mStrip.removeAttribute('height');
b.mPanelContainer.removeAttribute('height');
}
}
else {
b.removeAttribute(this.kFIXED);
b.mStrip.setAttribute('height', this.getTreePref('tabbar.height'));
}
}
},
destroy : function() destroy : function()
{ {
@ -1196,26 +1210,8 @@ TreeStyleTabBrowser.prototype = {
break; break;
case 'extensions.treestyletab.tabbar.fixed.vertical': case 'extensions.treestyletab.tabbar.fixed.vertical':
if (this.isVertical) {
if (value)
b.setAttribute(this.kFIXED, true);
else
b.removeAttribute(this.kFIXED);
}
break;
case 'extensions.treestyletab.tabbar.fixed.horizontal': case 'extensions.treestyletab.tabbar.fixed.horizontal':
if (!this.isVertical) { this.updateTabbarFixedState();
if (value) {
b.setAttribute(this.kFIXED, true);
b.mStrip.removeAttribute('height');
b.mPanelContainer.removeAttribute('height');
}
else {
b.removeAttribute(this.kFIXED);
b.mStrip.setAttribute('height', this.getTreePref('tabbar.height'));
}
}
break; break;
case 'extensions.treestyletab.tabbar.transparent.style': case 'extensions.treestyletab.tabbar.transparent.style':