Skip to content
This repository was archived by the owner on Aug 29, 2019. It is now read-only.

Commit f9a3e4b

Browse files
committed
Merge remote-tracking branch 'yfdyh000/fix-878020' into dev
Merge pull request ithinc#110.
2 parents 760f405 + cb70a86 commit f9a3e4b

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

chrome/content/tabutils.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,27 @@
4444
</xul:toolbarbutton>
4545
</xul:hbox>
4646
</xul:hbox>
47-
<xul:toolbarbutton class="scrollbutton-up" collapsed="true"
48-
xbl:inherits="orient"
47+
<xul:toolbarbutton class="scrollbutton-up"
48+
xbl:inherits="orient,collapsed=notoverflowing,disabled=scrolledtostart"
4949
anonid="scrollbutton-up"
5050
onclick="_distanceScroll(event);"
5151
onmousedown="if (event.button == 0) _startScroll(-1);"
5252
onmouseup="if (event.button == 0) _stopScroll();"
5353
onmouseover="_continueScroll(-1);"
5454
onmouseout="_pauseScroll();"
5555
chromedir="&locale.dir;"/>
56+
<xul:spacer class="arrowscrollbox-overflow-start-indicator"
57+
xbl:inherits="collapsed=scrolledtostart"/>
5658
<xul:scrollbox class="arrowscrollbox-scrollbox"
5759
anonid="scrollbox"
5860
flex="1"
5961
xbl:inherits="orient,align,pack,dir">
6062
<children/>
6163
</xul:scrollbox>
62-
<xul:toolbarbutton class="scrollbutton-down" collapsed="true"
63-
xbl:inherits="orient"
64+
<xul:spacer class="arrowscrollbox-overflow-end-indicator"
65+
xbl:inherits="collapsed=scrolledtoend"/>
66+
<xul:toolbarbutton class="scrollbutton-down"
67+
xbl:inherits="orient,collapsed=notoverflowing,disabled=scrolledtoend"
6468
anonid="scrollbutton-down"
6569
onclick="_distanceScroll(event);"
6670
onmousedown="if (event.button == 0) _startScroll(1);"
@@ -73,6 +77,9 @@
7377
<implementation>
7478
<constructor>
7579
<![CDATA[
80+
this.setAttribute("notoverflowing", "true");
81+
this._updateScrollButtonsDisabledState();
82+
7683
PinnedTabsBar = TU_hookFunc(PlacesToolbar,
7784
["PlacesToolbar", "PinnedTabsBar", "g"],
7885
["PlacesChevron", "PinnedTabsBarChevron", "g"]

0 commit comments

Comments
 (0)