Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 19:33:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out Australis changeset f9e54107a580

Browse Source
This commit is contained in:
Dão Gottwald 2014-01-18 14:23:49 +01:00
parent 5e98ba44a8
commit dc87c040bc
9 changed files with 38 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/customizableui/content/panelUI.inc.xul
View File

@ -11,7 +11,7 @@
<panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
<panelview id="PanelUI-mainView" context="customizationPanelContextMenu">
<vbox id="PanelUI-contents-scroller">
<vbox id="PanelUI-contents" class="panelUI-grid"/>
<vbox id="PanelUI-contents"/>
</vbox>
<footer id="PanelUI-footer">
@ -178,6 +178,6 @@
level="top"
hidden="true">
<vbox id="widget-overflow-scroller">
<vbox id="widget-overflow-list" class="widget-overflow-list"/>
<vbox id="widget-overflow-list"/>
</vbox>
</panel>

16
browser/components/customizableui/src/CustomizableUI.jsm
View File

@ -479,7 +479,9 @@ let CustomizableUIInternal = {
this.ensureButtonContextMenu(node, aAreaNode);
if (node.localName == "toolbarbutton" && aArea == CustomizableUI.AREA_PANEL) {
node.setAttribute("tabindex", "0");
node.setAttribute("wrap", "true");
if (!node.hasAttribute("type")) {
node.setAttribute("type", "wrap");
}
}
this.insertWidgetBefore(node, currentNode, container, aArea);
@ -656,7 +658,9 @@ let CustomizableUIInternal = {
}
this.ensureButtonContextMenu(child, aPanel);
child.setAttribute("tabindex", "0");
child.setAttribute("wrap", "true");
if (!child.hasAttribute("type")) {
child.setAttribute("type", "wrap");
}
}
this.registerBuildArea(CustomizableUI.AREA_PANEL, aPanel);
@ -705,7 +709,9 @@ let CustomizableUIInternal = {
container.removeChild(widgetNode);
} else {
widgetNode.removeAttribute("tabindex");
widgetNode.removeAttribute("wrap");
if (widgetNode.getAttribute("type") == "wrap") {
widgetNode.removeAttribute("type");
}
areaNode.toolbox.palette.appendChild(widgetNode);
}
this.notifyListeners("onWidgetAfterDOMChange", widgetNode, null, container, true);
@ -855,7 +861,9 @@ let CustomizableUIInternal = {
this.ensureButtonContextMenu(widgetNode, aAreaNode);
if (widgetNode.localName == "toolbarbutton" && areaId == CustomizableUI.AREA_PANEL) {
widgetNode.setAttribute("tabindex", "0");
widgetNode.setAttribute("wrap", "true");
if (!widgetNode.hasAttribute("type")) {
widgetNode.setAttribute("type", "wrap");
}
}
}

2
browser/components/downloads/content/download.xml
View File

@ -114,8 +114,6 @@
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
<xul:label class="toolbarbutton-text" crop="right" flex="1"
xbl:inherits="value=label,accesskey,crop"/>
<xul:label class="toolbarbutton-multiline-text" flex="1"
xbl:inherits="xbl:text=label,accesskey"/>
</content>
</binding>
</bindings>

17
browser/themes/shared/customizableui/panelUIOverlay.inc.css
View File

@ -65,20 +65,15 @@
padding: .5em 0;
}
.panelUI-grid .panel-combined-button > .toolbarbutton-text,
.widget-overflow-list .toolbarbutton-menubutton-button > .toolbarbutton-text,
.widget-overflow-list .toolbarbutton-1 > .toolbarbutton-text {
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-text,
#bookmarks-menu-button > toolbarbutton > .toolbarbutton-text,
:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbarpaletteitem > toolbaritem > toolbarbutton > .toolbarbutton-text,
:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbaritem > toolbarbutton > .toolbarbutton-text,
:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbarpaletteitem > toolbarbutton > .toolbarbutton-text,
:-moz-any(#PanelUI-contents,#widget-overflow-list) > toolbarbutton > .toolbarbutton-text {
font-size: 10px;
}
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-multiline-text,
.panelUI-grid .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
font-size: 10px;
margin: 2px 0 0;
text-align: center;
}
#wrapper-edit-controls:-moz-any([place="palette"],[place="panel"]) > #edit-controls,
#wrapper-zoom-controls:-moz-any([place="palette"],[place="panel"]) > #zoom-controls {
-moz-margin-start: 0;

