Improve spacing of multiline labels, multiline cursor for Textbox, autoresizing textbox for PreviewView comments

3 files changed, 13 insertions, 13 deletions

diff --git a/src/interface/Component.cpp b/src/interface/Component.cpp
index a0c55f4..648635c 100644
--- a/src/interface/Component.cpp
+++ b/src/interface/Component.cpp
@@ -79,7 +79,7 @@ void Component::TextPosition(std::string displayText)
 	switch(Appearance.VerticalAlign)
 	{
 		case ui::Appearance::AlignTop:
-			textPosition.Y = Appearance.Margin.Top;
+			textPosition.Y = Appearance.Margin.Top+2;
 			break;
 		case ui::Appearance::AlignMiddle:
 			textPosition.Y = Appearance.Margin.Top+((textAreaHeight-textHeight)/2);
diff --git a/src/interface/Textbox.cpp b/src/interface/Textbox.cpp
index 66af516..3180cb7 100644
--- a/src/interface/Textbox.cpp
+++ b/src/interface/Textbox.cpp
@@ -42,11 +42,11 @@ void Textbox::SetText(std::string newText)
 
 	if(cursor)
 	{
-		cursorPosition = Graphics::textnwidth((char *)text.c_str(), cursor);
+		Graphics::PositionAtCharIndex(multiline?((char*)textLines.c_str()):((char*)text.c_str()), cursor, cursorPositionX, cursorPositionY);
 	}
 	else
 	{
-		cursorPosition = 0;
+		cursorPositionY = cursorPositionX = 0;
 	}
 }
 
@@ -175,25 +175,25 @@ void Textbox::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 
 	if(cursor)
 	{
-		cursorPosition = Graphics::textnwidth((char *)text.c_str(), cursor);
+		Graphics::PositionAtCharIndex(multiline?((char*)textLines.c_str()):((char*)text.c_str()), cursor, cursorPositionX, cursorPositionY);
 	}
 	else
 	{
-		cursorPosition = 0;
+		cursorPositionY = cursorPositionX = 0;
 	}
 }
 
 void Textbox::OnMouseClick(int x, int y, unsigned button)
 {
 	mouseDown = true;
-	cursor = Graphics::CharIndexAtPosition((char*)text.c_str(), x-textPosition.X, y-textPosition.Y);
+	cursor = Graphics::CharIndexAtPosition(multiline?((char*)textLines.c_str()):((char*)text.c_str()), x-textPosition.X, y-textPosition.Y);
 	if(cursor)
 	{
-		cursorPosition = Graphics::textnwidth((char *)text.c_str(), cursor);
+		Graphics::PositionAtCharIndex(multiline?((char*)textLines.c_str()):((char*)text.c_str()), cursor, cursorPositionX, cursorPositionY);
 	}
 	else
 	{
-		cursorPosition = 0;
+		cursorPositionY = cursorPositionX = 0;
 	}
 	Label::OnMouseClick(x, y, button);
 }
@@ -208,14 +208,14 @@ void Textbox::OnMouseMoved(int localx, int localy, int dx, int dy)
 {
 	if(mouseDown)
 	{
-		cursor = Graphics::CharIndexAtPosition((char*)text.c_str(), localx-textPosition.X, localy-textPosition.Y);
+		cursor = Graphics::CharIndexAtPosition(multiline?((char*)textLines.c_str()):((char*)text.c_str()), localx-textPosition.X, localy-textPosition.Y);
 		if(cursor)
 		{
-			cursorPosition = Graphics::textnwidth((char *)text.c_str(), cursor);
+			Graphics::PositionAtCharIndex(multiline?((char*)textLines.c_str()):((char*)text.c_str()), cursor, cursorPositionX, cursorPositionY);
 		}
 		else
 		{
-			cursorPosition = 0;
+			cursorPositionY = cursorPositionX = 0;
 		}
 	}
 	Label::OnMouseMoved(localx, localy, dx, dy);
@@ -229,7 +229,7 @@ void Textbox::Draw(const Point& screenPos)
 	if(IsFocused())
 	{
 		if(border) g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255);
-		g->draw_line(screenPos.X+textPosition.X+cursorPosition, screenPos.Y+3, screenPos.X+textPosition.X+cursorPosition, screenPos.Y+12, 255, 255, 255, XRES+BARSIZE);
+		g->draw_line(screenPos.X+textPosition.X+cursorPositionX+1, screenPos.Y-2+textPosition.Y+cursorPositionY, screenPos.X+textPosition.X+cursorPositionX+1, screenPos.Y+10+textPosition.Y+cursorPositionY, 255, 255, 255, XRES+BARSIZE);
 	}
 	else
 	{
diff --git a/src/interface/Textbox.h b/src/interface/Textbox.h
index 1410405..700974a 100644
--- a/src/interface/Textbox.h
+++ b/src/interface/Textbox.h
@@ -22,7 +22,7 @@ class Textbox : public Label
 protected:
 	bool mouseDown;
 	bool masked, border;
-	int cursor, cursorPosition;
+	int cursor, cursorPositionX, cursorPositionY;
 	TextboxAction *actionCallback;
 	std::string backingText;
 	std::string placeHolder;