kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix for Chinese fonts

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-08-04 10:35:18 +02:00
parent fc14a4bc0f
commit 277592e16d
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+10 -5
View File
@@ -4768,8 +4768,11 @@ void DefaultSettings(byte userhardwaremodel) {
void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, const uint8_t* font) { void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, const uint8_t* font) {
if (language == LANGUAGE_CHS) { if (language == LANGUAGE_CHS) {
if (font == FONT16) font = FONT16_CHS; if (memcmp(font, FONT16, sizeof(FONT16)) == 0) {
else if (font == FONT28) font = FONT28_CHS; font = FONT16_CHS;
} else if (memcmp(font, FONT28, sizeof(FONT28)) == 0) {
font = FONT28_CHS;
}
} }
if (currentFont != font || resetFontOnNextCall) { if (currentFont != font || resetFontOnNextCall) {
@@ -4792,13 +4795,15 @@ void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int colo
void tftReplace(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, const uint8_t* font) { void tftReplace(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, const uint8_t* font) {
if (language == LANGUAGE_CHS) { if (language == LANGUAGE_CHS) {
if (font == FONT16) font = FONT16_CHS; if (memcmp(font, FONT16, sizeof(FONT16)) == 0) {
if (font == FONT28) font = FONT28_CHS; font = FONT16_CHS;
} else if (memcmp(font, FONT28, sizeof(FONT28)) == 0) {
font = FONT28_CHS;
}
} }
if (currentFont != font || resetFontOnNextCall) { if (currentFont != font || resetFontOnNextCall) {
if (currentFont != nullptr) tft.unloadFont(); if (currentFont != nullptr) tft.unloadFont();
tft.loadFont(font); tft.loadFont(font);
currentFont = font; currentFont = font;
resetFontOnNextCall = false; resetFontOnNextCall = false;