Changeset 7649

Timestamp:

07/31/08 17:21:10 (4 months ago)

Author:

ahocevar

Message:

Take css borders into account when drawing the box. This has to be done for every browser, except IE in quirks mode. r=crschmidt (closes 1593)

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Box.js (modified) (4 diffs)

trunk/openlayers/lib/OpenLayers/Handler/Box.js

@@ -30 +30 @@
-     */
-    boxDivClassName: 'olHandlerBoxZoomBox',
+    
+    /**
+     * Property: boxCharacteristics
+     * {Object} Caches some box characteristics from css. This is used
+     *     by the getBoxCharacteristics method.
+     */
+    boxCharacteristics: null,
-
-    /**
@@ -93 +100 @@
-        this.zoomBox.style.left = xy.x < startX ? xy.x+"px" : startX+"px";
-        this.zoomBox.style.top = xy.y < startY ? xy.y+"px" : startY+"px";
+
+        // depending on the box model, modify width and height to take borders
+        // of the box into account
+        var box = this.getBoxCharacteristics(deltaX, deltaY);
+        if (box.newBoxModel) {
+            if (xy.x > startX) {
+                this.zoomBox.style.width =
+                    Math.max(1, deltaX - box.xOffset) + "px";
+            }
+            if (xy.y > startY) {
+                this.zoomBox.style.height =
+                    Math.max(1, deltaY - box.yOffset) + "px";
+            }
+        }
-    },
-
@@ -126 +147 @@
-        this.map.viewPortDiv.removeChild(this.zoomBox);
-        this.zoomBox = null;
+        this.boxCharacteristics = null;
-    },
-
@@ -151 +173 @@
-        }
-    },
+    
+    getBoxCharacteristics: function(dx, dy) {
+        if (!this.boxCharacteristics) {
+            var xOffset = parseInt(OpenLayers.Element.getStyle(this.zoomBox,
+                "border-left-width")) + parseInt(OpenLayers.Element.getStyle(
+                this.zoomBox, "border-right-width")) + 1;
+            var yOffset = parseInt(OpenLayers.Element.getStyle(this.zoomBox,
+                "border-top-width")) + parseInt(OpenLayers.Element.getStyle(
+                this.zoomBox, "border-bottom-width")) + 1;
+            // all browsers use the new box model, except IE in quirks mode
+            var newBoxModel = OpenLayers.Util.getBrowserName() == "msie" ?
+                document.compatMode != "BackCompat" : true;
+            this.boxCharacteristics = {
+                xOffset: xOffset,
+                yOffset: yOffset,
+                newBoxModel: newBoxModel
+            }
+        }
+        return this.boxCharacteristics;
+    },
-
-    CLASS_NAME: "OpenLayers.Handler.Box"