Skip to content

Commit 37ad06f

Browse files
thinkyheadthinkyhead
committed
consistent naming
1 parent c14c193 commit 37ad06f

23 files changed

+119
-119
lines changed

‎Marlin/src/lcd/extui/mks_ui/draw_about.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
4646

4747
void lv_draw_about() {
4848
scr = lv_screen_create(ABOUT_UI);
49-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
49+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
5050

5151
board = lv_label_create(scr, BOARD_INFO_NAME);
5252
lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -80);

‎Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,23 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
115115
void lv_draw_baby_stepping() {
116116
scr = lv_screen_create(BABYSTEP_UI);
117117
lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABYSTEP_X_P);
118-
lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
119-
lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
120-
lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
121-
lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
122-
lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
123-
buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
118+
lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
119+
lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_SIZE_X + INTERVAL_V * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
120+
lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_SIZE_X + INTERVAL_V * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
121+
lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_SIZE_X * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
122+
lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_SIZE_X * 2 + INTERVAL_V * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
123+
buttonV = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
124124
labelV = lv_label_create_empty(buttonV);
125125
#if HAS_ROTARY_ENCODER
126126
if (gCfgItems.encoder_enable)
127127
lv_group_add_obj(g, buttonV);
128128
#endif
129129

130-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
130+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
131131

132132
disp_baby_step_dist();
133133

134-
zOffsetText = lv_label_create(scr, 290, TITLE_YPOS, nullptr);
134+
zOffsetText = lv_label_create(scr, 290, TITLE_POS_Y, nullptr);
135135
disp_z_offset_value();
136136
}
137137

‎Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,18 @@ void lv_draw_change_speed() {
9494
scr = lv_screen_create(CHANGE_SPEED_UI);
9595
// Create an Image button
9696
lv_big_button_create(scr, "F:/bmp_Add.bin", speed_menu.add, INTERVAL_V, titleHeight, event_handler, ID_C_ADD);
97-
lv_big_button_create(scr, "F:/bmp_Dec.bin", speed_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_C_DEC);
98-
buttonMov = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
99-
buttonExt = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
100-
buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
97+
lv_big_button_create(scr, "F:/bmp_Dec.bin", speed_menu.dec, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_C_DEC);
98+
buttonMov = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
99+
buttonExt = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X + INTERVAL_V * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
100+
buttonStep = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 2 + INTERVAL_V * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
101101
#if HAS_ROTARY_ENCODER
102102
if (gCfgItems.encoder_enable) {
103103
lv_group_add_obj(g, buttonMov);
104104
lv_group_add_obj(g, buttonExt);
105105
lv_group_add_obj(g, buttonStep);
106106
}
107107
#endif
108-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
108+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
109109

110110
// Create labels on the image buttons
111111
labelMov = lv_label_create_empty(buttonMov);

‎Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ void lv_draw_extrusion() {
116116
// Create image buttons
117117
lv_obj_t *buttonAdd = lv_big_button_create(scr, "F:/bmp_in.bin", extrude_menu.in, INTERVAL_V, titleHeight, event_handler, ID_E_ADD);
118118
lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
119-
lv_big_button_create(scr, "F:/bmp_out.bin", extrude_menu.out, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_E_DEC);
119+
lv_big_button_create(scr, "F:/bmp_out.bin", extrude_menu.out, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_E_DEC);
120120

121-
buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_TYPE);
122-
buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_STEP);
123-
buttonSpeed = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_SPEED);
121+
buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_TYPE);
122+
buttonStep = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X + INTERVAL_V * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_STEP);
123+
buttonSpeed = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 2 + INTERVAL_V * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_SPEED);
124124

125125
#if HAS_ROTARY_ENCODER
126126
if (gCfgItems.encoder_enable) {
@@ -130,7 +130,7 @@ void lv_draw_extrusion() {
130130
}
131131
#endif
132132

133-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_RETURN);
133+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_RETURN);
134134

135135
// Create labels on the image buttons
136136
labelType = lv_label_create_empty(buttonType);

