2 files changed, 55 insertions, 10 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 87151964..9c4f31b7 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -73,6 +73,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
     // Properties that require element planes to be updated
         _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
+        _recalculateScrollOffsets : { value: false },
 
         ///////////////////////////////////////////////////////////////////////
         // Property accessors
@@ -117,7 +118,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         },
 
     initializeFromDocument:{
-        value:function(adjustScrollOffsets){
+        value:function(adjustScrollOffsets, useStageValues){
             var i,
                 documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
                 stage = this.application.ninja.stage,
@@ -141,6 +142,13 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     t,
                     plane,
                     elt;
+                if(useStageValues) {
+                    initL = stage.userPaddingLeft;
+                    initT = stage.userPaddingTop;
+                    minLeft = stage.templateLeft;
+                    minTop = stage.templateTop;
+                    this._recalculateScrollOffsets = false;
+                }
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
@@ -149,17 +157,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         t = plane._rect.m_top - docTop;
                         if(l < minLeft) {
                             minLeft = l;
+                            stage.minLeftElement = elt;
                         }
                         if(t < minTop) {
                             minTop = t;
+                            stage.minTopElement = elt;
                         }
                     }
                 }
                 if(minLeft !== initL) {
-                    stage.userPaddingLeft = minLeft;
+                    stage.userPaddingLeft = (minLeft < 0) ? minLeft : 0;
                 }
                 if(minTop !== initT) {
-                    stage.userPaddingTop = minTop;
+                    stage.userPaddingTop = (minTop < 0) ? minTop : 0;
                 }
             }
         }
@@ -274,9 +284,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     t,
                     plane,
                     changed = false,
+                    elt,
                     adjustStagePadding = !isChanging || (event.detail.data.prop !== "matrix");
                 for(var i=0; i < len; i++) {
-                    plane = els[i].elementModel.props3D.elementPlane;
+                    elt = els[i];
+                    plane = elt.elementModel.props3D.elementPlane;
                     if(plane) {
                         plane.init();
                         if(adjustStagePadding) {
@@ -284,22 +296,34 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                             t = plane._rect.m_top - docTop;
                             if(l < minLeft) {
                                 minLeft = l;
+                                stage.minLeftElement = elt;
+                            } else if((elt === stage.minLeftElement) && (l > minLeft)) {
+                                this._recalculateScrollOffsets = true;
                             }
+
                             if(t < minTop) {
                                 minTop = t;
+                                stage.minTopElement = elt;
+                            } else if((elt === stage.minTopElement) && (t > minTop)) {
+                                this._recalculateScrollOffsets = true;
                             }
                         }
                     }
                 }
 
                 if(adjustStagePadding) {
-                    if(minLeft !== stage.userPaddingLeft) {
-                        stage.userPaddingLeft = minLeft;
-                        changed = true;
-                    }
-                    if(minTop !== stage.userPaddingTop) {
-                        stage.userPaddingTop = minTop;
+                    if(this._recalculateScrollOffsets && !isChanging) {
+                        this.initializeFromDocument(true, true);
                         changed = true;
+                    } else {
+                        if(minLeft !== stage.userPaddingLeft) {
+                            stage.userPaddingLeft = minLeft;
+                            changed = true;
+                        }
+                        if(minTop !== stage.userPaddingTop) {
+                            stage.userPaddingTop = minTop;
+                            changed = true;
+                        }
                     }
                 }
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index f4de3070..5e913c76 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -249,6 +249,10 @@ exports.Stage = Montage.create(Component, {
                 this.currentDocument.model.documentOffsetTop = this._documentOffsetTop;
                 this.currentDocument.model.userContentLeft = this._userContentLeft;
                 this.currentDocument.model.userContentTop = this._userContentTop;
+                this.currentDocument.model.templateLeft = this.templateLeft;
+                this.currentDocument.model.templateTop = this.templateTop;
+                this.currentDocument.model.minLeftElement = this.minLeftElement;
+                this.currentDocument.model.minTopElement = this.minTopElement;
 
                 //call configure false with the old document on the selected tool to tear down down any temp. stuff
                 this.application.ninja.toolsData.selectedToolInstance._configure(false);
@@ -279,6 +283,13 @@ exports.Stage = Montage.create(Component, {
     _userPaddingLeft: { value: 0 },
     _userPaddingTop: { value: 0 },
 
+    templateLeft: { value: 0 },
+    templateTop: { value: 0 },
+
+    // keep track of the elements that determine the minimum left and top scrollable amount
+    minLeftElement: { value: null },
+    minTopElement: { value: null },
+
     userPaddingLeft: {
         get: function() { return this._userPaddingLeft; },
         set: function(value) {
@@ -374,6 +385,10 @@ exports.Stage = Montage.create(Component, {
                 this._userContentTop = this.currentDocument.model.userContentTop;
                 this._scrollLeft = this.currentDocument.model.scrollLeft;
                 this._scrollTop = this.currentDocument.model.scrollTop;
+                this.templateLeft = this.currentDocument.model.templateLeft;
+                this.templateTop = this.currentDocument.model.templateTop;
+                this.minLeftElement = this.currentDocument.model.minLeftElement;
+                this.minTopElement = this.currentDocument.model.minTopElement;
             } else {
                 this._userPaddingLeft = 0;
                 this._userPaddingTop = 0;
@@ -383,6 +398,10 @@ exports.Stage = Montage.create(Component, {
                 this._userContentTop = 0;
                 this._scrollLeft = 0;
                 this._scrollTop = 0;
+                this.templateLeft = 0;
+                this.templateTop = 0;
+                this.minLeftElement = null;
+                this.minTopElement = null;
             }
 
             // Recalculate the canvas sizes because of splitter resizing
@@ -400,9 +419,11 @@ exports.Stage = Montage.create(Component, {
                 var initialTop = parseInt((this.canvas.height - designView._template.size.height)/2);
                 if(initialLeft > this.documentOffsetLeft) {
                     this.userPaddingLeft = -initialLeft;
+                    this.templateLeft = -initialLeft;
                 }
                 if(initialTop > this.documentOffsetTop) {
                     this.userPaddingTop = -initialTop;
+                    this.templateTop = -initialTop;
                 }
             }