From: number Zero <silverunicorn2011@yandex.ru>
Date: Sun, 24 Dec 2017 21:54:43 +0000 (+0300)
Subject: Fix dancing text
X-Git-Tag: 5.0.0~669
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=189daf87a00d1ec0d8444d2664ca45da6c53e87d;p=oweals%2Fminetest.git

Fix dancing text
---

diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
index f5ea5b47f..8b0f10721 100644
--- a/src/gui/intlGUIEditBox.cpp
+++ b/src/gui/intlGUIEditBox.cpp
@@ -1430,6 +1430,9 @@ void intlGUIEditBox::calculateScrollPos()
 		// todo: adjust scrollbar
 	}
 
+	if (!WordWrap && !MultiLine)
+		return;
+
 	// vertical scroll position
 	if (FrameRect.LowerRightCorner.Y < CurrentTextRect.LowerRightCorner.Y)
 		VScrollPos += CurrentTextRect.LowerRightCorner.Y - FrameRect.LowerRightCorner.Y; // scrolling downwards