Merge pull request #6 from v-yadli/dvhhVariant

correctly display text under cursor in underdash/vertical line cursor mode
dvhh · Sep 5, 2016 · 5afd99d · 5afd99d
2 parents 2ef5f57 + ee57c30
commit 5afd99d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/emulatorview/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java b/emulatorview/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java
@@ -459,9 +459,12 @@ private void drawCursorHelper(Canvas canvas, Path path, int mode, int shift) {
         }
     }
 
-    public void setCursorStyle(int cursorStyle)
-    {
+    public void setCursorStyle(int cursorStyle) {
         mCursorStyle = cursorStyle;
     }
+
+    public int getCursorStyle(){
+        return mCursorStyle;
+    }
 }
 
diff --git a/emulatorview/src/main/java/jackpal/androidterm/emulatorview/PaintRenderer.java b/emulatorview/src/main/java/jackpal/androidterm/emulatorview/PaintRenderer.java
@@ -107,7 +107,11 @@ public void drawTextRun(Canvas canvas, float x, float y, int lineOffset,
                     canvas.drawText(text, index, countBeforeCursor, left, textOriginY, mTextPaint);
                 }
                 // Text at cursor
-                mTextPaint.setColor(mPalette[TextStyle.ciCursorForeground]);
+                // Only use invert color with BLOCK cursor.
+                // For underdash and vertical line, use normal color.
+                if(getCursorStyle() == 0) {
+                    mTextPaint.setColor(mPalette[TextStyle.ciCursorForeground]);
+                }
                 canvas.drawText(text, cursorIndex, cursorIncr, cursorX,
                         textOriginY, mTextPaint);
                 // Text after cursor