Skip to content

Commit 37777a7

Browse files
committed
🐛 Followup to CrealityUI cleanup
Followup to #22586
1 parent 0da0aa9 commit 37777a7

1 file changed

Lines changed: 15 additions & 11 deletions

File tree

Marlin/src/lcd/e3v2/creality/dwin.cpp

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -856,9 +856,8 @@ void Draw_Control_Menu() {
856856
#define CLINE(L) MBASE(CSCROL(L))
857857
#define CVISI(L) VISI(CONTROL_CASE_TOTAL, L, CSCROL(L))
858858

859-
// "Control" Title
860859
if (HMI_IsChinese())
861-
DWIN_Frame_TitleCopy(103, 1, 28, 14);
860+
DWIN_Frame_TitleCopy(103, 1, 28, 14); // "Control"
862861
else {
863862
#ifdef USE_STRING_HEADINGS
864863
Draw_Title(GET_TEXT_F(MSG_CONTROL));
@@ -2028,8 +2027,8 @@ void Draw_Info_Menu() {
20282027
DWIN_Frame_TitleCopy(30, 17, 28, 13); // "Info"
20292028

20302029
DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102); // "Size"
2031-
DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175); // "Firmware Version"
2032-
DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248); // "Contact Details"
2030+
DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175); // "Firmware Version"
2031+
DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248); // "Contact Details"
20332032
}
20342033
else {
20352034
#ifdef USE_STRING_HEADINGS
@@ -2432,9 +2431,9 @@ void Item_Adv_HomeOffsets(const uint8_t row) {
24322431
}
24332432
else {
24342433
#ifdef USE_STRING_TITLES
2435-
DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
2434+
DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_OFFSETS));
24362435
#else
2437-
say_probe_offs_en(0, row);
2436+
say_probe_offs_en(row);
24382437
#endif
24392438
}
24402439
Draw_Menu_Line(row, ICON_ProbeOff);
@@ -2502,11 +2501,16 @@ void Draw_AdvancedSettings_Menu() {
25022501
#define ASCROL(L) (scroll + (L))
25032502
#define AVISI(L) VISI(ADVSET_CASE_TOTAL, L, ASCROL(L))
25042503

2505-
#ifdef USE_STRING_HEADINGS
2506-
Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
2507-
#else
2508-
DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
2509-
#endif
2504+
if (false && HMI_IsChinese()) {
2505+
// TODO: Chinese "Advanced Settings"
2506+
}
2507+
else {
2508+
#ifdef USE_STRING_HEADINGS
2509+
Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
2510+
#else
2511+
DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
2512+
#endif
2513+
}
25102514

25112515
if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
25122516
if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF)); // Set Home Offsets >

0 commit comments

Comments
 (0)