wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout 5e4eaa3891be due to b-c failures in browser_removeTabsToTheEnd.js

Browse Source
This commit is contained in:
Matthew Noorenberghe 2014-04-06 15:29:25 -07:00
parent 3539331a31
commit 94b8202afa
7 changed files with 6 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/themes/linux/jar.mn
View File

@ -158,7 +158,6 @@ browser.jar:
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
skin/classic/browser/tabbrowser/tab-overflow-shadow.png (../shared/tabbrowser/tab-overflow-shadow.png)
# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
# Makefile.in with a non-default marker of "%" and the result of that gets packaged.

2
browser/themes/osx/jar.mn
View File

@ -268,8 +268,6 @@ browser.jar:
skin/classic/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png)
skin/classic/browser/tabbrowser/tab-overflow-shadow.png (../shared/tabbrowser/tab-overflow-shadow.png)
skin/classic/browser/tabbrowser/tab-overflow-shadow@2x.png (tabbrowser/tab-overflow-shadow@2x.png)
# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
# Makefile.in with a non-default marker of "%" and the result of that gets packaged.

BIN
browser/themes/osx/tabbrowser/tab-overflow-shadow@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 462 B

BIN
browser/themes/shared/tabbrowser/tab-overflow-shadow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 253 B

61
browser/themes/shared/tabs.inc.css
View File

@ -4,11 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%endif
%ifdef XP_WIN
%define tabbrowserScrollbuttonWidth 22px
%else
%define tabbrowserScrollbuttonWidth 23px
%endif
%define tabHeight 31px
%define tabCurveWidth 30px
%define tabCurveHalfWidth 15px
@ -118,62 +113,6 @@
-moz-padding-start: @tabCurveHalfWidth@;
}
/* Tab Overflow */
.tabbrowser-arrowscrollbox[overflow=true] {
position: relative;
}
.tabbrowser-arrowscrollbox[overflow=true]::before,
.tabbrowser-arrowscrollbox[overflow=true]::after {
background-image: url(chrome://browser/skin/tabbrowser/tab-overflow-shadow.png);
background-repeat: no-repeat;
background-size: auto 100%;
content: "";
display: -moz-box;
height: calc(100% - @tabToolbarNavbarOverlap@);
pointer-events: none;
position: absolute;
width: 12px;
/* Make sure the shadow isn't hidden behind the tabs */
z-index: 3;
}
%ifdef XP_MACOSX
@media (min-resolution: 2dppx) {
.tabbrowser-arrowscrollbox[overflow=true]::before,
.tabbrowser-arrowscrollbox[overflow=true]::after {
background-image: url(chrome://browser/skin/tabbrowser/tab-overflow-shadow@2x.png);
}
}
%endif
.scrollbutton-up > .toolbarbutton-icon,
.scrollbutton-down > .toolbarbutton-icon,
.tabbrowser-arrowscrollbox[overflow=true]::before,
.tabbrowser-arrowscrollbox[overflow=true]::after {
transition: opacity 150ms ease;
}
.tabbrowser-arrowscrollbox[overflow=true][scrollbutton-up-disabled=true]:-moz-locale-dir(ltr)::before,
.tabbrowser-arrowscrollbox[overflow=true][scrollbutton-down-disabled=true]:-moz-locale-dir(ltr)::after,
.tabbrowser-arrowscrollbox[overflow=true][scrollbutton-down-disabled=true]:-moz-locale-dir(rtl)::before,
.tabbrowser-arrowscrollbox[overflow=true][scrollbutton-up-disabled=true]:-moz-locale-dir(rtl)::after {
opacity: 0;
}
.tabbrowser-arrowscrollbox[overflow=true]::before {
left: 0;
/* Offset the shadow by the width of the scrollbutton so it's on the inside of the buttons. */
margin-left: @tabbrowserScrollbuttonWidth@;
}
.tabbrowser-arrowscrollbox[overflow=true]::after {
right: 0;
/* Offset the shadow by the width of the scrollbutton so it's on the inside of the buttons. */
margin-right: @tabbrowserScrollbuttonWidth@;
transform: scaleX(-1);
}
.tab-background-start[selected=true]::after,
.tab-background-start[selected=true]::before,
.tab-background-start,

2
browser/themes/windows/jar.mn
View File

@ -187,7 +187,6 @@ browser.jar:
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png)
skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
skin/classic/browser/tabbrowser/tab-overflow-shadow.png (../shared/tabbrowser/tab-overflow-shadow.png)
# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
# Makefile.in with a non-default marker of "%" and the result of that gets packaged.
@ -537,7 +536,6 @@ browser.jar:
skin/classic/aero/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/aero/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png)
skin/classic/aero/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
skin/classic/aero/browser/tabbrowser/tab-overflow-shadow.png (../shared/tabbrowser/tab-overflow-shadow.png)
# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
# Makefile.in with a non-default marker of "%" and the result of that gets packaged.

