移除label默认宽高

Jay-Goo · Feb 5, 2018 · ac5e2df · ac5e2df
1 parent 73e4ded
commit ac5e2df
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/library/src/main/java/cn/iwgang/simplifyspan/customspan/CustomLabelSpan.java b/library/src/main/java/cn/iwgang/simplifyspan/customspan/CustomLabelSpan.java
@@ -116,7 +116,7 @@ public int getSize(Paint paint, CharSequence text, int start, int end, Paint.Fon
 
     @Override
     public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, Paint paint) {
-        float finalUnitHeight = bottom - top;
+        float finalUnitHeight = 2*bottom - top;
         float bgTop = bottom - finalUnitHeight;
         if (isClickable && isSelected && pressBgColor != 0) {
             // click background
@@ -216,11 +216,13 @@ private float initFinalWidth(Paint paint) {
 
             int labelBgWidth = mSpecialLabelUnit.getLabelBgWidth();
             mSpecialTextWidth = paint.measureText(mSpecialText, 0, mSpecialText.length());
-            if (labelBgWidth > 0 && labelBgWidth > mSpecialTextWidth) {
-                mFinalWidth = labelBgWidth;
-            } else {
-                mFinalWidth = mSpecialTextWidth + mPaddingLeft + mPaddingRight;
-            }
+//            if (labelBgWidth > 0 && labelBgWidth > mSpecialTextWidth) {
+//                mFinalWidth = labelBgWidth;
+//            } else {
+//                mFinalWidth = mSpecialTextWidth + mPaddingLeft + mPaddingRight;
+//            }
+
+            mFinalWidth = labelBgWidth;
         }
 
         return mFinalWidth;
@@ -244,12 +246,12 @@ private float initFinalHeight(Paint paint) {
             mSpecialTextHeight = specialTextRect.height();
             mSpecialTextBaselineOffset = specialTextRect.bottom;
 
-            if (labelBgHeight > 0 && labelBgHeight > mSpecialTextHeight && labelBgHeight <= mLineTextHeight) {
-                mFinalHeight = labelBgHeight;
-            } else {
-                mFinalHeight = mSpecialTextHeight + mPaddingTop + mPaddingBottom;
-            }
-
+//            if (labelBgHeight > 0 && labelBgHeight > mSpecialTextHeight && labelBgHeight <= mLineTextHeight) {
+//                mFinalHeight = labelBgHeight;
+//            } else {
+//                mFinalHeight = mSpecialTextHeight + mPaddingTop + mPaddingBottom;
+//            }
+            mFinalHeight = labelBgHeight;
             if (mFinalHeight > mLineTextHeight) {
                 mFinalHeight = mLineTextHeight;
             }