TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some positioning bugs

Browse source 
Fixed some cursor positioning bugs in the MLTextCtrl.

Also removed parameters from function that doesn't actually take
parameters.
This commit is contained in:
Nathan Bowhay 2015-02-02 12:17:38 -08:00
parent 722008570a
commit b11bc8e93a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gui/controls/guiMLTextCtrl.cpp
View file

@ -168,7 +168,7 @@ DefineEngineMethod( GuiMLTextCtrl, scrollToTag, void, (S32 tagID),,
object->scrollToTag( tagID ); object->scrollToTag( tagID );
} }
DefineEngineMethod( GuiMLTextCtrl, scrollToTop, void, ( S32 param1, S32 param2),, DefineEngineMethod( GuiMLTextCtrl, scrollToTop, void, (),,
"@brief Scroll to the top of the text.\n\n" "@brief Scroll to the top of the text.\n\n"
"@tsexample\n" "@tsexample\n"
"// Inform GuiMLTextCtrl object to scroll to its top\n" "// Inform GuiMLTextCtrl object to scroll to its top\n"
@ -631,7 +631,7 @@ bool GuiMLTextCtrl::setCursorPosition(const S32 newPosition)
mCursorPosition = 0; mCursorPosition = 0;
return true; return true;
} }
else if (newPosition >= mTextBuffer.length()) else if (newPosition >= mTextBuffer.length() - 1)
{ {
mCursorPosition = mTextBuffer.length(); mCursorPosition = mTextBuffer.length();
return true; return true;
@ -669,11 +669,11 @@ void GuiMLTextCtrl::getCursorPositionAndColor(Point2I &cursorTop, Point2I &curso
{ {
S32 x = 0; S32 x = 0;
S32 y = 0; S32 y = 0;
S32 height = mProfile->mFont->getHeight(); S32 height = mProfile && mProfile->mFont ? mProfile->mFont->getHeight() : 0;
color = mProfile->mCursorColor; color = mProfile->mCursorColor;
for(Line *walk = mLineList; walk; walk = walk->next) for(Line *walk = mLineList; walk; walk = walk->next)
{ {
if ((mCursorPosition <= walk->textStart + walk->len) || (walk->next == NULL)) if ((mCursorPosition < walk->textStart + walk->len) || (walk->next == NULL))
{ {
// it's in the atoms on this line... // it's in the atoms on this line...
y = walk->y; y = walk->y;
@ -768,7 +768,7 @@ void GuiMLTextCtrl::onMouseDown(const GuiEvent& event)
mSelectionAnchorDropped = event.mousePoint; mSelectionAnchorDropped = event.mousePoint;
if (mSelectionAnchor < 0) if (mSelectionAnchor < 0)
mSelectionAnchor = 0; mSelectionAnchor = 0;
else if (mSelectionAnchor >= mTextBuffer.length()) else if (mSelectionAnchor >= mTextBuffer.length() - 1)
mSelectionAnchor = mTextBuffer.length(); mSelectionAnchor = mTextBuffer.length();
mVertMoveAnchorValid = false; mVertMoveAnchorValid = false;