Fix #1663 - Game se cuelga al lanzar error con más de un salto de línea

uqbar-project · Jul 1, 2019 · 74f9b4d · 74f9b4d
1 parent 1e59b7d
commit 74f9b4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/VisualComponent.xtend b/org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/VisualComponent.xtend
@@ -66,7 +66,6 @@ abstract class VisualComponent {
 			this.addMessage(end, color)
 			return 
 		}
-
 		balloonMessages.add(new BalloonMessage(message, color))
 	}
 

diff --git a/org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/gameboard/Window.xtend b/org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/gameboard/Window.xtend
@@ -81,8 +81,10 @@ class Window {
 		var plusWidth = 0	
 		glyphLayout.reset
 		this.setText(newText, baseWidth, color)
-
-		while (glyphLayout.height > 29) {
+
+		var previousHeight = 0f
+		while (glyphLayout.height > 29 && previousHeight !== glyphLayout.height) {
+			previousHeight = glyphLayout.height
 			glyphLayout.reset
 			plusWidth += 10
 			this.setText(newText, baseWidth + plusWidth, color)
@@ -103,6 +105,7 @@ class Window {
 			patchIndex++
 			textX = 5
 		}
+
 		val x = xInPixels + (DELTA_TO_VISUAL_COMPONENT * adjustmentX)
 		var adjustmentY = 1
 		var textY = 0