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

Inherit width, height, and others via xbl:inherits (#550)

Browse Source 
The inner box of the tab bar should inherit width, height, and other attributes given via setTabbrowserAttribute(), from the parent element. However, if the binding is re-assigned again and again, then it can happen infinitely loop when the inheritance is done by xbl:constructor.
This commit is contained in:
Piro / YUKI Hiroshi 2013-08-28 02:25:49 +09:00
parent 4df2d498cb
commit 6bce4e5e19
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
content/treestyletab/treestyletab.xml
View File

@ -12,21 +12,26 @@
</content>
</binding>
<!--
If these bindings are unexpectedly re-assigned, then all attributes
(including sizes) are lost and the appearance becomes broken.
To prevent this problem, the inner box should inherit all attributes
given via setTabbrowserAttribute() method, from the parent element.
See also: https://github.com/piroor/treestyletab/issues/538
On some versions, these inheritence are done by xbl:constructor.
However, it causes infinitely loop on some environments, so
now I use xbl:inherits.
See also: https://github.com/piroor/treestyletab/issues/550
-->
<binding id="toolbar"
extends="chrome://global/content/bindings/toolbar.xml#toolbar">
<content><xul:hbox flex="1"
xbl:inherits="orient"
xbl:inherits="orient,width,height,treestyletab-allow-subtree-collapse,treestyletab-animation-enabled,treestyletab-closebox-inverted,treestyletab-firsttab-border,treestyletab-invert-scrollbar,treestyletab-max-tree-level,treestyletab-mode,treestyletab-narrow-scrollbar,treestyletab-print-preview,treestyletab-stack-collapsed-tabs,treestyletab-style,treestyletab-tab-contents-inverted,treestyletab-tab-inverted,treestyletab-tabbar-autohide,treestyletab-tabbar-autohide-state,treestyletab-tabbar-fixed,treestyletab-tabbar-fixed-horizontal,treestyletab-tabbar-fixed-vertical,treestyletab-tabbar-position,treestyletab-tabbar-resizing,treestyletab-tabs-indented,treestyletab-twisty-style"
anonid="toolbar-innerbox"
class="treestyletab-toolbar-inner-box"><xbl:children/></xul:hbox></content>
<implementation>
<constructor><![CDATA[
// If the binding is unexpectedly re-assigned, then
// the size of the inner box is lost.
// So we have to update it immediately.
// See: https://github.com/piroor/treestyletab/issues/538
if (gBrowser.treeStyleTab)
gBrowser.treeStyleTab.updateFloatingTabbar(gBrowser.treeStyleTab.kTABBAR_UPDATE_BY_APPEARANCE_CHANGE);
]]></constructor>
<field name="treeStyleTabToolbarInnerBox" readonly="true">
document.getAnonymousElementByAttribute(this, 'anonid', 'toolbar-innerbox')
</field>
@ -36,18 +41,10 @@
<binding id="toolbar-drag"
extends="chrome://global/content/bindings/toolbar.xml#toolbar-drag">
<content><xul:hbox flex="1"
xbl:inherits="orient"
xbl:inherits="orient,width,height,treestyletab-allow-subtree-collapse,treestyletab-animation-enabled,treestyletab-closebox-inverted,treestyletab-firsttab-border,treestyletab-invert-scrollbar,treestyletab-max-tree-level,treestyletab-mode,treestyletab-narrow-scrollbar,treestyletab-print-preview,treestyletab-stack-collapsed-tabs,treestyletab-style,treestyletab-tab-contents-inverted,treestyletab-tab-inverted,treestyletab-tabbar-autohide,treestyletab-tabbar-autohide-state,treestyletab-tabbar-fixed,treestyletab-tabbar-fixed-horizontal,treestyletab-tabbar-fixed-vertical,treestyletab-tabbar-position,treestyletab-tabbar-resizing,treestyletab-tabs-indented,treestyletab-twisty-style"
anonid="toolbar-innerbox"
class="treestyletab-toolbar-inner-box"><xbl:children/></xul:hbox></content>
<implementation>
<constructor><![CDATA[
// If the binding is unexpectedly re-assigned, then
// the size of the inner box is lost.
// So we have to update it immediately.
// See: https://github.com/piroor/treestyletab/issues/538
if (gBrowser.treeStyleTab)
gBrowser.treeStyleTab.updateFloatingTabbar(gBrowser.treeStyleTab.kTABBAR_UPDATE_BY_APPEARANCE_CHANGE);
]]></constructor>
<field name="treeStyleTabToolbarInnerBox" readonly="true">
document.getAnonymousElementByAttribute(this, 'anonid', 'toolbar-innerbox')
</field>

4
modules/browser.js
View File

@ -1865,8 +1865,8 @@ TreeStyleTabBrowser.prototype = {
stripStyle.right = pos != 'right' ? '' :
((root.screenX + root.width) - (box.screenX + box.width))+'px';
stripStyle.width = (tabContainerBox.width = width)+'px';
stripStyle.height = (tabContainerBox.height = height)+'px';
stripStyle.width = (strip.width = tabContainerBox.width = width)+'px';
stripStyle.height = (strip.height = tabContainerBox.height = height)+'px';
this._updateFloatingTabbarResizer({
width : width,