HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Text background correction done

Browse Source
This commit is contained in:
Edouard Dupin 2012-01-17 09:39:38 +01:00
parent c61876b919
commit 9c9eac7d37
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jni/edn/Buffer/BufferText.cpp
View File

@ -432,19 +432,18 @@ int32_t BufferText::Display(ewol::OObject2DTextColored* OOText, ewol::OObject2DC
if( ' ' == currentChar if( ' ' == currentChar
&& true == globals::IsSetDisplaySpaceChar() ) && true == globals::IsSetDisplaySpaceChar() )
{ {
//selectColor = myColorSel; selectColor = myColorSel;
//SpaceText(color_ts & SelectColor, int32_t x, int32_t y,int32_t nbChar)
if( true == selHave if( true == selHave
&& selStart <= iii && selStart <= iii
&& selEnd > iii) && selEnd > iii)
{ {
//drawer.SpaceText(myColorSel->GetBG(), pixelX ,y , 1); OOColored->SetColor(myColorSel->GetBG());
} else if (true == selectColor->HaveBg()) { } else if (true == selectColor->HaveBg()) {
//drawer.SpaceText(selectColor->GetBG(), pixelX ,y , 1); OOColored->SetColor(selectColor->GetBG());
} else { } else {
//drawer.SpaceText(myColorSpace, pixelX ,y , 1); OOColored->SetColor(myColorSpace);
} }
OOColored->Rectangle( pixelX, y, letterWidth, letterHeight);
} else if( '\t' == currentChar } else if( '\t' == currentChar
&& true == globals::IsSetDisplaySpaceChar() ) && true == globals::IsSetDisplaySpaceChar() )
{ {
@ -452,12 +451,13 @@ int32_t BufferText::Display(ewol::OObject2DTextColored* OOText, ewol::OObject2DC
&& selStart <= iii && selStart <= iii
&& selEnd > iii) && selEnd > iii)
{ {
//drawer.SpaceText(myColorSel->GetBG(), pixelX ,y , strlen(tmpDisplayOfset)); OOColored->SetColor(myColorSel->GetBG());
} else if (true == selectColor->HaveBg()) { } else if (true == selectColor->HaveBg()) {
//drawer.SpaceText(selectColor->GetBG(), pixelX ,y , strlen(tmpDisplayOfset)); OOColored->SetColor(selectColor->GetBG());
} else { } else {
//drawer.SpaceText(myColorTab, pixelX ,y , strlen(tmpDisplayOfset)); OOColored->SetColor(myColorTab);
} }
OOColored->Rectangle( pixelX, y, letterWidth*strlen(tmpDisplayOfset), letterHeight);
} else { } else {
if( true == selHave if( true == selHave
&& selStart <= iii && selStart <= iii
@ -465,14 +465,18 @@ int32_t BufferText::Display(ewol::OObject2DTextColored* OOText, ewol::OObject2DC
{ {
selectColor = myColorSel; selectColor = myColorSel;
} }
OOColored->SetColor(selectColor->GetBG());
OOText->SetColor(selectColor->GetFG());
if (currentChar <= 0x7F) { if (currentChar <= 0x7F) {
//drawer.Text(selectColor, pixelX ,y, tmpDisplayOfset);
OOText->SetColor(selectColor->GetFG());
OOText->TextAdd(pixelX, y, tmpDisplayOfset, -1); OOText->TextAdd(pixelX, y, tmpDisplayOfset, -1);
if (true == selectColor->HaveBg() ) {
OOColored->Rectangle( pixelX, y, letterWidth*strlen(tmpDisplayOfset), letterHeight);
}
} else { } else {
//drawer.Text(selectColor, pixelX ,y, displayChar);
OOText->SetColor(selectColor->GetFG());
OOText->TextAdd(pixelX, y, displayChar, -1); OOText->TextAdd(pixelX, y, displayChar, -1);
if (true == selectColor->HaveBg() ) {
OOColored->Rectangle( pixelX, y, letterWidth*strlen(tmpDisplayOfset), letterHeight);
}
} }
} }
xx+=widthToDisplay; xx+=widthToDisplay;