From d706dbe3f2b12fb24d9496ca35d64e96d99270e0 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Thu, 22 Sep 2022 20:43:33 -0500
Subject: [PATCH] Fix wrapping text text cut-off

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 C++ProjectTemplate | Bin 1216880 -> 1216880 bytes
 main.cpp           |  13 ++++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index 9f3c53a75d77557601fb5785e3ec161422783ebb..3b6ed52d0f10ab58164403c0d35b531f93922acc 100755
GIT binary patch
delta 484
zcmeyc$m_!*uMHK<B0t1u_V4?4Vf!S-^_78l3X<wiGt@QrFt_(GGXgOa5QEq(+k2Q<
znFZ^Qxvpk-d4Z9Ep`ms)L#aCdHrLh79~fH>lqh$*uJK5|;L+{c;n8``qx1NSNo~LX
z^KWCYQ7B>G0o1_onso<|WB{tw#88_CQOmy%WWWrFext_U|2=wL4}i>imIkzOZ_WSd
zXGK^gMAF>;fMhOs^oH($TIN6frwFTth?66RjPP_*QC2mD13;@mW`j&~sRx-H@E^hl
zJ9gsqYEf2c#;wx@#aKn^ndSi%ce?HXTL7{M;-c$KATvV2ZiEW4RRfKJ8hfe^!&vcF
zXc+KMJ<xK1zcu{-f3Wg>Tp;HFopKH66i}GH<^Yn6&8}-0fnhT}TZ~nbQJ}q5j1`F4
wfS4VKIe?gRd#e~%_y^|Mj0@ZEvvC744-oSLF&_}~1F--Q3vR#9CN!}N0Ha^meE<Le

delta 486
zcmeyc$m_!*uMHK<A_ea@+D>+0k(+QyHtNy)oo0!gf{UAbnA>}p8G)Dyh(T<Y?LEw_
z%z_p#uP`z&bi1zcNWS3F?b_kddCjBq_>1LjzyI@ZW8mKh5}W}MD{lP#-=o*{07zav
zeL9CItDMMkw?81U3m(0pJD^%8Ot%tc)evcR#E=P@UM9+_roalc5M(OIoYs1fnF0SH
ze6ZD*rtcADm9GC*2bAe_-2gOw!#<!629R>+c_7+#2iQ80wGfv{G=oeG1-lh0<X#Qb
z4z+|E(~^i*u>Win_@^FdIl$i<{{KH*c@4;Be{`!)&c$l=ye15*&sIUK-p2)X^%<c3
z(^JG)6&QKiTg6y`m<@>8ftUk`Ik&fpafN?iZeu*qexHpSh<SjR7l`?Qm>-A*fLL(*
JeKw(qT>#)0-HQMK

diff --git a/main.cpp b/main.cpp
index ff4e5c2..4bbec87 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2627,8 +2627,11 @@ goes on a very long time, I hope you can understand this is only for testing pur
 	std::string Wrap(std::string str,vd2d size,bool proportional) {
 		int marker=0;
 		std::string newStr="";
+		bool firstChar=false;
 		while (marker<str.length()) {
-			newStr+=str[marker];
+			if (firstChar||!firstChar&&str[marker]!=' ') {
+				newStr+=str[marker];
+			}
 			vd2d siz;
 			if (proportional) {
 				siz=GetTextSizeProp(newStr);
@@ -2639,13 +2642,17 @@ goes on a very long time, I hope you can understand this is only for testing pur
 				do {
 					if (newStr[newStr.length()-1]!=' ') {
 						marker--;
+						//printf("%s\n",newStr.c_str());
 					}
 					newStr.erase(newStr.end()-1);
 				} while (newStr[newStr.length()-1]!=' ');
-				newStr.erase(newStr.end()-1);
+				//newStr.erase(newStr.end()-1);
 				newStr+='\n';
+				firstChar=false;
+			} else {
+				firstChar=true;
+				marker++;
 			}
-			marker++;
 		}
 		return newStr;
 	}