Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 242621 Move Autoscroll Icon Out of the DOM (SeaMonkey-style autoscroll)

Browse Source 
Patch by me and Michael Ventnor <ventnor.bugzilla@yahoo.com.au>
Icons by Dão Gottwald <dao@design-noir.de>
ui-review=beltzner, r=mano


git-svn-id: svn://10.0.0.236/trunk@228101 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cst%yecc.com
2007-06-15 02:36:39 +00:00
parent 48bd7b04aa
commit da8bb2164f
10 changed files with 170 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/toolkit/content/jar.mn
View File

@@ -72,9 +72,6 @@ toolkit.jar:
*+ content/global/bindings/tree.xml (widgets/tree.xml)
*+ content/global/bindings/wizard.xml (widgets/wizard.xml)
*+ content/global/bindings/findbar.xml (widgets/findbar.xml)
content/global/bindings/autoscroll_all.png (widgets/autoscroll_all.png)
content/global/bindings/autoscroll_h.png (widgets/autoscroll_h.png)
content/global/bindings/autoscroll_v.png (widgets/autoscroll_v.png)
#ifdef XP_MACOSX
* content/global/macWindowMenu.js (macWindowMenu.js)
#endif

198
mozilla/toolkit/content/widgets/browser.xml
View File

@@ -23,6 +23,8 @@
- Contributor(s):
- Peter Annema <disttsc@bart.nl> (Original Author of <browser>)
- Peter Parente <parente@cs.unc.edu>
- Christopher Thomas <cst@yecc.com>
- Michael Ventnor <m.ventnor@gmail.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -459,8 +461,8 @@
if (!tabBrowser || tabBrowser.mCurrentBrowser == this)
this.fastFind.setDocShell(this.docShell);
if (this._isScrolling)
this.stopScroll();
if (this._scrollingView)
this._autoScrollPopup.hidePopup();
]]>
</body>
</method>
@@ -670,40 +672,82 @@
<field name="_AUTOSCROLL_SPEED">3</field>
<field name="_AUTOSCROLL_SNAP">10</field>
<field name="_clientFrameDoc">null</field>
<field name="_isScrolling">false</field>
<field name="_autoScrollMarkerImage">null</field>
<field name="_snapOn">false</field>
<field name="_scrollingView">null</field>
<field name="_autoScrollTimer">null</field>
<field name="_startX">null</field>
<field name="_startY">null</field>
<field name="_screenX">null</field>
<field name="_screenY">null</field>
<field name="_autoScrollPopup">null</field>
<method name="stopScroll">
<body>
<![CDATA[
this._isScrolling = false;
this.removeEventListener("mousemove", this, false);
this.contentDocument.removeEventListener("blur", this, true);
if (this._autoScrollMarkerImage) {
this._autoScrollMarkerImage.style.display = 'none'; // seems to avoid blocking when autoscroll is initited during pageload
this._autoScrollMarkerImage.parentNode.removeChild(this._autoScrollMarkerImage);
if (this._scrollingView) {
this._scrollingView = null;
window.removeEventListener("mousemove", this, true);
window.removeEventListener("mousedown", this, true);
window.removeEventListener("mouseup", this, true);
window.removeEventListener("contextmenu", this, true);
clearInterval(this._autoScrollTimer);
}
this._autoScrollMarkerImage = null;
]]>
</body>
</method>
<method name="startScroll">
<parameter name="event"/>
<body>
<![CDATA[
// if the tabbrowser didn't point us to a cached popup, we're not in a tabbrowser, so use global scope
if (!this._autoScrollPopup) {
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
this._autoScrollPopup = document.createElementNS(XUL_NS, "popup");
this._autoScrollPopup.id = "autoscroller";
this._autoScrollPopup.addEventListener("popuphidden", this, true);
document.documentElement.appendChild(this._autoScrollPopup);
}
this._scrollingView = event.originalTarget.ownerDocument.defaultView;
if (this._scrollingView.scrollMaxX > 0) {
this._autoScrollPopup.setAttribute("scrolldir", this._scrollingView.scrollMaxY > 0 ? "NSEW" : "EW");
}
else if (this._scrollingView.scrollMaxY > 0) {
this._autoScrollPopup.setAttribute("scrolldir", "NS");
}
else {
this._scrollingView = null; // abort scrolling
return;
}
document.popupNode = null;
this._autoScrollPopup.showPopup(document.documentElement,
event.screenX,
event.screenY,
"popup", null, null);
this._ignoreMouseEvents = true;
this._startX = event.screenX;
this._startY = event.screenY;
this._screenX = event.screenX;
this._screenY = event.screenY;
window.addEventListener("mousemove", this, true);
window.addEventListener("mousedown", this, true);
window.addEventListener("mouseup", this, true);
window.addEventListener("contextmenu", this, true);
this._autoScrollTimer = setInterval(function(self) { self.autoScrollLoop(); },
20, this);
]]>
</body>
</method>
<method name="autoScrollLoop">
<body>
<![CDATA[
if (this._isScrolling) {
var x = (this._screenX - this._startX) / this._AUTOSCROLL_SPEED;
var y = (this._screenY - this._startY) / this._AUTOSCROLL_SPEED;
var x = (this._screenX - this._startX) / this._AUTOSCROLL_SPEED;
var y = (this._screenY - this._startY) / this._AUTOSCROLL_SPEED;
this._clientFrameDoc.defaultView.scrollBy(x, y);
setTimeout(function foo(a) { a.autoScrollLoop() }, 20, this);
}
this._scrollingView.scrollBy(x, y);
]]>
</body>
</method>
@@ -743,75 +787,38 @@
]]>
</body>
</method>
<method name="showAutoscrollMarker">
<parameter name="evt"/>
<body>
<![CDATA[
var scrollCursor = new Array("n-resize", "move", "e-resize");
var scrollImages = new Array("chrome://global/content/bindings/autoscroll_v.png",
"chrome://global/content/bindings/autoscroll_all.png",
"chrome://global/content/bindings/autoscroll_h.png");
var left = evt.clientX;
var top = evt.clientY;
var scrollType = 1;
if (this._clientFrameDoc.defaultView.scrollMaxY > 0) scrollType--;
if (this._clientFrameDoc.defaultView.scrollMaxX > 0) scrollType++;
var imageWidth = 28;
var imageHeight = 28;
// marker
var el = this._clientFrameDoc.createElementNS("http://www.w3.org/1999/xhtml", "img");
el.src = scrollImages[scrollType];
el.style.position = "fixed";
el.style.left = left - imageWidth / 2 + "px";
el.style.top = top - imageHeight / 2 + "px";
el.style.width = imageWidth + "px";
el.style.height = imageHeight + "px";
el.style.cursor = scrollCursor[scrollType];
el.style.zIndex = 2147483647; //Max Int
el.style.borderStyle = "none";
el.style.padding = "0";
el.style.margin = "0";
this._clientFrameDoc.documentElement.appendChild(el);
this._autoScrollMarkerImage = el;
]]>
</body>
</method>
<method name="_handleMouseMove">
<parameter name="aEvent"/>
<body>
<![CDATA[
this._screenX = aEvent.screenX;
this._screenY = aEvent.screenY;
if (this._isScrolling) {
var x = this._screenX - this._startX;
var y = this._screenY - this._startY;
if ((x > this._AUTOSCROLL_SNAP || x < -this._AUTOSCROLL_SNAP) ||
(y > this._AUTOSCROLL_SNAP || y < -this._AUTOSCROLL_SNAP))
this._snapOn = false;
}
]]>
</body>
</method>
<method name="handleEvent">
<parameter name="aEvent"/>
<body>
<![CDATA[
switch (aEvent.type) {
case "mousemove":
this._handleMouseMove(aEvent);
break;
case "blur":
if (aEvent.target == this.contentDocument)
if (this._scrollingView) {
switch(aEvent.type) {
case "mousemove": {
this._screenX = aEvent.screenX;
this._screenY = aEvent.screenY;
var x = this._screenX - this._startX;
var y = this._screenY - this._startY;
if ((x > this._AUTOSCROLL_SNAP || x < -this._AUTOSCROLL_SNAP) ||
(y > this._AUTOSCROLL_SNAP || y < -this._AUTOSCROLL_SNAP))
this._ignoreMouseEvents = false;
break;
}
case "mouseup":
case "mousedown":
case "contextmenu": {
if (!this._ignoreMouseEvents)
this._autoScrollPopup.hidePopup();
this._ignoreMouseEvents = false;
break;
}
case "popuphidden": {
this.stopScroll();
break;
}
}
}
]]>
</body>
@@ -865,34 +872,15 @@
}
]]>
</handler>
<handler event="mouseup">
<handler event="mousedown" phase="capturing">
<![CDATA[
if (!this.autoscrollEnabled)
return;
if (!this._snapOn)
this.stopScroll();
]]>
</handler>
<handler event="mousedown">
<![CDATA[
if (this._isScrolling) {
stopScroll();
} else if (event.button == 1) {
if (!this._scrollingView && event.button == 1) {
if (!this.autoscrollEnabled ||
this.currentURI.spec == "about:blank"||
this.isAutoscrollBlocker(event.originalTarget))
return;
this.addEventListener("mousemove", this, false);
this.contentDocument.addEventListener("blur", this, true);
this._screenX = event.screenX;
this._screenY = event.screenY;
this._startX = event.screenX;
this._startY = event.screenY;
this._clientFrameDoc = event.originalTarget.ownerDocument;
this._isScrolling = true;
this._snapOn = true;
this.showAutoscrollMarker(event);
window.setTimeout(function foo(a) { a.autoScrollLoop() }, 20, this);
this.startScroll(event);
}
]]>
</handler>

22
mozilla/toolkit/themes/gnomestripe/global/global.css
View File

@@ -185,3 +185,25 @@ sidebarheader > label {
.toolbar-focustarget {
-moz-user-focus: ignore !important;
}
/* :::::: autoscroll popup ::::: */
#autoscroller {
height: 28px;
width: 28px;
border: none;
margin: -14px;
padding: 0;
background-position: center top;
background-image: url("chrome://global/skin/icons/autoscroll.png");
background-color: transparent;
-moz-appearance: none;
}
#autoscroller[scrolldir="NS"] {
background-position: center center;
}
#autoscroller[scrolldir="EW"] {
background-position: center bottom;
}

