1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/ScrollView.java b/src/com/android/gallery3d/ui/ScrollView.java
index f7628335c..23a8bb5bf 100644
--- a/src/com/android/gallery3d/ui/ScrollView.java
+++ b/src/com/android/gallery3d/ui/ScrollView.java
@@ -44,6 +44,18 @@ public class ScrollView extends GLView {
     }
 
     @Override
+    protected void onMeasure(int widthSpec, int heightSpec) {
+        GLView view = getContentView();
+        if (view != null) {
+            view.measure(widthSpec, heightSpec);
+            MeasureHelper.getInstance(this)
+                    .setPreferredContentSize(view.getMeasuredWidth(),
+                            view.getMeasuredHeight())
+                    .measure(widthSpec, heightSpec);
+        }
+    }
+
+    @Override
     public void onLayout(boolean sizeChange, int l, int t, int r, int b) {
         GLView content = getContentView();
         int width = getWidth();