Skip to content

Commit c3090bd

Browse files
The-EGthinkyhead
authored andcommitted
🩹 Ender 3v2 DWIN MarlinUI Fixup (MarlinFirmware#24984)
1 parent 0fadb56 commit c3090bd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Marlin/src/lcd/e3v2/common/dwin_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
234234
// *string: The string
235235
// rlimit: To limit the drawn string length
236236
void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
237-
#if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
237+
#if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, IS_DWIN_MARLINUI)
238238
DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
239239
#endif
240240
constexpr uint8_t widthAdjust = 0;

Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ void MarlinUI::draw_status_screen() {
453453
DWIN_Draw_String(
454454
false, font16x32, Percent_Color, Color_Bg_Black,
455455
pb_left + (pb_width - dwin_string.length * 16) / 2,
456-
pb_top + (pb_height - 32) / 2,
456+
pb_top + (pb_height - 32) / 2 - 1,
457457
S(dwin_string.string())
458458
);
459459
#endif

0 commit comments

Comments
 (0)