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

[DEV] add line at 80 char limitation and set tab at 8 char (not configurable for now)

Browse Source
This commit is contained in:
Edouard DUPIN 2013-09-19 09:21:58 +02:00
parent 6459d11737
commit 8af2e7902d
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sources/appl/Buffer/BufferText.cpp
View File

@ -405,8 +405,8 @@ int32_t BufferText::Display(ewol::Text& OOText,
if (currentChar!='\n') {
selectColor = myColor;
HLColor = m_EdnBuf.GetElementColorAtPosition(m_displayLocalSyntax, iii);
if (NULL != HLColor) {
if (NULL != HLColor->patern) {
if (HLColor != NULL) {
if (HLColor->patern != NULL) {
selectColor = HLColor->patern->GetColor();
}
}
@ -419,12 +419,12 @@ int32_t BufferText::Display(ewol::Text& OOText,
OOText.SetColorBg(selectColor->GetBG() );
} else {
if(false == selectColor->HaveBg()) {
if( (uniChar_t)' ' == currentChar
&& true == globals::IsSetDisplaySpaceChar() )
if( currentChar == ' '
&& globals::IsSetDisplaySpaceChar() == true )
{
OOText.SetColorBg(myColorSpace);
} else if( '\t' == currentChar
&& true == globals::IsSetDisplayTabChar() )
} else if( currentChar == '\t'
&& globals::IsSetDisplayTabChar() == true )
{
OOText.SetColorBg(myColorTab);
}
@ -484,6 +484,13 @@ int32_t BufferText::Display(ewol::Text& OOText,
OOText.SetColorBg(ColorizeManager::Get(COLOR_CODE_CURSOR));
OOText.PrintCursor(ewol::GetCurrentSpecialKeyStatus().IsSetInsert());
}
// Display the 80 colomn limit line :
OOText.SetClippingMode(false);
OOText.GetDrawing().SetThickness(2);
OOText.GetDrawing().SetColor(etk::Color<>(200,200,0,255));
OOText.GetDrawing().SetPos(vec2((float)((nbColoneForLineNumber+80)*tmpLetterSize.x()), 0.0f));
OOText.GetDrawing().LineRel(vec2(0.0f, 2500.0f));
// set the maximum size for the display ...
SetMaximumSize(maxSize);
int64_t stopTime2 = ewol::GetTime();

11
sources/appl/Buffer/EdnBuf/EdnBuf.cpp
View File

@ -34,7 +34,8 @@ static const char *ControlCodeTable[32] = {
*/
EdnBuf::EdnBuf(void)
{
m_tabDist = 4;
// TODO : Set it configurable !!!
m_tabDist = 8;
m_useTabs = true;
// Current selection
@ -501,7 +502,7 @@ int32_t EdnBuf::GetExpandedChar(int32_t &pos, int32_t indent, char outUTF8[MAX_E
}
// Otherwise, just return the character
if (false ==m_isUtf8) {
if (m_isUtf8 == false) {
convertIsoToUtf8(m_charsetType, c, outUTF8);
pos++;
} else {
@ -514,10 +515,10 @@ int32_t EdnBuf::GetExpandedChar(int32_t &pos, int32_t indent, char outUTF8[MAX_E
bool baseValid;
unicode::Utf8_SizeElement(tmpString, 6 , size, baseValid);
currentChar = 0; // TODO : Set UNICODE char ...
if (true == baseValid) {
if (baseValid == true) {
char *tmp = outUTF8;
for (int32_t k=0; k<size; k++) {
*tmp++ = tmpString[k];
for (int32_t kkk=0; kkk<size; kkk++) {
*tmp++ = tmpString[kkk];
}
*tmp = '\0';
} else {