‎Marlin/src/lcd/extui/mks_ui/draw_fan.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ void lv_draw_fan() {
6868
// Create an Image button
6969
buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
7070
lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
71-
lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
72-
lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
73-
lv_big_button_create(scr, "F:/bmp_speed127.bin", fan_menu.half, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_MID);
74-
lv_big_button_create(scr, "F:/bmp_speed0.bin", fan_menu.off, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_OFF);
75-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_RETURN);
71+
lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
72+
lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
73+
lv_big_button_create(scr, "F:/bmp_speed127.bin", fan_menu.half, BTN_SIZE_X + INTERVAL_V * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_MID);
74+
lv_big_button_create(scr, "F:/bmp_speed0.bin", fan_menu.off, BTN_SIZE_X * 2 + INTERVAL_V * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_OFF);
75+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_RETURN);
7676

7777
fanText = lv_label_create_empty(scr);
7878
lv_obj_set_style(fanText, &tft_style_label_rel);

‎Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ void lv_draw_filament_change() {
111111
// Create an Image button
112112
lv_obj_t *buttonIn = lv_big_button_create(scr, "F:/bmp_in.bin", filament_menu.in, INTERVAL_V, titleHeight, event_handler, ID_FILAMNT_IN);
113113
lv_obj_clear_protect(buttonIn, LV_PROTECT_FOLLOW);
114-
lv_big_button_create(scr, "F:/bmp_out.bin", filament_menu.out, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_FILAMNT_OUT);
114+
lv_big_button_create(scr, "F:/bmp_out.bin", filament_menu.out, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_FILAMNT_OUT);
115115

116-
buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
116+
buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
117117
#if HAS_ROTARY_ENCODER
118118
if (gCfgItems.encoder_enable)
119119
lv_group_add_obj(g, buttonType);
120120
#endif
121121

122-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
122+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
123123

124124
// Create labels on the image buttons
125125
labelType = lv_label_create_empty(buttonType);

‎Marlin/src/lcd/extui/mks_ui/draw_home.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
7575
void lv_draw_home() {
7676
scr = lv_screen_create(ZERO_UI);
7777
lv_big_button_create(scr, "F:/bmp_zeroAll.bin", home_menu.home_all, INTERVAL_V, titleHeight, event_handler, ID_H_ALL);
78-
lv_big_button_create(scr, "F:/bmp_zeroX.bin", home_menu.home_x, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_H_X);
79-
lv_big_button_create(scr, "F:/bmp_zeroY.bin", home_menu.home_y, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_H_Y);
80-
lv_big_button_create(scr, "F:/bmp_zeroZ.bin", home_menu.home_z, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_H_Z);
81-
lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroff, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_ALL);
82-
lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroffXY, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_XY);
83-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_RETURN);
78+
lv_big_button_create(scr, "F:/bmp_zeroX.bin", home_menu.home_x, BTN_SIZE_X + INTERVAL_V * 2, titleHeight, event_handler, ID_H_X);
79+
lv_big_button_create(scr, "F:/bmp_zeroY.bin", home_menu.home_y, BTN_SIZE_X * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_H_Y);
80+
lv_big_button_create(scr, "F:/bmp_zeroZ.bin", home_menu.home_z, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_H_Z);
81+
lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroff, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_ALL);
82+
lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroffXY, BTN_SIZE_X + INTERVAL_V * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_XY);
83+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_H_RETURN);
8484
}
8585

