Fix: cross set padding bug

whilu · whilu · commit da1318dbbbb3 · 2016-11-09T09:18:31.000+08:00
diff --git a/androidtagview/src/main/java/co/lujun/androidtagview/TagContainerLayout.java b/androidtagview/src/main/java/co/lujun/androidtagview/TagContainerLayout.java
@@ -139,8 +139,8 @@ public class TagContainerLayout extends ViewGroup {
     /** The cross area width(default 0dp) */
     private float mCrossAreaWidth = 0.0f;
 
-    /** The padding of the cross area(default 15dp)*/
-    private float mCrossAreaPadding = 15.0f;
+    /** The padding of the cross area(default 10dp)*/
+    private float mCrossAreaPadding = 10.0f;
 
     /** The cross icon color(default black)*/
     private int mCrossColor = Color.BLACK;
@@ -1126,7 +1126,7 @@ public float getCrossAreaPadding() {
     }
 
     /**
-     * Set TagView cross area padding, default 15dp.
+     * Set TagView cross area padding, default 10dp.
      * @param mCrossAreaPadding
      */
     public void setCrossAreaPadding(float mCrossAreaPadding) {
diff --git a/androidtagview/src/main/java/co/lujun/androidtagview/TagView.java b/androidtagview/src/main/java/co/lujun/androidtagview/TagView.java
@@ -198,6 +198,10 @@ protected void onDraw(Canvas canvas) {
         mPaint.setStyle(Paint.Style.FILL);
         mPaint.setColor(mTextColor);
 
+        if (isEnableCross()){
+            mCrossAreaPadding = mCrossAreaPadding > getHeight() / 2 ? getHeight() / 2 : mCrossAreaPadding;
+        }
+
         if (mTextDirection == View.TEXT_DIRECTION_RTL){
             float tmpX = (isEnableCross() ? getWidth() + getHeight() : getWidth()) / 2 + fontW / 2;
             for (char c : mAbstractText.toCharArray()) {
@@ -216,12 +220,13 @@ protected void onDraw(Canvas canvas) {
             if (isEnableCross()){
                 mCrossLT.set((int)(getWidth() - getHeight() + mCrossAreaPadding),
                         (int)(mCrossAreaPadding));
-                Log.d("debugs", "" + mCrossAreaPadding);
                 mCrossLB.set((int)(getWidth() - getHeight() + mCrossAreaPadding),
                         (int)(getHeight() - mCrossAreaPadding));
                 mCrossRT.set((int)(getWidth() - mCrossAreaPadding), (int)(mCrossAreaPadding));
                 mCrossRB.set((int)(getWidth() - mCrossAreaPadding),
                         (int)(getHeight() - mCrossAreaPadding));
+                Log.d("debugs", "getWidth() = " + getWidth() + ", getHeight()=" + getHeight()
+                        + ", mCrossAreaPadding=" +mCrossAreaPadding + ", mCrossLT.x=" + mCrossLT.x);
             }
             canvas.drawText(mAbstractText,
                     (isEnableCross() ? getWidth() - getHeight() : getWidth()) / 2 - fontW / 2,
diff --git a/sample/src/main/res/layout/content_main.xml b/sample/src/main/res/layout/content_main.xml
@@ -41,7 +41,6 @@
                 app:tag_theme="pure_teal"
                 app:vertical_interval="10dp"
                 app:tag_enable_cross="true"
-                app:tag_cross_area_padding="25dp"
                 app:tag_cross_width="40dp"/>
 
             <LinearLayout
