evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use raw wrapWidth ptr instead of Maybe

Browse Source
This commit is contained in:
Kae 2023-07-02 00:52:36 +10:00
parent 210d6326fc
commit 17af21fd42
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/core/StarStringView.cpp
View File

@ -295,6 +295,7 @@ size_t StringView::findFirstNotOf(StringView pattern, size_t beg) const {
} }
size_t StringView::findNextBoundary(size_t index, bool backwards) const { size_t StringView::findNextBoundary(size_t index, bool backwards) const {
//TODO: Make this faster.
size_t mySize = size(); size_t mySize = size();
starAssert(index <= mySize); starAssert(index <= mySize);
if (!backwards && (index == mySize)) if (!backwards && (index == mySize))

6
source/rendering/StarTextPainter.cpp
View File

@ -206,7 +206,7 @@ int TextPainter::stringWidth(StringView s) {
return width; return width;
} }
bool TextPainter::processWrapText(StringView text, Maybe<unsigned> wrapWidth, WrapTextCallback textFunc) { bool TextPainter::processWrapText(StringView text, unsigned* wrapWidth, WrapTextCallback textFunc) {
String font = m_renderSettings.font, setFont = font; String font = m_renderSettings.font, setFont = font;
m_fontTextureGroup.switchFont(font); m_fontTextureGroup.switchFont(font);
int lines = 0; int lines = 0;
@ -351,7 +351,7 @@ List<StringView> TextPainter::wrapTextViews(StringView s, Maybe<unsigned> wrapWi
return true; return true;
}; };
processWrapText(s, wrapWidth, textCallback); processWrapText(s, wrapWidth.ptr(), textCallback);
if (active) if (active)
views.push_back(current); views.push_back(current);
@ -374,7 +374,7 @@ StringList TextPainter::wrapText(StringView s, Maybe<unsigned> wrapWidth) {
return true; return true;
}; };
processWrapText(s, wrapWidth, textCallback); processWrapText(s, wrapWidth.ptr(), textCallback);
if (!current.empty()) if (!current.empty())
result.append(move(current)); result.append(move(current));

2
source/rendering/StarTextPainter.hpp
View File

@ -68,7 +68,7 @@ public:
typedef function<bool(StringView, int)> WrapTextCallback; typedef function<bool(StringView, int)> WrapTextCallback;
bool processWrapText(StringView s, Maybe<unsigned> wrapWidth, WrapTextCallback textFunc); bool processWrapText(StringView s, unsigned* wrapWidth, WrapTextCallback textFunc);
List<StringView> wrapTextViews(StringView s, Maybe<unsigned> wrapWidth); List<StringView> wrapTextViews(StringView s, Maybe<unsigned> wrapWidth);
StringList wrapText(StringView s, Maybe<unsigned> wrapWidth); StringList wrapText(StringView s, Maybe<unsigned> wrapWidth);