YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prog.

Browse Source
This commit is contained in:
Dominic Masters
2023-07-08 19:10:59 -07:00
parent 7b7e4af01e
commit 112943ead1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dawn/games/vn/components/VNTextboxScroller.cpp
View File

@ -29,7 +29,7 @@ void VNTextboxScroller::onStart() {
x(); x();
useEvent(x, this->label->eventTextChanged); useEvent(x, this->label->eventTextChanged);
// useEffect(x, visibleLines); useEffect(x, visibleLines);
useEvent([&](float_t delta){ useEvent([&](float_t delta){
auto game = this->getGame(); auto game = this->getGame();

6
src/dawn/scene/components/ui/text/UILabel.cpp
View File

@ -108,6 +108,8 @@ void UILabel::rebufferQuads(const std::vector<struct UILabelText> newTexts) {
quadCountTotal = 0; quadCountTotal = 0;
std::vector<struct UILabelText> realNewTexts; std::vector<struct UILabelText> realNewTexts;
float_t maxWidth = this->width;
// Reset // Reset
lines.clear(); lines.clear();
@ -236,8 +238,8 @@ void UILabel::rebufferQuads(const std::vector<struct UILabelText> newTexts) {
if( if(
ch != ' ' && ch != ' ' &&
lastSpaceCharacter != -1 && lastSpaceCharacter != -1 &&
this->width > charInfo.bitmapSize.x && maxWidth > charInfo.bitmapSize.x &&
(position.x + charInfo.advanceX) > this->width (position.x + charInfo.advanceX) > maxWidth
) { ) {
// Basically this rewinds everything we've done to the last space char, // Basically this rewinds everything we've done to the last space char,
// changes it to a newline, and then moves the position along. // changes it to a newline, and then moves the position along.