@@ -956,24 +956,17 @@ static void drawBtn(int x, int y, const char* label, int32_t data, MarlinImage i
956
956
uint16_t width = Images[imgBtn52Rounded].width ;
957
957
uint16_t height = Images[imgBtn52Rounded].height ;
958
958
959
- tft.queue .sync (); // need sync to change font
960
-
961
959
if (!enabled) bgColor = COLOR_CONTROL_DISABLED;
962
960
963
961
tft.canvas (x, y, width, height);
964
962
tft.set_background (COLOR_BACKGROUND);
965
963
tft.add_image (0 , 0 , imgBtn52Rounded, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
966
964
965
+ // TODO: Make an add_text() taking a font arg
967
966
if (label != NULL ) {
968
- tft.set_font (Helvetica12Bold);
969
- tft_string.set_font (Helvetica12Bold);
970
967
tft_string.set (label);
971
968
tft_string.trim ();
972
969
tft.add_text (tft_string.center (width), height / 2 - tft_string.font_height () / 2 , bgColor, tft_string);
973
-
974
- tft.queue .sync ();
975
- tft_string.set_font (Helvetica18);
976
- tft.set_font (Helvetica18);
977
970
}
978
971
else {
979
972
tft.add_image (0 , 0 , img, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
@@ -984,6 +977,7 @@ static void drawBtn(int x, int y, const char* label, int32_t data, MarlinImage i
984
977
985
978
void MarlinUI::move_axis_screen () {
986
979
// Reset
980
+ defer_status_screen (true );
987
981
motionAxisState.blocked = false ;
988
982
touch.enable ();
989
983
0 commit comments