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

[DEBUG] Correct some remove data in buffer error

Browse Source
This commit is contained in:
Edouard DUPIN 2012-12-04 21:13:18 +01:00
parent fcb060c416
commit 7981763e4d
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,8 +309,6 @@ int32_t BufferText::Display(ewol::Text& OOText,
int32_t offsetX, int32_t offsetY, int32_t offsetX, int32_t offsetY,
int32_t sizeX, int32_t sizeY) int32_t sizeX, int32_t sizeY)
{ {
int32_t selStart, selEnd, selRectStart, selRectEnd; int32_t selStart, selEnd, selRectStart, selRectEnd;
bool selIsRect; bool selIsRect;
int32_t selHave; int32_t selHave;
@ -328,7 +326,7 @@ int32_t BufferText::Display(ewol::Text& OOText,
int32_t displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, displayStartLineId); int32_t displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, displayStartLineId);
vec2 maxSize; vec2 maxSize;
maxSize.x = 0.0; maxSize.x = 0.0;
maxSize.y = m_EdnBuf.NumberOfLines() * letterHeight; maxSize.y = m_EdnBuf.NumberOfLines() * tmpLetterSize.y;
int32_t nbColoneForLineNumber = GetLineNumberNumberOfElement(); int32_t nbColoneForLineNumber = GetLineNumberNumberOfElement();
// update the number of element that can be displayed // update the number of element that can be displayed

10
sources/appl/Buffer/BufferText.h
View File

@ -56,13 +56,13 @@ class BufferText
bool m_updatePositionRequested; //!< if a position xhange in the windows ... bool m_updatePositionRequested; //!< if a position xhange in the windows ...
vec2 m_maximumSize; //!< current maxSize of the buffer vec2 m_maximumSize; //!< current maxSize of the buffer
public: public:
void SetModify(bool status); void SetModify(bool status);
virtual vec2 GetBorderSize(void); virtual vec2 GetBorderSize(void);
void RequestUpdateOfThePosition(void) { m_updatePositionRequested = true; }; void RequestUpdateOfThePosition(void) { m_updatePositionRequested = true; };
void SetMaximumSize(vec2 maxSize) { m_maximumSize = maxSize; }; void SetMaximumSize(vec2 maxSize) { m_maximumSize = maxSize; };
bool NeedToUpdateDisplayPosition(void); bool NeedToUpdateDisplayPosition(void);
vec2 GetMaxSize(void) { return m_maximumSize; }; vec2 GetMaxSize(void) { return m_maximumSize; };
bool IsModify(void); bool IsModify(void);
public: public:
etk::FSNode GetFileName(void) etk::FSNode GetFileName(void)
{ {

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

@ -802,7 +802,7 @@ int32_t EdnBuf::CountLines(int32_t startPos, int32_t endPos)
int32_t EdnBuf::CountLines(etk::Vector<int8_t> &data) int32_t EdnBuf::CountLines(etk::Vector<int8_t> &data)
{ {
int32_t lineCount = 0; int32_t lineCount = 0;
for(int32_t iii=0 ; iii<m_data.Size() ; iii++ ) { for(int32_t iii=0 ; iii<data.Size() ; iii++ ) {
if ('\n' == data[iii]) { if ('\n' == data[iii]) {
lineCount++; lineCount++;
} }
@ -1174,8 +1174,6 @@ void EdnBuf::eventModification(int32_t pos, int32_t nInserted, etk::Vector<int8_
} else { } else {
APPL_INFO("(pos="<<pos<<", nDeleted="<<deletedText.Size()<<", nInserted=" << nInserted << ", deletedText=\"xx???xx\");"); APPL_INFO("(pos="<<pos<<", nDeleted="<<deletedText.Size()<<", nInserted=" << nInserted << ", deletedText=\"xx???xx\");");
// update the number of lines : // update the number of lines :
//CountNumberOfLines(); //==> not efficent methode ...
// ==> better methode : just update the number of line added and removed ...
//APPL_INFO(" add=" << CountLines(pos, pos+nInserted) << " lines | remove="<< CountLines(deletedText) << " lines"); //APPL_INFO(" add=" << CountLines(pos, pos+nInserted) << " lines | remove="<< CountLines(deletedText) << " lines");
m_nbLine += CountLines(pos, pos+nInserted) - CountLines(deletedText); m_nbLine += CountLines(pos, pos+nInserted) - CountLines(deletedText);
// Update histories // Update histories