fix(ui): Fix text height issues in the conversation panel (endless-sk…

…y#10864)
TomGoodIdea · Dec 19, 2024 · 3543ed5 · 3543ed5
1 parent 08cb0b3
commit 3543ed5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/source/Dialog.cpp b/source/Dialog.cpp
@@ -374,7 +374,7 @@ void Dialog::Init(const string &message, Truncate truncate, bool canCancel, bool
 	const Sprite *top = SpriteSet::Get("ui/dialog top");
 	// If the dialog is too tall, then switch to wide mode.
 	int maxHeight = Screen::Height() * 3 / 4;
-	if(text->GetTextHeight() > maxHeight)
+	if(text->GetTextHeight(false) > maxHeight)
 	{
 		textRectSize.Y() = maxHeight;
 		isWide = true;
@@ -392,7 +392,7 @@ void Dialog::Init(const string &message, Truncate truncate, bool canCancel, bool
 		}
 	}
 	else
-		textRectSize.Y() = text->GetTextHeight();
+		textRectSize.Y() = text->GetTextHeight(false);
 
 	top = SpriteSet::Get(isWide ? "ui/dialog top wide" : "ui/dialog top");
 	const Sprite *middle = SpriteSet::Get(isWide ? "ui/dialog middle wide" : "ui/dialog middle");

diff --git a/source/TextArea.cpp b/source/TextArea.cpp
@@ -108,10 +108,10 @@ void TextArea::SetTruncate(Truncate t)
 
 
 
-int TextArea::GetTextHeight()
+int TextArea::GetTextHeight(bool trailingBreak)
 {
 	Validate();
-	return wrappedText.Height();
+	return wrappedText.Height(trailingBreak);
 }
 
 

diff --git a/source/TextArea.h b/source/TextArea.h
@@ -47,7 +47,7 @@ class TextArea : public Panel
 	void SetAlignment(Alignment a);
 	void SetTruncate(Truncate t);
 
-	int GetTextHeight();
+	int GetTextHeight(bool trailingBreak = true);
 	int GetLongestLineWidth();
 
 

diff --git a/source/text/WrappedText.cpp b/source/text/WrappedText.cpp
@@ -141,10 +141,11 @@ void WrappedText::Wrap(const char *str)
 
 
 
-// Get the height of the wrapped text.
-int WrappedText::Height() const
+/// Get the height of the wrapped text.
+/// With trailingBreak, include a paragraph break after the text.
+int WrappedText::Height(bool trailingBreak) const
 {
-	return height;
+	return height + trailingBreak * paragraphBreak;
 }
 
 

diff --git a/source/text/WrappedText.h b/source/text/WrappedText.h
@@ -67,8 +67,9 @@ class WrappedText {
 	void Wrap(const std::string &str);
 	void Wrap(const char *str);
 
-	// Get the height of the wrapped text.
-	int Height() const;
+	/// Get the height of the wrapped text.
+	/// With trailingBreak, include a paragraph break after the text.
+	int Height(bool trailingBreak = true) const;
 
 	// Return the width of the longest line of the wrapped text.
 	int LongestLineWidth() const;