UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

word wrapping

Browse Source
This commit is contained in:
Fournier Gabriel
2020-12-05 22:24:13 +01:00
parent 3e2b5178ed
commit 92ee632ce2
4 changed files with 123 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/reader/read_book_controller.cpp
View File

@@ -15,7 +15,22 @@ View * ReadBookController::view()
void ReadBookController::setBook(const External::Archive::File& file)
{
m_readerView.setText(reinterpret_cast<const char*>(file.data));
m_readerView.setText(reinterpret_cast<const char*>(file.data), file.dataLength);
}
bool ReadBookController::handleEvent(Ion::Events::Event event)
{
if(event == Ion::Events::Down)
{
m_readerView.nextPage();
return true;
}
if(event == Ion::Events::Up)
{
m_readerView.previousPage();
return true;
}
return false;
}
}

2
apps/reader/read_book_controller.h
View File

@@ -13,7 +13,7 @@ public:
View * view() override;
void setBook(const External::Archive::File& file);
bool handleEvent(Ion::Events::Event event) override;
private:
WordWrapTextView m_readerView;
};

111
apps/reader/word_wrap_view.cpp
View File

@@ -6,33 +6,115 @@
namespace reader
{
void WordWrapTextView::nextPage()
{
if(m_nextPageOffset >= m_length)
return;
m_pageOffset = m_nextPageOffset;
markRectAsDirty(bounds());
}
void WordWrapTextView::setText(const char* text, int length)
{
PointerTextView::setText(text);
m_length = length;
}
void WordWrapTextView::previousPage()
{
if(m_pageOffset <= 0)
return;
const int spaceWidth = m_font->stringSize(" ").width();
const char * endOfWord = text() + m_pageOffset;
const char * startOfWord = UTF8Helper::BeginningOfWord(text(), endOfWord);
KDPoint textPosition(m_frame.width() - margin, m_frame.height() - margin);
while(startOfWord>=text())
{
endOfWord = UTF8Helper::EndOfWord(startOfWord);
KDSize textSize = m_font->stringSizeUntil(startOfWord, endOfWord);
KDPoint previousTextPosition = KDPoint(textPosition.x()-textSize.width(), textPosition.y());
if(previousTextPosition.x() < margin)
{
std::cout<<"|||\n"<<std::endl;
textPosition = KDPoint(m_frame.width() - margin, textPosition.y() - textSize.height());
previousTextPosition = KDPoint(textPosition.x() - textSize.width(), textPosition.y());
}
if(textPosition.y() - textSize.height() < margin)
{
break;
}
--startOfWord;
while(startOfWord >= text() && *startOfWord == ' ')
{
previousTextPosition = KDPoint(previousTextPosition.x() - spaceWidth, previousTextPosition.y());
--startOfWord;
}
if(previousTextPosition.x() < margin)
{
previousTextPosition = KDPoint(m_frame.width() - margin, previousTextPosition.y() - textSize.height());
}
while(startOfWord >= text() && *startOfWord == '\n')
{
previousTextPosition = KDPoint(m_frame.width() - margin, previousTextPosition.y() - textSize.height());
--startOfWord;
}
if(previousTextPosition.y() - textSize.height() < margin)
{
break;
}
textPosition = previousTextPosition;
endOfWord = startOfWord;
startOfWord = UTF8Helper::BeginningOfWord(text(), endOfWord);
}
if(startOfWord == text())
m_pageOffset = 0;
else
m_pageOffset = UTF8Helper::EndOfWord(startOfWord) - text() + 1;
markRectAsDirty(bounds());
}
void WordWrapTextView::drawRect(KDContext * ctx, KDRect rect) const
{
ctx->fillRect(KDRect(0, 0, bounds().width(), bounds().height()), m_backgroundColor);
const char * current = text();
const char * startOfWord = current;
const char * endOfFile = text() + m_length;
const char * startOfWord = text() + m_pageOffset;
const char * endOfWord = UTF8Helper::EndOfWord(startOfWord);
KDPoint textPosition(0, 0);
KDPoint textPosition(margin, margin);
const int wordMaxLength = 128;
char word[wordMaxLength];
const int spaceWidth = m_font->stringSize(" ").width();
while(*startOfWord != 0)
while(startOfWord < endOfFile)
{
KDSize textSize = m_font->stringSizeUntil(startOfWord, endOfWord);
KDPoint nextTextPosition = KDPoint(textPosition.x()+textSize.width(), textPosition.y());
if(nextTextPosition.x() > m_frame.width())
if(nextTextPosition.x() > m_frame.width() - margin)
{
textPosition = KDPoint(0, textPosition.y() + textSize.height());
nextTextPosition = KDPoint(textSize.width(), textPosition.y());
textPosition = KDPoint(margin, textPosition.y() + textSize.height());
nextTextPosition = KDPoint(margin + textSize.width(), textPosition.y());
}
if(textPosition.y() + textSize.height() > m_frame.height() - margin)
{
break;
}
stringNCopy(word, wordMaxLength, startOfWord, endOfWord-startOfWord);
ctx->drawString(word, textPosition, m_font, m_textColor, m_backgroundColor);
@@ -41,18 +123,18 @@ void WordWrapTextView::drawRect(KDContext * ctx, KDRect rect) const
nextTextPosition = KDPoint(nextTextPosition.x() + spaceWidth, nextTextPosition.y());
++endOfWord;
}
if(nextTextPosition.x() > m_frame.width())
if(nextTextPosition.x() > m_frame.width() - margin)
{
nextTextPosition = KDPoint(0, nextTextPosition.y() + textSize.height());
nextTextPosition = KDPoint(margin, nextTextPosition.y() + textSize.height());
}
while(*endOfWord == '\n')
{
nextTextPosition = KDPoint(0, nextTextPosition.y() + textSize.height());
nextTextPosition = KDPoint(margin, nextTextPosition.y() + textSize.height());
++endOfWord;
}
if(nextTextPosition.y() + textSize.height() > m_frame.height())
if(nextTextPosition.y() + textSize.height() > m_frame.height() - margin)
{
break;
}
@@ -60,9 +142,8 @@ void WordWrapTextView::drawRect(KDContext * ctx, KDRect rect) const
textPosition = nextTextPosition;
startOfWord = endOfWord;
endOfWord = UTF8Helper::EndOfWord(startOfWord);
std::cout<<startOfWord<<std::endl;
}
m_nextPageOffset = startOfWord - text();
}
}

14
apps/reader/word_wrap_view.h
View File

@@ -8,11 +8,17 @@ namespace reader
class WordWrapTextView : public PointerTextView {
public:
void drawRect(KDContext * ctx, KDRect rect) const override;
void drawRect(KDContext * ctx, KDRect rect) const override;
void setText(const char*, int length);
void nextPage();
void previousPage();
protected:
int m_pageOffset = 0;
mutable int m_nextPageOffset = 0;
int m_length = 0;
static const int margin = 10;
};
}