Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!3685

o2web/source/o2_core/o2.js

@@ -2224,6 +2224,22 @@ o2.core = true;
         return (/^(?:body|html)$/i).test(element.tagName);
     }
 
+    var heightComponents = ['height', 'paddingTop', 'paddingBottom', 'borderTopWidth', 'borderBottomWidth'],
+        widthComponents = ['width', 'paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'];
+    var svgCalculateSize = function(el){
+
+        var gCS = window.getComputedStyle(el),
+            bounds = {x: 0, y: 0};
+
+        heightComponents.each(function(css){
+            bounds.y += parseFloat(gCS[css]);
+        });
+        widthComponents.each(function(css){
+            bounds.x += parseFloat(gCS[css]);
+        });
+        return bounds;
+    };
+
     [Document, Window].invoke('implement', {
         getSize: function(){
             var doc = this.getDocument();

o2web/source/x_component_process_Xform/widget/$Monitor/default/css.wcss

@@ -5,13 +5,15 @@
         "background-image": "url("+"../x_component_process_ProcessDesigner/$Main/default/griddingbg.gif)",
         "margin": "15px",
         "box-shadow": "0px 0px 20px #606060",
-        "height": "600px"
+        "height": "600px",
+        "position": "relative"
     },
     "paperNodeMobile": {
         "overflow": "auto",
         "background-color": "#FFF",
         "background-image": "url("+"../x_component_process_ProcessDesigner/$Main/default/griddingbg.gif)",
-        "height": "600px"
+        "height": "600px",
+        "position": "relative"
     },
     "paperInNode": {
         "height": "600px",
@@ -85,4 +87,4 @@
         "cursor": "pointer",
         "z-index": 100000
     }
-}
\ No newline at end of file
+}

o2web/source/x_component_process_Xform/widget/Monitor.js

@@ -76,7 +76,7 @@ MWF.xApplication.process.Xform.widget.Monitor = new Class({
         if (!this.process){
             this.logProcessChartNode.empty();
             this.loadToolbar();
-            this.paperNode =  new Element("div", {"styles": (layout.mobile) ? this.css.paperNodeMobile : this.css.paperNode}).inject(this.logProcessChartNode);
+            this.paperNode =  new Element("div.paperNode", {"styles": (layout.mobile) ? this.css.paperNodeMobile : this.css.paperNode}).inject(this.logProcessChartNode);
             //this.paperNode.addEvent("scroll", function(){
             //    this.setCountNodePosition();
             //}.bind(this));
@@ -416,6 +416,8 @@ MWF.xApplication.process.Xform.widget.Monitor = new Class({
         }.bind(this.process));
     },
     getlogNodePosition: function(activity, node, offset, psize){
+        offset.x = 0;
+        offset.y = 0;
         var size = node.getSize();
         var y = 0;
         var x = activity.point.x+activity.width+15+offset.x;