diff --git a/mozilla/toolkit/content/widgets/browser.xml b/mozilla/toolkit/content/widgets/browser.xml index 0005cdf8bc5..b24bc5a9c03 100644 --- a/mozilla/toolkit/content/widgets/browser.xml +++ b/mozilla/toolkit/content/widgets/browser.xml @@ -239,6 +239,20 @@ null + 3 + 10 + null + null + false + false + null + null + false + 0 + null + null + null + null @@ -436,6 +450,48 @@ ]]> + + + + + + + + + + 0 && Math.abs(y) > 0) + { + if (this._scrollCount++ % 2) + y = 0; + else + x = 0; + } + + this._clientFrameDoc.defaultView.scrollBy(x, y); + setTimeout(function foo(a) { a.autoScrollLoop() }, 5, this); + } + ]]> + + + @@ -485,6 +541,94 @@ } ]]> + + + + + = documentWidth) + scrollType = 1; + else if (windowHeight >= documentHeight && windowWidth < documentWidth) + scrollType = 2; + + var imageWidth = 28; + var imageHeight = 28; + + // overlay + var el = this._clientFrameDoc.createElementNS("http://www.w3.org/1999/xhtml", "div"); + el.style.position = "fixed"; + el.style.left = "0px"; + el.style.top = "0px"; + el.style.width = documentWidth + "px"; + el.style.height = documentHeight + "px"; + el.style.cursor = scrollCursor[scrollType]; + + this._clientFrameBody.appendChild(el); + this._overlayContainer = el; + + // marker + el = this._clientFrameDoc.createElementNS("http://www.w3.org/1999/xhtml", "img"); + + var scrollImages = new Array("chrome://global/skin/arrow/autoscroll_all.png", + "chrome://global/skin/arrow/autoscroll_v.png", + "chrome://global/skin/arrow/autoscroll_h.png"); + + 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]; + + this._clientFrameBody.appendChild(el); + + this._autoScrollMarkerImage = el; + + window.setTimeout(function foo(a) { a.autoScrollLoop() }, 5, this); + } + else if (this._hasScrolled) + stopScroll(); + ]]> + + + this._AUTOSCROLL_SNAP || x < -this._AUTOSCROLL_SNAP) || (y > this._AUTOSCROLL_SNAP || y < -this._AUTOSCROLL_SNAP)) + this._snapOn = false; + } + ]]> + diff --git a/mozilla/toolkit/skin/win/arrow/autoscroll_all.png b/mozilla/toolkit/skin/win/arrow/autoscroll_all.png new file mode 100644 index 00000000000..69132d85e2c Binary files /dev/null and b/mozilla/toolkit/skin/win/arrow/autoscroll_all.png differ diff --git a/mozilla/toolkit/skin/win/arrow/autoscroll_h.png b/mozilla/toolkit/skin/win/arrow/autoscroll_h.png new file mode 100644 index 00000000000..281268e0030 Binary files /dev/null and b/mozilla/toolkit/skin/win/arrow/autoscroll_h.png differ diff --git a/mozilla/toolkit/skin/win/arrow/autoscroll_v.png b/mozilla/toolkit/skin/win/arrow/autoscroll_v.png new file mode 100644 index 00000000000..efd55c38c33 Binary files /dev/null and b/mozilla/toolkit/skin/win/arrow/autoscroll_v.png differ diff --git a/mozilla/toolkit/skin/win/jar.mn b/mozilla/toolkit/skin/win/jar.mn index 3983992f68a..3dcc60a3c11 100644 --- a/mozilla/toolkit/skin/win/jar.mn +++ b/mozilla/toolkit/skin/win/jar.mn @@ -49,6 +49,9 @@ classic.jar: + skin/classic/global/arrow/arrow-up-hov.gif (arrow/arrow-up-hov.gif) + skin/classic/global/arrow/arrow-up-sharp.gif (arrow/arrow-up-sharp.gif) + skin/classic/global/arrow/arrow-up.gif (arrow/arrow-up.gif) ++ skin/classic/global/arrow/autoscroll_all.png (arrow/autoscroll_all.png) ++ skin/classic/global/arrow/autoscroll_h.png (arrow/autoscroll_h.png) ++ skin/classic/global/arrow/autoscroll_v.png (arrow/autoscroll_v.png) + skin/classic/global/checkbox/cbox-check-dis.gif (checkbox/cbox-check-dis.gif) + skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) + skin/classic/global/icons/Error.png (icons/Error.png)