зеркало из https://github.com/mozilla/gecko-dev.git
fix for b53137, classic dual menubuttons don't click down anymore. Remove the hacks
that I put in place to compensate for incorrect :hover behaviour. r=ianh, a=hyatt
This commit is contained in:
ben%netscape.com
Родитель
114655d1b7
Коммит
74af64f5a1
|
|
@ -60,33 +60,7 @@
|
|||
color : graytext;
|
||||
}
|
||||
|
||||
/* 2) menubutton gets black border */
|
||||
.menubutton-dual.toolbar[buttonover="true"]
|
||||
{
|
||||
border : 1px solid threeddarkshadow;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar[buttonover="true"][disabled="true"]
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar[disabled="true"]:hover > .menubutton-dual-ex-button,
|
||||
.menubutton-dual.toolbar[disabled="true"][buttonover="true"] > .menubutton-dual-ex-button
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
}
|
||||
|
||||
/* 3) dropmarker gets outset border */
|
||||
.menubutton-dual.toolbar[buttonover="true"] > .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border-left : 1px solid threedhighlight;
|
||||
border-top : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedshadow;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar[buttonover="true"][disabled="true"] > .menubutton-dual-dropmarker-box
|
||||
.menubutton-dual.toolbar[disabled="true"]:hover > .menubutton-dual-ex-button
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
}
|
||||
|
|
@ -96,36 +70,20 @@
|
|||
/* 1). button gets inset border */
|
||||
.menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
border-left : 1px solid threedshadow;
|
||||
border-top : 1px solid threedshadow;
|
||||
border-right : 1px solid threedhighlight;
|
||||
border-bottom : 1px solid threedhighlight;
|
||||
border-left : 1px solid threedshadow !important;
|
||||
border-top : 1px solid threedshadow !important;
|
||||
border-right : 1px solid threedhighlight !important;
|
||||
border-bottom : 1px solid threedhighlight !important;
|
||||
padding : 3px 6px 1px 7px;
|
||||
color : #000080;
|
||||
color : #000080 !important;
|
||||
}
|
||||
|
||||
.menubutton-dual-ex-button[disabled="true"]:hover:active
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
border : 1px solid transparent !important;
|
||||
padding : 2px 7px 2px 6px;
|
||||
}
|
||||
|
||||
/* 2). dropmarker gets inset border */
|
||||
.menubutton-dual.toolbar[buttondown="true"] > .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border-left : 1px solid threedshadow;
|
||||
border-top : 1px solid threedshadow;
|
||||
border-right : 1px solid threedhighlight;
|
||||
border-bottom : 1px solid threedhighlight;
|
||||
padding : 2px 0px 0px 0px;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar[buttondown="true"][disabled="true"] > .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
padding : 0px
|
||||
}
|
||||
|
||||
/* ACTION: mouse over the menu */
|
||||
|
||||
/* 1). menubutton gets black border */
|
||||
|
|
@ -191,108 +149,6 @@
|
|||
padding : 2px 0px 0px 0px;
|
||||
}
|
||||
|
||||
/*
|
||||
.menubutton-dual.toolbar.top
|
||||
{
|
||||
-moz-binding : url("chrome://global/content/menulistBindings.xml#menubutton-dual-top");
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar.top > .menubutton-internal-box > .menubutton-dual-button
|
||||
{
|
||||
-moz-binding : url("chrome://global/skin/classicBindings.xml#toolbarbutton-top");
|
||||
background-color : none;
|
||||
min-width : 47px;
|
||||
margin : 0px;
|
||||
border : 1px solid transparent;
|
||||
-moz-user-focus : ignore;
|
||||
padding : 2px 3px 2px 3px;
|
||||
text-align : center;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar:hover > .menubutton-internal-box > .menubutton-dual-button,
|
||||
.menubutton-dual.toolbar > .menubutton-internal-box > .menubutton-dual-button:hover
|
||||
{
|
||||
border-left : 1px solid threedhighlight;
|
||||
border-top : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedshadow;
|
||||
color : #0000FF;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar > .menubutton-internal-box > .menubutton-dual-button:hover:active
|
||||
{
|
||||
border-left : 1px solid threedshadow;
|
||||
border-top : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedhighlight;
|
||||
padding : 3px 2px 1px 4px;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar:hover > .menubutton-internal-box > .menubutton-dual-button[disabled="true"],
|
||||
.menubutton-dual.toolbar:hover[disabled="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
|
||||
.menubutton-dual.toolbar:hover:active[disabled="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
|
||||
.menubutton-dual.toolbar[open="true"][disabled="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
|
||||
.menubutton-dual-button:hover[disabled="true"] + .menubutton-dual-dropmarker-box,
|
||||
.menubutton-dual-button:hover:active[disabled="true"] + .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
color : graytext;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar:hover > .menubutton-internal-box > .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border-left : 1px solid threedhighlight;
|
||||
border-top : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedshadow;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar:hover:active > .menubutton-internal-box > .menubutton-dual-dropmarker-box,
|
||||
.menubutton-dual.toolbar[open="true"] > .menubutton-internal-box > .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border-left : 1px solid threedshadow;
|
||||
border-top : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedhighlight;
|
||||
padding : 1px 1px 0px 3px;
|
||||
}
|
||||
|
||||
.menubutton-dual.toolbar > .menubutton-internal-box > .menubutton-dual-button:hover + .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border-left : 1px solid threedhighlight;
|
||||
border-top : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedshadow;
|
||||
}
|
||||
|
||||
.menubutton-dual-button:hover:active + .menubutton-dual-dropmarker-box
|
||||
{
|
||||
border-left : 1px solid threedshadow;
|
||||
border-top : 1px solid threedshadow;
|
||||
border-bottom : 1px solid threedhighlight;
|
||||
border-right : 1px solid threedhighlight;
|
||||
padding : 1px 1px 0px 3px;
|
||||
}
|
||||
|
||||
.menubutton-dual-dropmarker-box
|
||||
{
|
||||
border : 1px solid transparent;
|
||||
padding : 0px 2px 0px 2px;
|
||||
}
|
||||
|
||||
.menubutton-dropmarker
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/dropmarker-down-on.gif");
|
||||
}
|
||||
|
||||
.menubutton-dropmarker[disabled="true"]
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/dropmarker-down-disabled.gif");
|
||||
}
|
||||
|
||||
|
||||
*/
|
||||
|
||||
/** menubuttons on generic grey toolbars
|
||||
* class="button-toolbar"
|
||||
**/
|
||||
|
|
|
|||
|
|
@ -93,15 +93,12 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
#back-button[disabled="true"]:hover,
|
||||
#back-button[disabled="true"]:hover:active,
|
||||
#back-button[disabled="true"] > .menubutton-dual-ex-button:hover,
|
||||
#back-button[disabled="true"] > .menubutton-dual-ex-button:hover:active,
|
||||
#back-button[disabled="true"] > .classic-simplebutton-box > .classic-simplebutton:hover,
|
||||
#back-button[disabled="true"] > .classic-simplebutton-box > .classic-simplebutton:hover:active
|
||||
#back-button[disabled="true"] > .menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
list-style-image : url("chrome://navigator/skin/back-disabled.gif");
|
||||
}
|
||||
|
||||
#back-button:hover,
|
||||
#back-button > .classic-simplebutton-box > .classic-simplebutton:hover,
|
||||
#back-button > .menubutton-dual-ex-button:hover,
|
||||
#back-button[open="true"] > .menubutton-dual-ex-button
|
||||
{
|
||||
|
|
@ -109,8 +106,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
}
|
||||
|
||||
#back-button:hover:active,
|
||||
#back-button > .menubutton-dual-ex-button:hover:active,
|
||||
#back-button > .classic-simplebutton-box > .classic-simplebutton:hover:active
|
||||
#back-button > .menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
list-style-image : url("chrome://navigator/skin/back-hover-active.gif");
|
||||
}
|
||||
|
|
@ -124,15 +120,12 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
#forward-button[disabled="true"]:hover,
|
||||
#forward-button[disabled="true"]:hover:active,
|
||||
#forward-button[disabled="true"] > .menubutton-dual-ex-button:hover,
|
||||
#forward-button[disabled="true"] > .menubutton-dual-ex-button:hover:active,
|
||||
#forward-button[disabled="true"] > .classic-simplebutton-box > .classic-simplebutton:hover,
|
||||
#forward-button[disabled="true"] > .classic-simplebutton-box > .classic-simplebutton:hover:active
|
||||
#forward-button[disabled="true"] > .menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
list-style-image : url("chrome://navigator/skin/forward-disabled.gif");
|
||||
}
|
||||
|
||||
#forward-button:hover,
|
||||
#forward-button > .classic-simplebutton-box > .classic-simplebutton:hover,
|
||||
#forward-button > .menubutton-dual-ex-button:hover,
|
||||
#forward-button[open="true"] > .menubutton-dual-ex-button
|
||||
{
|
||||
|
|
@ -140,8 +133,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
}
|
||||
|
||||
#forward-button:hover:active,
|
||||
#forward-button > .menubutton-dual-ex-button:hover:active,
|
||||
#forward-button > .classic-simplebutton-box > .classic-simplebutton:hover:active
|
||||
#forward-button > .menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
list-style-image : url("chrome://navigator/skin/forward-hover-active.gif");
|
||||
}
|
||||
|
|
@ -258,18 +250,23 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
}
|
||||
|
||||
#print-button[disabled="true"],
|
||||
#print-button[disabled="true"][buttonover="true"],
|
||||
#print-button[disabled="true"][buttondown="true"]
|
||||
#print-button[disabled="true"]:hover,
|
||||
#print-button[disabled="true"]:hover:active,
|
||||
#print-button[disabled="true"] > .menubutton-dual-ex-button:hover,
|
||||
#print-button[disabled="true"] > .menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/print-disabled.gif");
|
||||
}
|
||||
|
||||
#print-button[buttonover="true"]
|
||||
#print-button:hover,
|
||||
#print-button > .menubutton-dual-ex-button:hover,
|
||||
#print-button[open="true"] > .menubutton-dual-ex-button
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/print-hover.gif");
|
||||
}
|
||||
|
||||
#print-button[buttondown="true"]
|
||||
#print-button:hover:active,
|
||||
#print-button > .menubutton-dual-ex-button:hover:active
|
||||
{
|
||||
list-style-image : url("chrome://global/skin/print-hover-active.gif");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<binding id="menubutton-single-right">
|
||||
<content includes="menupopup">
|
||||
<xul:box class="menubutton-internal-box" autostretch="never">
|
||||
<xul:text class="menubutton-single-text" inherits="value,crop,accesskey"/>
|
||||
<xul:text class="menubutton-single-text" inherits="value,crop,accesskey,disabled"/>
|
||||
<xul:image class="menubutton-single-icon"/>
|
||||
</xul:box>
|
||||
</content>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
<content includes="menupopup">
|
||||
<xul:box class="menubutton-internal-box" autostretch="never">
|
||||
<xul:image class="menubutton-single-icon"/>
|
||||
<xul:text class="menubutton-single-text" inherits="value,crop,accesskey"/>
|
||||
<xul:text class="menubutton-single-text" inherits="value,crop,accesskey,disabled"/>
|
||||
</xul:box>
|
||||
</content>
|
||||
</binding>
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
<content includes="menupopup">
|
||||
<xul:box class="menubutton-internal-box">
|
||||
<xul:button class="menubutton-dual-button top" allowevents="true"
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
|
||||
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
|
||||
<xul:image class="menubutton-dropmarker"/>
|
||||
</xul:box>
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
<content includes="menupopup">
|
||||
<xul:box class="menubutton-internal-box">
|
||||
<xul:button class="menubutton-dual-button left" allowevents="true"
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
|
||||
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
|
||||
<xul:image class="menubutton-dropmarker"/>
|
||||
</xul:box>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<content includes="menupopup">
|
||||
<xul:box class="menubutton-internal-box">
|
||||
<xul:button class="menubutton-dual-button right" allowevents="true"
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
|
||||
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
|
||||
<xul:image class="menubutton-dropmarker"/>
|
||||
</xul:box>
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
<content includes="menupopup">
|
||||
<xul:box class="menubutton-internal-box">
|
||||
<xul:button class="menubutton-dual-button bottom" allowevents="true"
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
|
||||
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
|
||||
<xul:image class="menubutton-dropmarker"/>
|
||||
</xul:box>
|
||||
|
|
@ -128,60 +128,30 @@
|
|||
<binding id="menubutton-dual-ex" extends="chrome://global/content/menulistBindings.xml#menubutton-dual-top">
|
||||
<content includes="menupopup">
|
||||
<xul:button class="menubutton-dual-ex-button top" allowevents="true"
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"
|
||||
onmouseover="this.parentNode.buttonover = true;"
|
||||
onmouseout="this.parentNode.buttonover = false;"
|
||||
onmousedown="this.parentNode.buttondown = true;"
|
||||
onmouseup="this.parentNode.buttondown = false;"/>
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
|
||||
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" inherits="disabled">
|
||||
<xul:image class="menubutton-dropmarker" inherits="disabled"/>
|
||||
</xul:box>
|
||||
</content>
|
||||
<implementation>
|
||||
<property name="buttonover">
|
||||
<getter>
|
||||
return this.getAttribute("buttonover");
|
||||
</getter>
|
||||
<setter>
|
||||
<![CDATA[
|
||||
if (!val && this.getAttribute("buttondown") == "true") {
|
||||
this.removeAttribute("buttondown");
|
||||
this._pendingActive = true;
|
||||
}
|
||||
else {
|
||||
if (this._pendingActive && this._buttonIsDown) {
|
||||
this.setAttribute("buttondown", "true");
|
||||
this._pendingActive = false;
|
||||
this._buttonIsDown = false;
|
||||
}
|
||||
}
|
||||
this.setAttribute("buttonover", val);
|
||||
return val;
|
||||
]]>
|
||||
</setter>
|
||||
</property>
|
||||
<property name="buttondown">
|
||||
<getter>
|
||||
return this.getAttribute("buttondown");
|
||||
</getter>
|
||||
<setter>
|
||||
if (val) this._buttonIsDown = true;
|
||||
this.setAttribute("buttondown", val);
|
||||
return val;
|
||||
</setter>
|
||||
</property>
|
||||
<property name="_pendingActive">false</property>
|
||||
<property name="_buttonIsDown">false</property>
|
||||
</implementation>
|
||||
</binding>
|
||||
|
||||
<binding id="menubutton-dual-ex-left" extends="chrome://global/content/menulistBindings.xml#menubutton-dual-ex">
|
||||
<content excludes="template,observes,menupopup">
|
||||
<xul:button class="menubutton-dual-ex-button left" allowevents="true"
|
||||
inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
|
||||
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" inherits="disabled">
|
||||
<xul:image class="menubutton-dropmarker" inherits="disabled"/>
|
||||
</xul:box>
|
||||
</content>
|
||||
</binding>
|
||||
|
||||
<!--
|
||||
BINDING : menubutton-item
|
||||
XUL REPRESENTATION : menuitem
|
||||
-->
|
||||
<binding id="menubutton-item">
|
||||
<content autostretch="never" includes="menupopup">
|
||||
<xul:text class="menubutton-text" flex="1" inherits="value,accesskey,crop" crop="right"/>
|
||||
<xul:text class="menubutton-text" flex="1" inherits="value,accesskey,crop,disabled" crop="right"/>
|
||||
</content>
|
||||
</binding>
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче