r18242 by jghali - #11443: In Haiku, return in a text frame doesn't add a new paragraph

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 13 17:01:01 UTC 2013


Author: jghali
Date: Sat Apr 13 17:01:01 2013
New Revision: 18242

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18242
Log:
#11443: In Haiku, return in a text frame doesn't add a new paragraph

Modified:
    branches/Version14x/Scribus/scribus/pageitem_textframe.cpp

Modified: branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18242&path=/branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem_textframe.cpp Sat Apr 13 17:01:01 2013
@@ -2997,8 +2997,12 @@
 	}
 	int oldPos = itemText.cursorPosition(); // 15-mar-2004 jjsa for cursor movement with Shift + Arrow key
 	int kk = k->key();
-	int as = k->text()[0].unicode();
 	QString uc = k->text();
+#ifdef Q_OS_HAIKU
+	if (kk == Qt::Key_Return)
+		uc = "\r";
+#endif
+	int as = uc[0].unicode();
 	QString cr, Tcha, Twort;
 	uint Tcoun;
 	int len, pos;




More information about the scribus-commit mailing list