Skip to content

Commit

Permalink
优化tab的绘制
Browse files Browse the repository at this point in the history
  • Loading branch information
nirenr committed Jun 30, 2016
1 parent 80e1f46 commit 09a5a39
Showing 1 changed file with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@ public class FreeScrollingTextField extends View

private Typeface _italicTypeface=Typeface.create(Typeface.DEFAULT, Typeface.ITALIC);

private Pair _caretSpan=new Pair(0,0);
private Pair _caretSpan=new Pair(0, 0);


public FreeScrollingTextField(Context context){
super(context);
_hDoc = new DocumentProvider(this);
Expand Down Expand Up @@ -668,6 +669,7 @@ else if (currIndex == _caretPosition){
}

char c = row.charAt(i);

if (_fieldController.inSelectionRange(currIndex)){
paintX += drawSelectedText(canvas, c, paintX, paintY);
}
Expand Down Expand Up @@ -713,7 +715,7 @@ private int drawChar(Canvas canvas, char c, int paintX, int paintY){
int originalColor = _brush.getColor();
int charWidth = getAdvance(c,paintX);
if (paintX > getScrollX() || (paintX) < (getScrollX() + getContentWidth()))

switch(c){
case ' ':
if(_showNonPrinting){
Expand Down Expand Up @@ -742,8 +744,8 @@ private int drawChar(Canvas canvas, char c, int paintX, int paintY){
_brush.setColor(originalColor);
}
else{
int i=(paintX-_leftOffset)/getAdvance(' ')%_tabLength;
charWidth-=getAdvance(' ')*i;
//int i=(paintX-_leftOffset)/getAdvance(' ')%_tabLength;
//charWidth-=getAdvance(' ')*i;
}
break;

Expand Down Expand Up @@ -1022,7 +1024,7 @@ private int makeCharColumnVisible(int charOffset){
int charLeft = visibleRange.getFirst();
int charRight = visibleRange.getSecond();

if (charRight-_leftOffset > (getScrollX() + getContentWidth())){
if (charRight > (getScrollX() + getContentWidth())){
scrollBy = charRight - getScrollX() - getContentWidth();
}

Expand Down

0 comments on commit 09a5a39

Please sign in to comment.