From 7981763e4d74e86b2a8c2a8aa80e4562054397ec Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 4 Dec 2012 21:13:18 +0100 Subject: [PATCH] [DEBUG] Correct some remove data in buffer error --- sources/appl/Buffer/BufferText.cpp | 4 +--- sources/appl/Buffer/BufferText.h | 10 +++++----- sources/appl/Buffer/EdnBuf/EdnBuf.cpp | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sources/appl/Buffer/BufferText.cpp b/sources/appl/Buffer/BufferText.cpp index 7d0caca..9eb929f 100644 --- a/sources/appl/Buffer/BufferText.cpp +++ b/sources/appl/Buffer/BufferText.cpp @@ -309,8 +309,6 @@ int32_t BufferText::Display(ewol::Text& OOText, int32_t offsetX, int32_t offsetY, int32_t sizeX, int32_t sizeY) { - - int32_t selStart, selEnd, selRectStart, selRectEnd; bool selIsRect; int32_t selHave; @@ -328,7 +326,7 @@ int32_t BufferText::Display(ewol::Text& OOText, int32_t displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, displayStartLineId); vec2 maxSize; maxSize.x = 0.0; - maxSize.y = m_EdnBuf.NumberOfLines() * letterHeight; + maxSize.y = m_EdnBuf.NumberOfLines() * tmpLetterSize.y; int32_t nbColoneForLineNumber = GetLineNumberNumberOfElement(); // update the number of element that can be displayed diff --git a/sources/appl/Buffer/BufferText.h b/sources/appl/Buffer/BufferText.h index 5698460..79df071 100644 --- a/sources/appl/Buffer/BufferText.h +++ b/sources/appl/Buffer/BufferText.h @@ -56,13 +56,13 @@ class BufferText bool m_updatePositionRequested; //!< if a position xhange in the windows ... vec2 m_maximumSize; //!< current maxSize of the buffer public: - void SetModify(bool status); - virtual vec2 GetBorderSize(void); + void SetModify(bool status); + virtual vec2 GetBorderSize(void); void RequestUpdateOfThePosition(void) { m_updatePositionRequested = true; }; void SetMaximumSize(vec2 maxSize) { m_maximumSize = maxSize; }; - bool NeedToUpdateDisplayPosition(void); - vec2 GetMaxSize(void) { return m_maximumSize; }; - bool IsModify(void); + bool NeedToUpdateDisplayPosition(void); + vec2 GetMaxSize(void) { return m_maximumSize; }; + bool IsModify(void); public: etk::FSNode GetFileName(void) { diff --git a/sources/appl/Buffer/EdnBuf/EdnBuf.cpp b/sources/appl/Buffer/EdnBuf/EdnBuf.cpp index b2d8bfa..1aa8c48 100644 --- a/sources/appl/Buffer/EdnBuf/EdnBuf.cpp +++ b/sources/appl/Buffer/EdnBuf/EdnBuf.cpp @@ -802,7 +802,7 @@ int32_t EdnBuf::CountLines(int32_t startPos, int32_t endPos) int32_t EdnBuf::CountLines(etk::Vector &data) { int32_t lineCount = 0; - for(int32_t iii=0 ; iii 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"); m_nbLine += CountLines(pos, pos+nInserted) - CountLines(deletedText); // Update histories