21
toolkit/content/widgets/toolbarbutton.xml
View File

@ -20,8 +20,6 @@
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
<xul:label class="toolbarbutton-text" crop="right" flex="1"
xbl:inherits="value=label,accesskey,crop"/>
<xul:label class="toolbarbutton-multiline-text" flex="1"
xbl:inherits="xbl:text=label,accesskey"/>
</content>
</binding>
@ -32,8 +30,6 @@
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label,type"/>
<xul:label class="toolbarbutton-text" crop="right" flex="1"
xbl:inherits="value=label,accesskey,crop,dragover-top"/>
<xul:label class="toolbarbutton-multiline-text" flex="1"
xbl:inherits="xbl:text=label,accesskey"/>
<xul:dropmarker type="menu" class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label"/>
</content>
</binding>
@ -46,9 +42,7 @@
<xul:vbox flex="1" align="center">
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
<xul:label class="toolbarbutton-text" crop="right" flex="1"
xbl:inherits="value=label,accesskey,crop,dragover-top"/>
<xul:label class="toolbarbutton-multiline-text" flex="1"
xbl:inherits="xbl:text=label,accesskey"/>
xbl:inherits="value=label,accesskey,crop,dragover-top"/>
</xul:vbox>
<xul:dropmarker type="menu" class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label"/>
</xul:hbox>
@ -65,7 +59,7 @@
<children includes="observes|template|menupopup|panel|tooltip"/>
<xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
anonid="button" flex="1" allowevents="true"
xbl:inherits="disabled,crop,image,label,accesskey,command,wrap,
xbl:inherits="disabled,crop,image,label,accesskey,command,
align,dir,pack,orient,tooltiptext=buttontooltiptext"/>
<xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
xbl:inherits="align,dir,pack,orient,disabled,label,open"/>
@ -78,4 +72,15 @@
<xul:image class="toolbarbutton-icon" xbl:inherits="src=image"/>
</content>
</binding>
<binding id="toolbarbutton-wrapping-label"
extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
<content>
<children includes="observes|template|menupopup|panel|tooltip"/>
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
<xul:label class="toolbarbutton-text toolbarbutton-label" flex="1"
xbl:inherits="xbl:text=label,accesskey"/>
</content>
</binding>
</bindings>

6
toolkit/content/xul.css
View File

@ -157,6 +157,10 @@ toolbarbutton[type="menu-button"] {
-moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
}
toolbarbutton[type="wrap"] {
-moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-wrapping-label");
}
toolbar[mode="icons"] .toolbarbutton-text,
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
@ -690,7 +694,7 @@ label.text-link, label[onclick] {
-moz-user-focus: normal;
}
label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-multiline-text {
label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-label {
-moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
}

12
toolkit/themes/linux/global/toolbarbutton.css
View File

@ -33,18 +33,6 @@ toolbarbutton:-moz-lwtheme {
text-align: center;
}
.toolbarbutton-multiline-text {
display: none;
}
toolbarbutton[wrap="true"] > .toolbarbutton-text {
display: none;
}
toolbarbutton[wrap="true"] > .toolbarbutton-multiline-text {
display: -moz-box;
}
toolbarbutton.tabbable {
-moz-user-focus: normal !important;
}

12
toolkit/themes/osx/global/toolbarbutton.css
View File

@ -27,18 +27,6 @@ toolbarbutton:not([disabled="true"]):active:hover {
vertical-align: middle;
}
.toolbarbutton-multiline-text {
display: none;
}
toolbarbutton[wrap="true"] > .toolbarbutton-text {
display: none;
}
toolbarbutton[wrap="true"] > .toolbarbutton-multiline-text {
display: -moz-box;
}
toolbarbutton[disabled="true"],
toolbarbutton[disabled="true"]:hover,
toolbarbutton[disabled="true"]:hover:active,

12
toolkit/themes/windows/global/toolbarbutton.css
View File

@ -31,18 +31,6 @@ toolbarbutton {
text-align: center;
}
.toolbarbutton-multiline-text {
display: none;
}
toolbarbutton[wrap="true"] > .toolbarbutton-text {
display: none;
}
toolbarbutton[wrap="true"] > .toolbarbutton-multiline-text {
display: -moz-box;
}
toolbarbutton.tabbable {
-moz-user-focus: normal !important;
}