Fix how the text is drawn in drawTextWithWindow

Zephiles · Zephiles · commit 8b6f34b8e053 · 2022-04-06T23:51:26.000-05:00
diff --git a/ttyd-tools/rel/source/draw.cpp b/ttyd-tools/rel/source/draw.cpp
@@ -193,7 +193,9 @@ void drawTextWithWindow(const char *text, int32_t textPosX, int32_t textPosY, ui
         ValuesOut[2]);
     
     // Draw the text
-    drawTextAndInit(text, textPosX, textPosY, alpha, textColor, false, textScale);
+    // drawTextMain must be called manually to avoid the hardcoded Y coordinate decrement in drawTextMultipleLines
+    drawTextInit(alpha, false);
+    drawTextMain(text, textPosX, textPosY, textColor, false, textScale, -0.f);
 }
 
 void drawIcon(int32_t posX, int32_t posY, int16_t iconNum, float scale)

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,9 @@ void drawTextWithWindow(const char *text, int32_t textPosX, int32_t textPosY, ui`
`193`	`193`	`ValuesOut[2]);`
`194`	`194`
`195`	`195`	`// Draw the text`
`196`		`- drawTextAndInit(text, textPosX, textPosY, alpha, textColor, false, textScale);`
	`196`	`+ // drawTextMain must be called manually to avoid the hardcoded Y coordinate decrement in drawTextMultipleLines`
	`197`	`+ drawTextInit(alpha, false);`
	`198`	`+ drawTextMain(text, textPosX, textPosY, textColor, false, textScale, -0.f);`
`197`	`199`	`}`
`198`	`200`
`199`	`201`	`void drawIcon(int32_t posX, int32_t posY, int16_t iconNum, float scale)`