修复部分情况下选项显示宽度变小的bug

Author: imkarl

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

library/src/main/java/com/weidongjian/meitu/wheelviewdemo/view/LoopView.java

@@ -71,7 +71,6 @@ public enum ACTION {
     int itemsVisible;
 
     int measuredHeight;
-    int measuredWidth;
     int paddingLeft = 0;
     int paddingRight = 0;
 
@@ -156,7 +155,6 @@ private void remeasure() {
         halfCircumference = (int) (maxTextHeight * lineSpacingMultiplier * (itemsVisible - 1));
         measuredHeight = (int) ((halfCircumference * 2) / Math.PI);
         radius = (int) (halfCircumference / Math.PI);
-        measuredWidth = maxTextWidth + paddingLeft + paddingRight;
         firstLineY = (int) ((measuredHeight - lineSpacingMultiplier * maxTextHeight) / 2.0F);
         secondLineY = (int) ((measuredHeight + lineSpacingMultiplier * maxTextHeight) / 2.0F);
         if (initPosition == -1) {
@@ -337,8 +335,8 @@ protected void onDraw(Canvas canvas) {
             }
             k1++;
         }
-        canvas.drawLine(0.0F, firstLineY, measuredWidth, firstLineY, paintIndicator);
-        canvas.drawLine(0.0F, secondLineY, measuredWidth, secondLineY, paintIndicator);
+        canvas.drawLine(0.0F, firstLineY, getWidth(), firstLineY, paintIndicator);
+        canvas.drawLine(0.0F, secondLineY, getWidth(), secondLineY, paintIndicator);
 
         final int itemWidth = ((View)getParent()).getWidth();
 
@@ -369,31 +367,31 @@ protected void onDraw(Canvas canvas) {
                 if (translateY <= firstLineY && maxTextHeight + translateY >= firstLineY) {
                     // 条目经过第一条线
                     canvas.save();
-                    canvas.clipRect(0, 0, measuredWidth, firstLineY - translateY);
+                    canvas.clipRect(0, 0, getWidth(), firstLineY - translateY);
                     canvas.drawText(text, getTextX(text, paintOuterText, tempRect), maxTextHeight, paintOuterText);
                     canvas.restore();
                     canvas.save();
-                    canvas.clipRect(0, firstLineY - translateY, measuredWidth, (int) (itemHeight));
+                    canvas.clipRect(0, firstLineY - translateY, getWidth(), (int) (itemHeight));
                     canvas.drawText(text, getTextX(text, paintCenterText, tempRect), maxTextHeight, paintCenterText);
                     canvas.restore();
                 } else if (translateY <= secondLineY && maxTextHeight + translateY >= secondLineY) {
                     // 条目经过第二条线
                     canvas.save();
-                    canvas.clipRect(0, 0, measuredWidth, secondLineY - translateY);
+                    canvas.clipRect(0, 0, getWidth(), secondLineY - translateY);
                     canvas.drawText(text, getTextX(text, paintCenterText, tempRect), maxTextHeight, paintCenterText);
                     canvas.restore();
                     canvas.save();
-                    canvas.clipRect(0, secondLineY - translateY, measuredWidth, (int) (itemHeight));
+                    canvas.clipRect(0, secondLineY - translateY, getWidth(), (int) (itemHeight));
                     canvas.drawText(text, getTextX(text, paintOuterText, tempRect), maxTextHeight, paintOuterText);
                     canvas.restore();
                 } else if (translateY >= firstLineY && maxTextHeight + translateY <= secondLineY) {
                     // 中间条目
-                    canvas.clipRect(0, 0, measuredWidth, (int) (itemHeight));
+                    canvas.clipRect(0, 0, getWidth(), (int) (itemHeight));
                     canvas.drawText(text, getTextX(text, paintCenterText, tempRect), maxTextHeight, paintCenterText);
                     selectedItem = items.indexOf(text);
                 } else {
                     // 其他条目
-                    canvas.clipRect(0, 0, measuredWidth, (int) (itemHeight));
+                    canvas.clipRect(0, 0, getWidth(), (int) (itemHeight));
                     canvas.drawText(text, getTextX(text, paintOuterText, tempRect), maxTextHeight, paintOuterText);
                 }
                 canvas.restore();
@@ -407,15 +405,13 @@ private int getTextX(String a, Paint paint, Rect rect) {
         paint.getTextBounds(a, 0, a.length(), rect);
         // 获取到的是实际文字宽度
         int textWidth = rect.width();
-        // 转换成绘制文字宽度
-        textWidth *= scaleX;
-        return (measuredWidth - textWidth) / 2;
+        return (getWidth() - textWidth) / 2;
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         remeasure();
-        setMeasuredDimension(measuredWidth, measuredHeight);
+        setMeasuredDimension(getDefaultSize(getSuggestedMinimumWidth(), widthMeasureSpec), measuredHeight);
     }
 
     @Override

library/src/main/res/layout/j_picker_items.xml

@@ -14,8 +14,8 @@
         android:gravity="center_horizontal">
         <com.weidongjian.meitu.wheelviewdemo.view.LoopView
             android:id="@+id/j_options1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
     </LinearLayout>
 
     <LinearLayout
@@ -27,8 +27,8 @@
         android:gravity="center_horizontal">
         <com.weidongjian.meitu.wheelviewdemo.view.LoopView
             android:id="@+id/j_options2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
     </LinearLayout>
 
     <LinearLayout
@@ -40,8 +40,8 @@
         android:gravity="center_horizontal">
         <com.weidongjian.meitu.wheelviewdemo.view.LoopView
             android:id="@+id/j_options3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
     </LinearLayout>
 
 </LinearLayout>