Merge pull request hackware1993#132 from otwayz/bugfix-scale-navigato…

…r-measure Fix the measure bug
BenWong927 · Oct 7, 2018 · ec20414 · ec20414
2 parents 4a380d9 + a31b0f3
commit ec20414
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.../main/java/net/lucode/hackware/magicindicatordemo/ext/navigator/ScaleCircleNavigator.java b/.../main/java/net/lucode/hackware/magicindicatordemo/ext/navigator/ScaleCircleNavigator.java
@@ -101,7 +101,11 @@ private int measureWidth(int widthMeasureSpec) {
                 break;
             case MeasureSpec.AT_MOST:
             case MeasureSpec.UNSPECIFIED:
-                result = (mCircleCount - 1) * mMinRadius * 2 + mMaxRadius * 2 + (mCircleCount - 1) * mCircleSpacing + getPaddingLeft() + getPaddingRight();
+                if (mCircleCount <= 0) {
+                    result = getPaddingLeft() + getPaddingRight();
+                } else {
+                    result = (mCircleCount - 1) * mMinRadius * 2 + mMaxRadius * 2 + (mCircleCount - 1) * mCircleSpacing + getPaddingLeft() + getPaddingRight();
+                }
                 break;
             default:
                 break;
@@ -209,7 +213,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     @Override
     public void notifyDataSetChanged() {
         prepareCirclePoints();
-        invalidate();
+        requestLayout();
     }
 
     @Override