2
mozilla/toolkit/themes/gnomestripe/global/popup.css
View File

@@ -45,7 +45,7 @@
/* ::::: menupopup ::::: */
menupopup, popup {
-moz-appearance: menupopup !important;
-moz-appearance: menupopup;
min-width: 1px;
}

20
mozilla/toolkit/themes/pinstripe/global/global.css
View File

@@ -234,3 +234,23 @@ browser {
border-top: 1px solid #bebebe;
}
/* :::::: autoscroll popup ::::: */
#autoscroller {
height: 28px;
width: 28px;
border: none;
margin: -14px;
padding: 0;
background-image: url("chrome://global/skin/icons/autoscroll.png");
background-color: transparent;
-moz-appearance: none;
}
#autoscroller[scrolldir="NS"] {
background-position: left center;
}
#autoscroller[scrolldir="EW"] {
background-position: left bottom;
}

BIN
mozilla/toolkit/themes/pinstripe/global/icons/autoscroll.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

1
mozilla/toolkit/themes/pinstripe/global/jar.mn
View File

@@ -112,6 +112,7 @@ classic.jar:
+ skin/classic/global/icons/alert-message.gif (icons/alert-message.gif)
+ skin/classic/global/icons/alert-question.gif (icons/alert-question.gif)
+ skin/classic/global/icons/autocomplete-dropmarker.png (icons/autocomplete-dropmarker.png)
+ skin/classic/global/icons/autoscroll.png (icons/autoscroll.png)
+ skin/classic/global/icons/chevron.png (icons/chevron.png)
+ skin/classic/global/icons/close.gif (icons/close.gif)
+ skin/classic/global/icons/closetab-active.png (icons/closetab-active.png)

