Merge pull request #4 from OpenCraft/fix-ellipsis-rule

Fixed rule that decides if Ellipsis should appear
OpenCraft · May 30, 2018 · 641adf5 · 641adf5
2 parents 44e066a + 1c45d07
commit 641adf5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -26,6 +26,7 @@
 import android.text.TextWatcher;
 import android.text.method.TransformationMethod;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -1420,7 +1421,7 @@ protected void onDraw(@NonNull Canvas canvas) {
         }
 
         // draw the bottom ellipsis
-        if (hasFocus() && singleLineEllipsis && getScrollX() != 0) {
+        if (hasFocus() && singleLineEllipsis && textReachedEndOfEditText()) {
             paint.setColor(isInternalValid() ? primaryColor : errorColor);
             float startY = lineStartY + bottomSpacing;
             int ellipsisStartX;
@@ -1439,6 +1440,10 @@ protected void onDraw(@NonNull Canvas canvas) {
         super.onDraw(canvas);
     }
 
+    private boolean textReachedEndOfEditText() {
+        return getPaint().measureText(getText().toString()) > getWidth();
+    }
+
     private boolean shouldDrawBottomText() {
 
         if (tempErrorText != null) {

diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -172,6 +172,23 @@
                 android:text="Touch The Ellipsis And See What Happens. Touch The Ellipsis And See What Happens."
                 app:met_singleLineEllipsis="true" />
 
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="app:met_singleLineEllipsis=&quot;true&quot;\n#singLineEllipsis will force android:singleLine to true# Gravity"
+                android:textColor="#888888"
+                android:textSize="14sp" />
+
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/singleLineEllipsisEte"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:hint="Single Line Ellipsis"
+                android:text="Touch The Ellipsis And See What Happens. Touch The Ellipsis And See What Happens."
+                app:met_singleLineEllipsis="true" />
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"