Fixed wrong charsize after Wifi config and remove message to exit menu
This commit is contained in:
+2
-2
@@ -4637,12 +4637,12 @@ void UpdateFonts(byte mode) {
|
|||||||
|
|
||||||
if (language == LANGUAGE_CHS) {
|
if (language == LANGUAGE_CHS) {
|
||||||
RDSSprite.loadFont(FONT16_CHS);
|
RDSSprite.loadFont(FONT16_CHS);
|
||||||
PSSprite.loadFont(FONT28_CHS);
|
if (menu) PSSprite.loadFont(FONT16_CHS); else PSSprite.loadFont(FONT28_CHS);
|
||||||
FullLineSprite.loadFont(FONT16_CHS);
|
FullLineSprite.loadFont(FONT16_CHS);
|
||||||
OneBigLineSprite.loadFont(FONT28_CHS);
|
OneBigLineSprite.loadFont(FONT28_CHS);
|
||||||
} else {
|
} else {
|
||||||
RDSSprite.loadFont(FONT16);
|
RDSSprite.loadFont(FONT16);
|
||||||
PSSprite.loadFont(FONT28);
|
if (menu) PSSprite.loadFont(FONT16); else PSSprite.loadFont(FONT28);
|
||||||
FullLineSprite.loadFont(FONT16);
|
FullLineSprite.loadFont(FONT16);
|
||||||
OneBigLineSprite.loadFont(FONT28);
|
OneBigLineSprite.loadFont(FONT28);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4868,6 +4868,14 @@ void DoMenu() {
|
|||||||
default: tft.pushImage (13, 30, 292, 170, popupbackground); break;
|
default: tft.pushImage (13, 30, 292, 170, popupbackground); break;
|
||||||
}
|
}
|
||||||
showMenuOpenTouchButtons();
|
showMenuOpenTouchButtons();
|
||||||
|
|
||||||
|
if (menupage == CONNECTIVITY && menuoption == ITEM3) {
|
||||||
|
switch (CurrentTheme) {
|
||||||
|
case 7: tft.pushImage (0, 0, 320, 240, configurationbackground_wo); break;
|
||||||
|
default: tft.pushImage (0, 0, 320, 240, configurationbackground); break;
|
||||||
|
}
|
||||||
|
tftPrint(0, myLanguage[language][189 + menupage - 1], 160, 6, ActiveColor, ActiveColorSmooth, 16);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (CurrentTheme) {
|
switch (CurrentTheme) {
|
||||||
|
|||||||
Reference in New Issue
Block a user