41
toolkit/content/widgets/scrollbox.xml
View File

@ -28,7 +28,7 @@
<xul:autorepeatbutton class="autorepeatbutton-up"
anonid="scrollbutton-up"
collapsed="true"
xbl:inherits="orient,disabled=scrollbutton-up-disabled"
xbl:inherits="orient"
oncommand="_autorepeatbuttonScroll(event);"/>
<xul:scrollbox class="arrowscrollbox-scrollbox"
anonid="scrollbox"
@ -39,7 +39,7 @@
<xul:autorepeatbutton class="autorepeatbutton-down"
anonid="scrollbutton-down"
collapsed="true"
xbl:inherits="orient,disabled=scrollbutton-down-disabled"
xbl:inherits="orient"
oncommand="_autorepeatbuttonScroll(event);"/>
</content>
@ -184,31 +184,6 @@
]]></getter>
</property>
<property name="_scrollButtonDownDisabled">
<getter><![CDATA[
return this.getAttribute("scrollbutton-down-disabled") == "true";
]]></getter>
<setter><![CDATA[
if (val) {
this.setAttribute("scrollbutton-down-disabled", "true");
} else {
this.removeAttribute("scrollbutton-down-disabled");
}
]]></setter>
</property>
<property name="_scrollButtonUpDisabled">
<getter><![CDATA[
return this.getAttribute("scrollbutton-up-disabled") == "true";
]]></getter>
<setter><![CDATA[
if (val) {
this.setAttribute("scrollbutton-up-disabled", "true");
} else {
this.removeAttribute("scrollbutton-up-disabled");
}
]]></setter>
</property>
<field name="_isRTLScrollbox"><![CDATA[
this.orient != "vertical" &&
document.defaultView.getComputedStyle(this._scrollbox, "").direction == "rtl";
@ -499,8 +474,8 @@
disableDownButton = true;
}
this._scrollButtonUpDisabled = disableUpButton;
this._scrollButtonDownDisabled = disableDownButton;
this._scrollButtonUp.disabled = disableUpButton;
this._scrollButtonDown.disabled = disableDownButton;
]]></body>
</method>
</implementation>
@ -560,8 +535,6 @@
return;
}
this.removeAttribute("overflow");
this._scrollButtonUp.collapsed = true;
this._scrollButtonDown.collapsed = true;
try {
@ -596,8 +569,6 @@
return;
}
this.setAttribute("overflow", "true");
this._scrollButtonUp.collapsed = false;
this._scrollButtonDown.collapsed = false;
try {
@ -628,7 +599,7 @@
<binding id="arrowscrollbox-clicktoscroll" extends="chrome://global/content/bindings/scrollbox.xml#arrowscrollbox">
<content>
<xul:toolbarbutton class="scrollbutton-up" collapsed="true"
xbl:inherits="orient,disabled=scrollbutton-up-disabled"
xbl:inherits="orient"
anonid="scrollbutton-up"
onclick="_distanceScroll(event);"
onmousedown="if (event.button == 0) _startScroll(-1);"
@ -642,7 +613,7 @@
<children/>
</xul:scrollbox>
<xul:toolbarbutton class="scrollbutton-down" collapsed="true"
xbl:inherits="orient,disabled=scrollbutton-down-disabled"
xbl:inherits="orient"
anonid="scrollbutton-down"
onclick="_distanceScroll(event);"
onmousedown="if (event.button == 0) _startScroll(1);"