Use actual width and height instead of measuredWidth and measuredHeight

jonasfa · jonasfa · commit 272d167bd1d4 · 2014-06-30T18:04:01.000-03:00
Fixes square#552
diff --git a/picasso/src/main/java/com/squareup/picasso/DeferredRequestCreator.java b/picasso/src/main/java/com/squareup/picasso/DeferredRequestCreator.java
@@ -47,8 +47,8 @@ class DeferredRequestCreator implements ViewTreeObserver.OnPreDrawListener {
       return true;
     }
 
-    int width = target.getMeasuredWidth();
-    int height = target.getMeasuredHeight();
+    int width = target.getWidth();
+    int height = target.getHeight();
 
     if (width <= 0 || height <= 0) {
       return true;
diff --git a/picasso/src/main/java/com/squareup/picasso/RequestCreator.java b/picasso/src/main/java/com/squareup/picasso/RequestCreator.java
@@ -157,7 +157,7 @@ public RequestCreator error(Drawable errorDrawable) {
 
   /**
    * Attempt to resize the image to fit exactly into the target {@link ImageView}'s bounds. This
-   * will result in delayed execution of the request until the {@link ImageView} has been measured.
+   * will result in delayed execution of the request until the {@link ImageView} has been laid out.
    * <p>
    * <em>Note:</em> This method works only when your target is an {@link ImageView}.
    */
@@ -489,14 +489,14 @@ public void into(ImageView target, Callback callback) {
       if (data.hasSize()) {
         throw new IllegalStateException("Fit cannot be used with resize.");
       }
-      int measuredWidth = target.getMeasuredWidth();
-      int measuredHeight = target.getMeasuredHeight();
-      if (measuredWidth == 0 || measuredHeight == 0) {
+      int width = target.getWidth();
+      int height = target.getHeight();
+      if (width == 0 || height == 0) {
         setPlaceholder(target, placeholderResId, placeholderDrawable);
         picasso.defer(target, new DeferredRequestCreator(this, target, callback));
         return;
       }
-      data.resize(measuredWidth, measuredHeight);
+      data.resize(width, height);
     }
 
     Request request = createRequest(started);
diff --git a/picasso/src/test/java/com/squareup/picasso/DeferredRequestCreatorTest.java b/picasso/src/test/java/com/squareup/picasso/DeferredRequestCreatorTest.java
@@ -101,8 +101,8 @@ public class DeferredRequestCreatorTest {
 
   @Test public void waitsForAnotherLayoutIfWidthOrHeightIsZero() throws Exception {
     ImageView target = mockFitImageViewTarget(true);
-    when(target.getMeasuredWidth()).thenReturn(0);
-    when(target.getMeasuredHeight()).thenReturn(0);
+    when(target.getWidth()).thenReturn(0);
+    when(target.getHeight()).thenReturn(0);
     RequestCreator creator = mock(RequestCreator.class);
     DeferredRequestCreator request = new DeferredRequestCreator(creator, target);
     request.onPreDraw();
@@ -134,8 +134,8 @@ public class DeferredRequestCreatorTest {
     RequestCreator creator = new RequestCreator(picasso, URI_1, 0);
 
     ImageView target = mockFitImageViewTarget(true);
-    when(target.getMeasuredWidth()).thenReturn(100);
-    when(target.getMeasuredHeight()).thenReturn(100);
+    when(target.getWidth()).thenReturn(100);
+    when(target.getHeight()).thenReturn(100);
 
     ViewTreeObserver observer = target.getViewTreeObserver();
 
diff --git a/picasso/src/test/java/com/squareup/picasso/RequestCreatorTest.java b/picasso/src/test/java/com/squareup/picasso/RequestCreatorTest.java
@@ -300,8 +300,8 @@ public void intoImageViewWithFitAndNoDimensionsQueuesDeferredImageViewRequest()
   @Test
   public void intoImageViewWithFitAndDimensionsQueuesImageViewRequest() throws Exception {
     ImageView target = mockFitImageViewTarget(true);
-    when(target.getMeasuredWidth()).thenReturn(100);
-    when(target.getMeasuredHeight()).thenReturn(100);
+    when(target.getWidth()).thenReturn(100);
+    when(target.getHeight()).thenReturn(100);
     new RequestCreator(picasso, URI_1, 0).fit().into(target);
     verify(picasso).enqueueAndSubmit(actionCaptor.capture());
     assertThat(actionCaptor.getValue()).isInstanceOf(ImageViewAction.class);

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ class DeferredRequestCreator implements ViewTreeObserver.OnPreDrawListener {`
`47`	`47`	`return true;`
`48`	`48`	`}`
`49`	`49`
`50`		`- int width = target.getMeasuredWidth();`
`51`		`- int height = target.getMeasuredHeight();`
	`50`	`+ int width = target.getWidth();`
	`51`	`+ int height = target.getHeight();`
`52`	`52`
`53`	`53`	`if (width <= 0 \|\| height <= 0) {`
`54`	`54`	`return true;`