Fix wrong scrolling (#6809)

minetest · Dec 21, 2017 · 257626ceedc986de822eac5f9708e505b41ec87d · 257626c
1 parent d04c41a
commit 257626ceedc986de822eac5f9708e505b41ec87d
Unified Split

Showing with 4 additions and 7 deletions.

+4 −7 src/gui/intlGUIEditBox.cpp
diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
@@ -1431,13 +1431,10 @@ void intlGUIEditBox::calculateScrollPos()
 	}
 	// vertical scroll position
-  
-	if (FrameRect.LowerRightCorner.Y < CurrentTextRect.LowerRightCorner.Y + VScrollPos)
-  
-		VScrollPos = CurrentTextRect.LowerRightCorner.Y - FrameRect.LowerRightCorner.Y + VScrollPos;
-  
-
-  
-	else if (FrameRect.UpperLeftCorner.Y > CurrentTextRect.UpperLeftCorner.Y + VScrollPos)
-  
-		VScrollPos = CurrentTextRect.UpperLeftCorner.Y - FrameRect.UpperLeftCorner.Y + VScrollPos;
-  
-	else
-  
-		VScrollPos = 0;
+  
+	if (FrameRect.LowerRightCorner.Y < CurrentTextRect.LowerRightCorner.Y)
+  
+		VScrollPos += CurrentTextRect.LowerRightCorner.Y - FrameRect.LowerRightCorner.Y; // scrolling downwards
+  
+	else if (FrameRect.UpperLeftCorner.Y > CurrentTextRect.UpperLeftCorner.Y)
+  
+		VScrollPos += CurrentTextRect.UpperLeftCorner.Y - FrameRect.UpperLeftCorner.Y; // scrolling upwards
 	// todo: adjust scrollbar
 	if (m_vscrollbar)