8686
void lv_clear_home() {

‎Marlin/src/lcd/extui/mks_ui/draw_language.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,13 @@ void lv_draw_language() {
189189
// Create image buttons
190190
buttonCN = lv_big_button_create(scr, "F:/bmp_simplified_cn.bin", language_menu.chinese_s, INTERVAL_V, titleHeight, event_handler, ID_CN);
191191
lv_obj_clear_protect(buttonCN, LV_PROTECT_FOLLOW);
192-
buttonT_CN = lv_big_button_create(scr, "F:/bmp_traditional_cn.bin", language_menu.chinese_t, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_CN);
193-
buttonEN = lv_big_button_create(scr, "F:/bmp_english.bin", language_menu.english, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_EN);
194-
buttonRU = lv_big_button_create(scr, "F:/bmp_russian.bin", language_menu.russian, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_RU);
195-
buttonES = lv_big_button_create(scr, "F:/bmp_spanish.bin", language_menu.spanish, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_ES);
196-
buttonFR = lv_big_button_create(scr, "F:/bmp_french.bin", language_menu.french, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FR);
197-
buttonIT = lv_big_button_create(scr, "F:/bmp_italy.bin", language_menu.italy, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_IT);
198-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_L_RETURN);
192+
buttonT_CN = lv_big_button_create(scr, "F:/bmp_traditional_cn.bin", language_menu.chinese_t, BTN_SIZE_X + INTERVAL_V * 2, titleHeight, event_handler, ID_T_CN);
193+
buttonEN = lv_big_button_create(scr, "F:/bmp_english.bin", language_menu.english, BTN_SIZE_X * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_EN);
194+
buttonRU = lv_big_button_create(scr, "F:/bmp_russian.bin", language_menu.russian, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_RU);
195+
buttonES = lv_big_button_create(scr, "F:/bmp_spanish.bin", language_menu.spanish, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_ES);
196+
buttonFR = lv_big_button_create(scr, "F:/bmp_french.bin", language_menu.french, BTN_SIZE_X + INTERVAL_V * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_FR);
197+
buttonIT = lv_big_button_create(scr, "F:/bmp_italy.bin", language_menu.italy, BTN_SIZE_X * 2 + INTERVAL_V * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_IT);
198+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_L_RETURN);
199199
disp_language(gCfgItems.language, SELECTED);
200200
}
201201

‎Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ void lv_draw_manualLevel() {
7171
// Create an Image button
7272
lv_obj_t *buttonPoint1 = lv_big_button_create(scr, "F:/bmp_leveling1.bin", leveling_menu.position1, INTERVAL_V, titleHeight, event_handler, ID_M_POINT1);
7373
lv_obj_clear_protect(buttonPoint1, LV_PROTECT_FOLLOW);
74-
lv_big_button_create(scr, "F:/bmp_leveling2.bin", leveling_menu.position2, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_M_POINT2);
75-
lv_big_button_create(scr, "F:/bmp_leveling3.bin", leveling_menu.position3, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_M_POINT3);
76-
lv_big_button_create(scr, "F:/bmp_leveling4.bin", leveling_menu.position4, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_POINT4);
77-
lv_big_button_create(scr, "F:/bmp_leveling5.bin", leveling_menu.position5, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_POINT5);
78-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_MANUAL_RETURN);
74+
lv_big_button_create(scr, "F:/bmp_leveling2.bin", leveling_menu.position2, BTN_SIZE_X + INTERVAL_V * 2, titleHeight, event_handler, ID_M_POINT2);
75+
lv_big_button_create(scr, "F:/bmp_leveling3.bin", leveling_menu.position3, BTN_SIZE_X * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_M_POINT3);
76+
lv_big_button_create(scr, "F:/bmp_leveling4.bin", leveling_menu.position4, BTN_SIZE_X * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_POINT4);
77+
lv_big_button_create(scr, "F:/bmp_leveling5.bin", leveling_menu.position5, INTERVAL_V, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_POINT5);
78+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_MANUAL_RETURN);
7979
}
8080

8181
void lv_clear_manualLevel() {

‎Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
5959
void lv_draw_media_select() {
6060
scr = lv_screen_create(MEDIA_SELECT_UI);
6161
lv_big_button_create(scr, "F:/bmp_sd.bin", media_select_menu.sd_disk, INTERVAL_V, titleHeight, event_handler, ID_T_SD_DISK);
62-
lv_big_button_create(scr, "F:/bmp_usb_disk.bin", media_select_menu.usb_disk, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_USB_DISK);
63-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
62+
lv_big_button_create(scr, "F:/bmp_usb_disk.bin", media_select_menu.usb_disk, BTN_SIZE_X + INTERVAL_V * 2, titleHeight, event_handler, ID_T_USB_DISK);
63+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_V * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
6464
}
6565

6666
void lv_clear_media_select() {

0 commit comments

Comments
 (0)