mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 357081: tab bar doesn't resume scrolling when moving off button and back 

on while holding mouse button. p=Dao Gottwald <dao@design-noir.de>
r=enndeakin
This commit is contained in:
dtownsend%oxymoronical.com 2007-08-26 00:37:18 +00:00
Родитель 2887e25baf
Коммит c0d1899216
2 изменённых файлов: 42 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
browser/base/content/tabbrowser.xml
Просмотреть файл

@ -2501,8 +2501,9 @@
xbl:inherits="orient" xbl:inherits="orient"
anonid="scrollbutton-up" anonid="scrollbutton-up"
onmousedown="_startScroll(-1);" onmousedown="_startScroll(-1);"
onmouseover="_continueScroll(-1);"
onmouseup="_stopScroll();" onmouseup="_stopScroll();"
onmouseout="_stopScroll();" onmouseout="_pauseScroll();"
chromedir="&locale.dir;"/> chromedir="&locale.dir;"/>
<xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox"> <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
<children/> <children/>
@ -2516,8 +2517,9 @@
xbl:inherits="orient" xbl:inherits="orient"
anonid="scrollbutton-down" anonid="scrollbutton-down"
onmousedown="_startScroll(1);" onmousedown="_startScroll(1);"
onmouseover="_continueScroll(1);"
onmouseup="_stopScroll();" onmouseup="_stopScroll();"
onmouseout="_stopScroll();" onmouseout="_pauseScroll();"
chromedir="&locale.dir;"/> chromedir="&locale.dir;"/>
</xul:stack> </xul:stack>
</content> </content>

42
toolkit/content/widgets/scrollbox.xml
Просмотреть файл

@ -414,8 +414,9 @@
xbl:inherits="orient" xbl:inherits="orient"
anonid="scrollbutton-up" anonid="scrollbutton-up"
onmousedown="_startScroll(-1);" onmousedown="_startScroll(-1);"
onmouseover="_continueScroll(-1);"
onmouseup="_stopScroll();" onmouseup="_stopScroll();"
onmouseout="_stopScroll();" onmouseout="_pauseScroll();"
chromedir="&locale.dir;"/> chromedir="&locale.dir;"/>
<xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox"> <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
<children/> <children/>
@ -424,11 +425,12 @@
xbl:inherits="orient" xbl:inherits="orient"
anonid="scrollbutton-down" anonid="scrollbutton-down"
onmousedown="_startScroll(1);" onmousedown="_startScroll(1);"
onmouseover="_continueScroll(1);"
onmouseup="_stopScroll();" onmouseup="_stopScroll();"
onmouseout="_stopScroll();" onmouseout="_pauseScroll();"
chromedir="&locale.dir;"/> chromedir="&locale.dir;"/>
</content> </content>
<implementation implements="nsITimerCallback"> <implementation implements="nsITimerCallback, nsIDOMEventListener">
<constructor><![CDATA[ <constructor><![CDATA[
try { try {
this._scrollDelay = this._prefBranch this._scrollDelay = this._prefBranch
@ -446,7 +448,6 @@
} }
]]></destructor> ]]></destructor>
<field name="_scrollTimer">null</field>
<field name="_scrollIndex">0</field> <field name="_scrollIndex">0</field>
<field name="_scrollDelay">150</field> <field name="_scrollDelay">150</field>
@ -481,6 +482,7 @@
Components.interfaces.nsITimer.TYPE_REPEATING_SLACK); Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
} }
this.scrollByIndex(index); this.scrollByIndex(index);
this._mousedown = true;
]]> ]]>
</body> </body>
</method> </method>
@ -490,6 +492,38 @@
if (this._scrollTimer) if (this._scrollTimer)
this._scrollTimer.cancel(); this._scrollTimer.cancel();
this._autorepeatSmoothScroll = false; this._autorepeatSmoothScroll = false;
this._mousedown = false;
]]></body>
</method>
<method name="_pauseScroll">
<body><![CDATA[
if (this._mousedown) {
this._stopScroll();
this._mousedown = true;
document.addEventListener("mouseup", this, false);
document.addEventListener("blur", this, true);
}
]]></body>
</method>
<method name="_continueScroll">
<parameter name="index"/>
<body><![CDATA[
if (this._mousedown)
this._startScroll(index);
]]></body>
</method>
<method name="handleEvent">
<parameter name="aEvent"/>
<body><![CDATA[
if (aEvent.type == "mouseup" ||
aEvent.type == "blur" && aEvent.target == document) {
this._mousedown = false;
document.removeEventListener("mouseup", this, false);
document.removeEventListener("blur", this, true);
}
]]></body> ]]></body>
</method> </method>