32
mozilla/toolkit/themes/winstripe/global/global.css
View File

@@ -184,3 +184,35 @@ sidebarheader > label {
.toolbar-focustarget {
-moz-user-focus: ignore !important;
}
/* :::::: autoscroll popup ::::: */
#autoscroller {
height: 28px;
width: 28px;
border: none;
margin: -14px;
padding: 0;
background-image: url("chrome://global/skin/icons/autoscroll.png");
background-color: transparent;
%ifdef XP_WIN
background-position: right top;
%endif
-moz-appearance: none;
}
#autoscroller[scrolldir="NS"] {
%ifdef XP_WIN
background-position: right center;
%else
background-position: left center;
%endif
}
#autoscroller[scrolldir="EW"] {
%ifdef XP_WIN
background-position: right bottom;
%else
background-position: left bottom;
%endif
}

BIN
mozilla/toolkit/themes/winstripe/global/icons/autoscroll.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

1
mozilla/toolkit/themes/winstripe/global/jar.mn
View File

@@ -74,6 +74,7 @@ classic.jar:
skin/classic/global/icons/autocomplete-dropmark-bkgnd.png (icons/autocomplete-dropmark-bkgnd.png)
skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-top.png (icons/autocomplete-dropmark-bkgnd-mid-top.png)
skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-bottom.png (icons/autocomplete-dropmark-bkgnd-mid-bottom.png)
skin/classic/global/icons/autoscroll.png (icons/autoscroll.png)
skin/classic/global/icons/Close.gif (icons/Close.gif)
skin/classic/global/icons/close.png (icons/close.png)
skin/classic/global/icons/alltabs.png (icons/alltabs.png)