From 112943ead1fcf016104f93e363b841e6282fad6a Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sat, 8 Jul 2023 19:10:59 -0700
Subject: [PATCH] Prog.

---
 src/dawn/games/vn/components/VNTextboxScroller.cpp | 2 +-
 src/dawn/scene/components/ui/text/UILabel.cpp      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/dawn/games/vn/components/VNTextboxScroller.cpp b/src/dawn/games/vn/components/VNTextboxScroller.cpp
index 15f06673..dd9c6e29 100644
--- a/src/dawn/games/vn/components/VNTextboxScroller.cpp
+++ b/src/dawn/games/vn/components/VNTextboxScroller.cpp
@@ -29,7 +29,7 @@ void VNTextboxScroller::onStart() {
   x();
 
   useEvent(x, this->label->eventTextChanged);
-  // useEffect(x, visibleLines);
+  useEffect(x, visibleLines);
 
   useEvent([&](float_t delta){
     auto game = this->getGame();
diff --git a/src/dawn/scene/components/ui/text/UILabel.cpp b/src/dawn/scene/components/ui/text/UILabel.cpp
index 015f0db1..4f896f01 100644
--- a/src/dawn/scene/components/ui/text/UILabel.cpp
+++ b/src/dawn/scene/components/ui/text/UILabel.cpp
@@ -108,6 +108,8 @@ void UILabel::rebufferQuads(const std::vector<struct UILabelText> newTexts) {
   quadCountTotal = 0;
   std::vector<struct UILabelText> realNewTexts;
 
+  float_t maxWidth = this->width;
+
   // Reset
   lines.clear();
 
@@ -236,8 +238,8 @@ void UILabel::rebufferQuads(const std::vector<struct UILabelText> newTexts) {
       if(
         ch != ' ' &&
         lastSpaceCharacter != -1 &&
-        this->width > charInfo.bitmapSize.x &&
-        (position.x + charInfo.advanceX) > this->width
+        maxWidth > charInfo.bitmapSize.x &&
+        (position.x + charInfo.advanceX) > maxWidth
       ) {
         // Basically this rewinds everything we've done to the last space char,
         // changes it to a newline, and then moves the position along.