Fixed #616: Support multiple newlines in Text

PurpleKingdomGames · Nov 18, 2023 · 93accaa · 93accaa
1 parent 28b62e0
commit 93accaa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/indigo/indigo/src/main/scala/indigo/shared/BoundaryLocator.scala b/indigo/indigo/src/main/scala/indigo/shared/BoundaryLocator.scala
@@ -137,12 +137,17 @@ final class BoundaryLocator(
 
   def textLineBounds(lineText: String, fontInfo: FontInfo): Rectangle =
     QuickCache(s"""textline-${fontInfo.fontKey}-$lineText""") {
-      lineText
-        .toCharArray()
-        .map(c => fontInfo.findByCharacter(c).bounds)
-        .foldLeft(Rectangle.zero) { (acc, curr) =>
-          Rectangle(0, 0, acc.width + curr.width, Math.max(acc.height, curr.height))
-        }
+      if lineText.isEmpty then {
+        val b = fontInfo.findByCharacter(' ').bounds
+        b.withSize(Size(0, b.height))
+      } else {
+        lineText
+          .toCharArray()
+          .map(c => fontInfo.findByCharacter(c).bounds)
+          .foldLeft(Rectangle.zero) { (acc, curr) =>
+            Rectangle(0, 0, acc.width + curr.width, Math.max(acc.height, curr.height))
+          }
+      }
     }
 
   def textAsLinesWithBounds(text: String, fontKey: FontKey): Batch[TextLine] =

diff --git a/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxGame.scala b/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxGame.scala
@@ -46,7 +46,7 @@ object SandboxGame extends IndigoGame[SandboxBootData, SandboxStartupData, Sandb
   val viewportHeight: Int     = gameHeight * magnificationLevel // 256
 
   def initialScene(bootData: SandboxBootData): Option[SceneName] =
-    Some(LineReflectionScene.name)
+    Some(OriginalScene.name)
 
   def scenes(bootData: SandboxBootData): NonEmptyList[Scene[SandboxStartupData, SandboxGameModel, SandboxViewModel]] =
     NonEmptyList(

diff --git a/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxView.scala b/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxView.scala
@@ -96,7 +96,7 @@ object SandboxView:
     Batch(
       Text("AB!\n!C", 2, 2, 5, Fonts.fontKey, SandboxAssets.fontMaterial.withAlpha(0.5)).alignLeft,
       Text("AB!\n!C", 100, 2, 5, Fonts.fontKey, SandboxAssets.fontMaterial.withAlpha(0.5)).alignCenter,
-      Text("AB!\n!C", 200, 2, 5, Fonts.fontKey, SandboxAssets.fontMaterial.withAlpha(0.5)).alignRight
+      Text("AB!\n\n!C", 200, 2, 5, Fonts.fontKey, SandboxAssets.fontMaterial.withAlpha(0.5)).alignRight
         .withEventHandler {
           case (txt, MouseEvent.Click(pt)) if bl.bounds(txt).contains(pt) =>
             println("Clicked me!")