summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMaciej PrzepioĢra <matthew@vaadin.com>2014-03-24 22:13:48 +0200
committerVaadin Code Review <review@vaadin.com>2014-03-25 10:26:07 +0000
commitf72a5fb44f256eaeced2cbfb77900ce90f92e4c1 (patch)
tree5ef486df5a8eec0163c37e92421f0ca4317b86b4 /client
parente5fcf73a910e6886d40a08be9a64941f81e0f34f (diff)
downloadvaadin-framework-f72a5fb44f256eaeced2cbfb77900ce90f92e4c1.tar.gz
vaadin-framework-f72a5fb44f256eaeced2cbfb77900ce90f92e4c1.zip
Return border sizes from border methods in MeasuredSize (#13494)
Back ported from master Merge: no Change-Id: I9eee3cb897fcb00beb2b2877dd98337623e2cf5b
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/MeasuredSize.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/MeasuredSize.java b/client/src/com/vaadin/client/MeasuredSize.java
index 51da8570e6..bc6ef789d0 100644
--- a/client/src/com/vaadin/client/MeasuredSize.java
+++ b/client/src/com/vaadin/client/MeasuredSize.java
@@ -153,19 +153,19 @@ public class MeasuredSize {
}
public int getBorderTop() {
- return margins[0];
+ return borders[0];
}
public int getBorderRight() {
- return margins[1];
+ return borders[1];
}
public int getBorderBottom() {
- return margins[2];
+ return borders[2];
}
public int getBorderLeft() {
- return margins[3];
+ return borders[3];
}
public int getPaddingTop() {