зеркало из https://github.com/mozilla/gecko-dev.git
93193 - cleaning up after align/pack xul box model changes, r=blake, sr=hyatt, 90741 - replacing box with hbox/vbox (from andersma@luther.edu), r=hewitt, sr=hyatt
This commit is contained in:
Родитель
4ab8d6cf66
Коммит
976a7b1757
|
@ -12,13 +12,13 @@
|
|||
|
||||
<binding id="toolbox" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
|
||||
<content orient="vertical">
|
||||
<xul:box orient="vertical" flex="1" class="toolbar-internal-box">
|
||||
<xul:vbox flex="1" class="toolbar-internal-box">
|
||||
<children/>
|
||||
</xul:box>
|
||||
<xul:box tbattr="collapsed-tray-holder" class="collapsed-tray-holder" moz-collapsed="true">
|
||||
<xul:box tbattr="collapsed-tray" class="collapsed-tray"/>
|
||||
</xul:vbox>
|
||||
<xul:hbox tbattr="collapsed-tray-holder" class="collapsed-tray-holder" moz-collapsed="true">
|
||||
<xul:hbox tbattr="collapsed-tray" class="collapsed-tray"/>
|
||||
<xul:spring flex="1" class="collapsed-tray-spring"/>
|
||||
</xul:box>
|
||||
</xul:hbox>
|
||||
</content>
|
||||
|
||||
<implementation>
|
||||
|
@ -142,10 +142,10 @@
|
|||
<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
|
||||
tbattr="toolbar-grippy"
|
||||
class="toolbar-grippy"/>
|
||||
<xul:box flex="1" class="toolbar-holder" autostretch="never"
|
||||
inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch">
|
||||
<xul:hbox flex="1" class="toolbar-holder" align="center"
|
||||
inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
|
||||
<children/>
|
||||
</xul:box>
|
||||
</xul:hbox>
|
||||
</content>
|
||||
|
||||
<implementation>
|
||||
|
@ -178,9 +178,9 @@
|
|||
<content>
|
||||
<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
|
||||
tbattr="toolbar-grippy" class="toolbar-grippy"/>
|
||||
<xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar" autostretch="never">
|
||||
<xul:hbox flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar" align="center">
|
||||
<children/>
|
||||
</xul:box>
|
||||
</xul:hbox>
|
||||
</content>
|
||||
|
||||
<implementation>
|
||||
|
|
Загрузка…
Ссылка в новой задаче