flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [6/7] git commit: [flex-asjs] [refs/heads/develop] - fix sizing logic
Date Fri, 21 Aug 2015 18:43:00 GMT
fix sizing logic


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3e32bbfe
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3e32bbfe
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3e32bbfe

Branch: refs/heads/develop
Commit: 3e32bbfeac6e11f3e052613144d55f29a1ea4e8f
Parents: 8162742
Author: Alex Harui <aharui@apache.org>
Authored: Fri Aug 21 10:28:30 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Aug 21 10:28:30 2015 -0700

----------------------------------------------------------------------
 .../js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3e32bbfe/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
index a83c3a7..e351995 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js
@@ -84,6 +84,11 @@ org.apache.flex.html.beads.layouts.VerticalLayout.
     child.flexjs_wrapper.dispatchEvent('sizeChanged');
   }
   if (!hasWidth && n > 0 && !isNaN(maxWidth) && (!(scv.left !=
'auto' && scv.right != 'auto'))) {
+    var pl = scv['padding-left'];
+    var pr = scv['padding-right'];
+    pl = parseInt(pl.substring(0, pl.length - 2), 10);
+    pr = parseInt(pr.substring(0, pr.length - 2), 10);
+    maxWidth += scv.paddingLeft + pl + pr;
     this.lastWidth_ = sps.width = maxWidth.toString() + 'px';
   }
 };


Mime
View raw message