From f72a5fb44f256eaeced2cbfb77900ce90f92e4c1 Mon Sep 17 00:00:00 2001 From: Maciej PrzepioĢra Date: Mon, 24 Mar 2014 22:13:48 +0200 Subject: Return border sizes from border methods in MeasuredSize (#13494) Back ported from master Merge: no Change-Id: I9eee3cb897fcb00beb2b2877dd98337623e2cf5b --- client/src/com/vaadin/client/MeasuredSize.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client') 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() { -- cgit v1.2.3