From eb4d612bb92f3916c01c93499e29ac23a96294e7 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Tue, 8 Jan 2019 19:14:58 +0100
Subject: [PATCH] cellOskDialog: fixes for multi-line dialog

---
 rpcs3/rpcs3qt/osk_dialog_frame.cpp | 48 +++++++++++++++++++++++++-----
 rpcs3/rpcs3qt/osk_dialog_frame.h   |  1 +
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.cpp b/rpcs3/rpcs3qt/osk_dialog_frame.cpp
index e7db833ce6..e22cb3b394 100644
--- a/rpcs3/rpcs3qt/osk_dialog_frame.cpp
+++ b/rpcs3/rpcs3qt/osk_dialog_frame.cpp
@@ -1,4 +1,4 @@
-
+
 #include "osk_dialog_frame.h"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 
@@ -93,26 +93,58 @@ void osk_dialog_frame::Create(const std::string& title, const std::u16string& me
 		input->setFixedWidth(lineEditWidth());
 		input->setText(text);
 		input->setFocus();
+		input->moveCursor(QTextCursor::End);
+		m_text_old = text;
 
 		connect(input, &QTextEdit::textChanged, [=]()
 		{
 			QString text = input->toPlainText();
-			text.chop(text.length() - charlimit);
 
-			if (options & CELL_OSKDIALOG_NO_SPACE)
+			if (text == m_text_old)
 			{
-				text.remove(QRegExp("\\s+"));
+				return;
 			}
 
-			input->setPlainText(text);
-
 			QTextCursor cursor = input->textCursor();
-			cursor.setPosition(QTextCursor::End);
+			const int cursor_pos_new = cursor.position();
+			const int cursor_pos_old = cursor_pos_new + m_text_old.length() - text.length();
+
+			// Reset to old state if character limit was reached
+			if ((u32)m_text_old.length() >= charlimit && (u32)text.length() > charlimit)
+			{
+				input->blockSignals(true);
+				input->setPlainText(m_text_old);
+				cursor.setPosition(cursor_pos_old);
+				input->setTextCursor(cursor);
+				input->blockSignals(false);
+				return;
+			}
+
+			int cursor_pos = cursor.position();
+
+			// Clear text of spaces if necessary
+			if (options & CELL_OSKDIALOG_NO_SPACE)
+			{
+				int trim_len = text.length();
+				text.remove(QRegExp("\\s+"));
+				trim_len -= text.length();
+				cursor_pos -= trim_len;
+			}
+
+			// Crop if more than one character was pasted and the character limit was exceeded
+			text.chop(text.length() - charlimit);
+
+			// Set new text and block signals to prevent infinite loop
+			input->blockSignals(true);
+			input->setPlainText(text);
+			cursor.setPosition(cursor_pos);
 			input->setTextCursor(cursor);
+			input->blockSignals(false);
+
+			m_text_old = text;
 
 			inputCount->setText(QString("%1/%2").arg(text.length()).arg(charlimit));
 			SetOskText(text);
-
 			on_osk_input_entered();
 		});
 
diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.h b/rpcs3/rpcs3qt/osk_dialog_frame.h
index c98174f21a..46c0d880f2 100644
--- a/rpcs3/rpcs3qt/osk_dialog_frame.h
+++ b/rpcs3/rpcs3qt/osk_dialog_frame.h
@@ -22,4 +22,5 @@ private:
 	void SetOskText(const QString& text);
 
 	custom_dialog* m_dialog = nullptr;
+	QString m_text_old;
 };