yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 19:42:17 +02:00
Code Issues Releases Wiki Activity

fg color for search results

Browse source
This commit is contained in:
Nikolay Pultsin 2014-09-26 14:23:43 +01:00
parent 4cbe38da9e
commit 32c3d04126
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
View file

@ -280,15 +280,14 @@ abstract class ZLTextViewBase extends ZLView {
final void drawWord(int x, int y, ZLTextWord word, int start, int length, boolean addHyphenationSign, ZLColor color) {
final ZLPaintContext context = getContext();
context.setTextColor(color);
if (start == 0 && length == -1) {
drawString(x, y, word.Data, word.Offset, word.Length, word.getMark(), 0);
drawString(context, x, y, word.Data, word.Offset, word.Length, word.getMark(), color, 0);
} else {
if (length == -1) {
length = word.Length - start;
}
if (!addHyphenationSign) {
drawString(x, y, word.Data, word.Offset + start, length, word.getMark(), start);
drawString(context, x, y, word.Data, word.Offset + start, length, word.getMark(), color, start);
} else {
char[] part = myWordPartArray;
if (length + 1 > part.length) {
@ -297,14 +296,14 @@ abstract class ZLTextViewBase extends ZLView {
}
System.arraycopy(word.Data, word.Offset + start, part, 0, length);
part[length] = '-';
drawString(x, y, part, 0, length + 1, word.getMark(), start);
drawString(context, x, y, part, 0, length + 1, word.getMark(), color, start);
}
}
}
private final void drawString(int x, int y, char[] str, int offset, int length, ZLTextWord.Mark mark, int shift) {
final ZLPaintContext context = getContext();
private final void drawString(ZLPaintContext context, int x, int y, char[] str, int offset, int length, ZLTextWord.Mark mark, ZLColor color, int shift) {
if (mark == null) {
context.setTextColor(color);
context.drawString(x, y, str, offset, length);
} else {
int pos = 0;
@ -323,6 +322,7 @@ abstract class ZLTextViewBase extends ZLView {
if (markStart > pos) {
int endPos = Math.min(markStart, length);
context.setTextColor(color);
context.drawString(x, y, str, offset + pos, endPos - pos);
x += context.getStringWidth(str, offset + pos, endPos - pos);
}
@ -340,6 +340,7 @@ abstract class ZLTextViewBase extends ZLView {
}
if (pos < length) {
context.setTextColor(color);
context.drawString(x, y, str, offset + pos, length - pos);
}
}