correctly display text under cursor in underdash/vertical line cursor…

… mode.
dvhh · Aug 15, 2016 · 103b9c5 · 103b9c5
1 parent 22a9cc1
commit 103b9c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/emulatorview/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java b/emulatorview/src/main/java/jackpal/androidterm/emulatorview/BaseTextRenderer.java
@@ -317,7 +317,7 @@ abstract class BaseTextRenderer implements TextRenderer {
     private Bitmap mCursorBitmap;
     private Bitmap mWorkBitmap;
     private int mCursorBitmapCursorMode = -1;
-    private int mCursorStyle = 0;
+    protected int mCursorStyle = 0;
 
     public BaseTextRenderer(ColorScheme scheme) {
         if (scheme == null) {

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(mCursorStyle == 0) {
+                    mTextPaint.setColor(mPalette[TextStyle.ciCursorForeground]);
+                }
                 canvas.drawText(text, cursorIndex, cursorIncr, cursorX,
                         textOriginY, mTextPaint);
                 // Text after cursor