mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 944947 - label truncation is not fully supported in Australis menu widgets, r=MattN
This commit is contained in:
parent
164c380fef
commit
ae9b1f5fae
@ -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"/>
|
||||
<vbox id="PanelUI-contents" class="panelUI-grid"/>
|
||||
</vbox>
|
||||
|
||||
<footer id="PanelUI-footer">
|
||||
@ -178,6 +178,6 @@
|
||||
level="top"
|
||||
hidden="true">
|
||||
<vbox id="widget-overflow-scroller">
|
||||
<vbox id="widget-overflow-list"/>
|
||||
<vbox id="widget-overflow-list" class="widget-overflow-list"/>
|
||||
</vbox>
|
||||
</panel>
|
||||
|
@ -479,9 +479,7 @@ let CustomizableUIInternal = {
|
||||
this.ensureButtonContextMenu(node, aAreaNode);
|
||||
if (node.localName == "toolbarbutton" && aArea == CustomizableUI.AREA_PANEL) {
|
||||
node.setAttribute("tabindex", "0");
|
||||
if (!node.hasAttribute("type")) {
|
||||
node.setAttribute("type", "wrap");
|
||||
}
|
||||
node.setAttribute("wrap", "true");
|
||||
}
|
||||
|
||||
this.insertWidgetBefore(node, currentNode, container, aArea);
|
||||
@ -658,9 +656,7 @@ let CustomizableUIInternal = {
|
||||
}
|
||||
this.ensureButtonContextMenu(child, aPanel);
|
||||
child.setAttribute("tabindex", "0");
|
||||
if (!child.hasAttribute("type")) {
|
||||
child.setAttribute("type", "wrap");
|
||||
}
|
||||
child.setAttribute("wrap", "true");
|
||||
}
|
||||
|
||||
this.registerBuildArea(CustomizableUI.AREA_PANEL, aPanel);
|
||||
@ -709,9 +705,7 @@ let CustomizableUIInternal = {
|
||||
container.removeChild(widgetNode);
|
||||
} else {
|
||||
widgetNode.removeAttribute("tabindex");
|
||||
if (widgetNode.getAttribute("type") == "wrap") {
|
||||
widgetNode.removeAttribute("type");
|
||||
}
|
||||
widgetNode.removeAttribute("wrap");
|
||||
areaNode.toolbox.palette.appendChild(widgetNode);
|
||||
}
|
||||
this.notifyListeners("onWidgetAfterDOMChange", widgetNode, null, container, true);
|
||||
@ -861,9 +855,7 @@ let CustomizableUIInternal = {
|
||||
this.ensureButtonContextMenu(widgetNode, aAreaNode);
|
||||
if (widgetNode.localName == "toolbarbutton" && areaId == CustomizableUI.AREA_PANEL) {
|
||||
widgetNode.setAttribute("tabindex", "0");
|
||||
if (!widgetNode.hasAttribute("type")) {
|
||||
widgetNode.setAttribute("type", "wrap");
|
||||
}
|
||||
widgetNode.setAttribute("wrap", "true");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -114,6 +114,8 @@
|
||||
<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>
|
||||
|
@ -65,15 +65,20 @@
|
||||
padding: .5em 0;
|
||||
}
|
||||
|
||||
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 {
|
||||
.panelUI-grid .panel-combined-button > .toolbarbutton-text,
|
||||
.widget-overflow-list .toolbarbutton-menubutton-button > .toolbarbutton-text,
|
||||
.widget-overflow-list .toolbarbutton-1 > .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;
|
||||
|
@ -20,6 +20,8 @@
|
||||
<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>
|
||||
|
||||
@ -30,6 +32,8 @@
|
||||
<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>
|
||||
@ -42,7 +46,9 @@
|
||||
<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"/>
|
||||
xbl:inherits="value=label,accesskey,crop,dragover-top"/>
|
||||
<xul:label class="toolbarbutton-multiline-text" flex="1"
|
||||
xbl:inherits="xbl:text=label,accesskey"/>
|
||||
</xul:vbox>
|
||||
<xul:dropmarker type="menu" class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label"/>
|
||||
</xul:hbox>
|
||||
@ -59,7 +65,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,
|
||||
xbl:inherits="disabled,crop,image,label,accesskey,command,wrap,
|
||||
align,dir,pack,orient,tooltiptext=buttontooltiptext"/>
|
||||
<xul:dropmarker type="menu-button" class="toolbarbutton-menubutton-dropmarker"
|
||||
xbl:inherits="align,dir,pack,orient,disabled,label,open"/>
|
||||
@ -72,15 +78,4 @@
|
||||
<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>
|
||||
|
@ -157,10 +157,6 @@ 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;
|
||||
@ -694,7 +690,7 @@ label.text-link, label[onclick] {
|
||||
-moz-user-focus: normal;
|
||||
}
|
||||
|
||||
label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-label {
|
||||
label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-multiline-text {
|
||||
-moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
|
||||
}
|
||||
|
||||
|
@ -33,6 +33,18 @@ 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;
|
||||
}
|
||||
|
@ -27,6 +27,18 @@ 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,
|
||||
|
@ -31,6 +31,18 @@ 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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user