Proper caret clipping

Caret move up/down works even if caret is on new line start

BansheeEngine/Source/BsGUIInputCaret.cpp

@@ -35,7 +35,8 @@ namespace BansheeEngine
 		mCaretDesc.offset = getCaretPosition(mTextDesc.offset);
 		mCaretDesc.width = 1;
 		mCaretDesc.height = getCaretHeight();
-		mCaretDesc.clipRect = Rect(0, 0, mTextDesc.width, mTextDesc.height);
+		mCaretDesc.clipRect = Rect(-mCaretDesc.offset.x + mTextDesc.offset.x, -mCaretDesc.offset.y + mTextDesc.offset.y, 
+			mTextDesc.width, mTextDesc.height);
 		mCaretDesc.texture = GUIManager::instance().getCaretTexture();
 
 		mCaretSprite->update(mCaretDesc);
@@ -65,6 +66,13 @@ namespace BansheeEngine
 			charIdx -= 1;	
 
 		UINT32 lineIdx = mTextSprite->getLineForChar(charIdx);
+		const SpriteLineDesc& desc = mTextSprite->getLineDesc(lineIdx);
+		if(lineIdx != (mTextSprite->getNumLines() - 1)) // If not the last line
+		{
+			if(charIdx == (desc.endChar - 1)) // If char is a newline, I want that to count as being on the next line because that's
+				lineIdx++;					  // how user sees it
+		}
+
 		if(lineIdx == 0)
 			return;
 

CamelotCore/Source/CmTextUtility.cpp

@@ -339,7 +339,6 @@ namespace CamelotFramework
 			LOGWRN("Unable to find font with specified size (" + toString(fontSize) + "). Using nearest available size: " + toString(fontData->size));
 		}
 
-		bool heightIsLimited = height > 0;
 		bool widthIsLimited = width > 0;
 
 		std::shared_ptr<TextUtility::TextData> textData = cm_shared_ptr<TextData, PoolAlloc>();
@@ -359,9 +358,6 @@ namespace CamelotFramework
 
 			if(text[charIdx] == '\n')
 			{
-				if(heightIsLimited && (curHeight + fontData->fontDesc.lineHeight * 2) > height)
-					break; // Max height reached
-
 				textData->mLines.push_back(TextLine(fontData->fontDesc.baselineOffset, fontData->fontDesc.lineHeight, fontData->fontDesc.spaceWidth));
 				curLine = &textData->mLines.back();
 
@@ -390,10 +386,6 @@ namespace CamelotFramework
 					if(lastWord.isSpacer())
 						curLine->addWord(lastWord); // Spaces can stay on previous line even if they don't technically fit
 
-					// No more lines fit vertically so we're done
-					if(heightIsLimited && curHeight > height)
-						break;
-
 					textData->mLines.push_back(TextLine(fontData->fontDesc.baselineOffset, fontData->fontDesc.lineHeight, fontData->fontDesc.spaceWidth));
 					curLine = &textData->mLines.back();