flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/3] git commit: [flex-asjs] [refs/heads/develop] - fix right/bottom border visibility
Date Fri, 04 Sep 2015 01:25:04 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 93b358a48 -> 47034f5ec


fix right/bottom border visibility


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

Branch: refs/heads/develop
Commit: 331f37a0e4d7ce9b6478032d510ed46264defc83
Parents: 93b358a
Author: Alex Harui <aharui@apache.org>
Authored: Thu Sep 3 15:36:47 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Sep 3 15:36:47 2015 -0700

----------------------------------------------------------------------
 .../js/src/org/apache/flex/html/beads/ContainerView.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/331f37a0/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
index 836b008..9ffa43d 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
@@ -244,10 +244,10 @@ org.apache.flex.html.beads.ContainerView.
   this.viewport.layoutViewportBeforeContentLayout(
       !host.isWidthSizedToContent() ?
           host.width - vm.borderMetrics.left - vm.borderMetrics.right -
-                     vm.chromeMetrics.left - vm.chromeMetrics.right : NaN,
+                     vm.chromeMetrics.left - vm.chromeMetrics.right - 1 : NaN,
       !host.isHeightSizedToContent() ?
           host.height - vm.borderMetrics.top - vm.borderMetrics.bottom -
-                     vm.chromeMetrics.top - vm.chromeMetrics.bottom : NaN);
+                     vm.chromeMetrics.top - vm.chromeMetrics.bottom - 1 : NaN);
 };
 
 
@@ -285,17 +285,17 @@ org.apache.flex.html.beads.ContainerView.
 
   if (host.isWidthSizedToContent() && host.isHeightSizedToContent()) {
     host.setWidthAndHeight(viewportSize.width + vm.borderMetrics.left + vm.borderMetrics.right
+
-                               vm.chromeMetrics.left + vm.chromeMetrics.right,
+                               vm.chromeMetrics.left + vm.chromeMetrics.right + 1,
                            viewportSize.height + vm.borderMetrics.top + vm.borderMetrics.bottom
+
-                               vm.chromeMetrics.top + vm.chromeMetrics.bottom, false);
+                               vm.chromeMetrics.top + vm.chromeMetrics.bottom + 1, false);
   }
   else if (!host.isWidthSizedToContent() && host.isHeightSizedToContent()) {
     host.setHeight(viewportSize.height + vm.borderMetrics.top + vm.borderMetrics.bottom +
-                               vm.chromeMetrics.top + vm.chromeMetrics.bottom, false);
+                               vm.chromeMetrics.top + vm.chromeMetrics.bottom + 1, false);
   }
   else if (host.isWidthSizedToContent() && !host.isHeightSizedToContent()) {
     host.setWidth(viewportSize.width + vm.borderMetrics.left + vm.borderMetrics.right +
-                               vm.chromeMetrics.left + vm.chromeMetrics.right, false);
+                               vm.chromeMetrics.left + vm.chromeMetrics.right + 1, false);
   }
 };
 


Mime
View raw message