Sfoglia il codice sorgente

Slim down MKS UI code (#19843)

Scott Lahteine 4 anni fa
parent
commit
4533a197d5
Nessun account collegato all'indirizzo email del committer
44 ha cambiato i file con 1198 aggiunte e 3194 eliminazioni
  1. 8
    29
      Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp
  2. 45
    128
      Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp
  3. 41
    93
      Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp
  4. 15
    47
      Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp
  5. 29
    112
      Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp
  6. 25
    84
      Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp
  7. 45
    60
      Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
  8. 11
    38
      Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp
  9. 7
    31
      Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp
  10. 3
    9
      Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp
  11. 38
    100
      Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp
  12. 14
    69
      Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp
  13. 19
    55
      Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp
  14. 29
    90
      Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp
  15. 15
    78
      Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp
  16. 21
    61
      Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp
  17. 20
    61
      Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp
  18. 25
    106
      Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp
  19. 12
    45
      Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp
  20. 16
    63
      Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp
  21. 12
    44
      Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp
  22. 13
    68
      Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp
  23. 46
    117
      Marlin/src/lcd/extui/lib/mks_ui/draw_manual_level_pos_settings.cpp
  24. 32
    78
      Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp
  25. 16
    67
      Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp
  26. 26
    98
      Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp
  27. 17
    20
      Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp
  28. 41
    151
      Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp
  29. 15
    50
      Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp
  30. 25
    82
      Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp
  31. 18
    65
      Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
  32. 44
    107
      Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
  33. 35
    67
      Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp
  34. 21
    113
      Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp
  35. 29
    79
      Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp
  36. 27
    73
      Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp
  37. 89
    282
      Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
  38. 17
    79
      Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp
  39. 99
    0
      Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
  40. 42
    0
      Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
  41. 29
    44
      Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp
  42. 20
    46
      Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp
  43. 41
    94
      Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp
  44. 6
    11
      Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp

+ 8
- 29
Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp Vedi File

@@ -53,7 +53,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
53 53
 }
54 54
 
55 55
 void lv_draw_about(void) {
56
-  lv_obj_t *buttonBack, *label_Back;
57 56
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != ABOUT_UI) {
58 57
     disp_state_stack._disp_index++;
59 58
     disp_state_stack._disp_state[disp_state_stack._disp_index] = ABOUT_UI;
@@ -66,51 +65,31 @@ void lv_draw_about(void) {
66 65
   lv_scr_load(scr);
67 66
   lv_obj_clean(scr);
68 67
 
69
-  lv_obj_t * title = lv_label_create(scr, NULL);
70
-  lv_obj_set_style(title, &tft_style_label_rel);
71
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
72
-  lv_label_set_text(title, creat_title_text());
68
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
73 69
 
74 70
   lv_refr_now(lv_refr_get_disp_refreshing());
75 71
 
76 72
   // Create an Image button
77
-  buttonBack = lv_imgbtn_create(scr, NULL);
78
-
79
-  #if 1
80
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_A_RETURN, NULL, 0);
81
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
82
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
83
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
84
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
85
-    #if HAS_ROTARY_ENCODER
86
-      if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
87
-    #endif
73
+  lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
74
+  #if HAS_ROTARY_ENCODER
75
+    if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
88 76
   #endif
89 77
 
90
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
91
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
92
-
93 78
   // Create a label on the image button
94
-  label_Back = lv_label_create(buttonBack, NULL);
79
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
95 80
 
96 81
   if (gCfgItems.multiple_language) {
97 82
     lv_label_set_text(label_Back, common_menu.text_back);
98 83
     lv_obj_align(label_Back, buttonBack, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
99 84
   }
100 85
 
101
-  //fw_version = lv_label_create(scr, NULL);
102
-  //lv_obj_set_style(fw_version, &tft_style_label_rel);
103
-  //lv_label_set_text(fw_version, SHORT_BUILD_VERSION);
86
+  //fw_version = lv_label_create(scr, SHORT_BUILD_VERSION);
104 87
   //lv_obj_align(fw_version, NULL, LV_ALIGN_CENTER, 0, -60);
105 88
 
106
-  fw_type = lv_label_create(scr, NULL);
107
-  lv_obj_set_style(fw_type, &tft_style_label_rel);
108
-  lv_label_set_text(fw_type, "Firmware: Marlin " SHORT_BUILD_VERSION);
89
+  fw_type = lv_label_create(scr, "Firmware: Marlin " SHORT_BUILD_VERSION);
109 90
   lv_obj_align(fw_type, NULL, LV_ALIGN_CENTER, 0, -20);
110 91
 
111
-  board = lv_label_create(scr, NULL);
112
-  lv_obj_set_style(board, &tft_style_label_rel);
113
-  lv_label_set_text(board, "Board: " BOARD_INFO_NAME);
92
+  board = lv_label_create(scr, "Board: " BOARD_INFO_NAME);
114 93
   lv_obj_align(board, NULL, LV_ALIGN_CENTER, 0, -60);
115 94
 }
116 95
 

+ 45
- 128
Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp Vedi File

@@ -161,14 +161,14 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
161 161
 
162 162
 void lv_draw_acceleration_settings(void) {
163 163
   lv_obj_t *buttonBack = NULL, *label_Back = NULL, *buttonTurnPage = NULL, *labelTurnPage = NULL;
164
-  lv_obj_t *labelPrintText = NULL, *buttonPrintValue = NULL, *labelPrintValue = NULL;
165
-  lv_obj_t *labelRetraText = NULL, *buttonRetraValue = NULL, *labelRetraValue = NULL;
166
-  lv_obj_t *labelTravelText = NULL, *buttonTravelValue = NULL, *labelTravelValue = NULL;
167
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
168
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
169
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
170
-  lv_obj_t *labelE0Text = NULL, *buttonE0Value = NULL, *labelE0Value = NULL;
171
-  lv_obj_t *labelE1Text = NULL, *buttonE1Value = NULL, *labelE1Value = NULL;
164
+  lv_obj_t *buttonPrintValue = NULL, *labelPrintValue = NULL;
165
+  lv_obj_t *buttonRetraValue = NULL, *labelRetraValue = NULL;
166
+  lv_obj_t *buttonTravelValue = NULL, *labelTravelValue = NULL;
167
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
168
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
169
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
170
+  lv_obj_t *buttonE0Value = NULL, *labelE0Value = NULL;
171
+  lv_obj_t *buttonE1Value = NULL, *labelE1Value = NULL;
172 172
   lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
173 173
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != ACCELERATION_UI) {
174 174
     disp_state_stack._disp_index++;
@@ -182,83 +182,45 @@ void lv_draw_acceleration_settings(void) {
182 182
   lv_scr_load(scr);
183 183
   lv_obj_clean(scr);
184 184
 
185
-  lv_obj_t * title = lv_label_create(scr, NULL);
186
-  lv_obj_set_style(title, &tft_style_label_rel);
187
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
188
-  lv_label_set_text(title, machine_menu.AccelerationConfTitle);
185
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.AccelerationConfTitle);
189 186
 
190 187
   lv_refr_now(lv_refr_get_disp_refreshing());
191 188
 
192 189
   if (uiCfg.para_ui_page != 1) {
193 190
 
194
-    labelPrintText = lv_label_create(scr, NULL);
195
-    lv_obj_set_style(labelPrintText, &tft_style_label_rel);
196
-    lv_obj_set_pos(labelPrintText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
197
-    lv_label_set_text(labelPrintText, machine_menu.PrintAcceleration);
191
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.PrintAcceleration);
198 192
 
199
-    buttonPrintValue = lv_btn_create(scr, NULL);
200
-    lv_obj_set_pos(buttonPrintValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
201
-    lv_obj_set_size(buttonPrintValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
202
-    lv_obj_set_event_cb_mks(buttonPrintValue, event_handler, ID_ACCE_PRINT, NULL, 0);
203
-    lv_btn_set_style(buttonPrintValue, LV_BTN_STYLE_REL, &style_para_value);
204
-    lv_btn_set_style(buttonPrintValue, LV_BTN_STYLE_PR, &style_para_value);
205
-    labelPrintValue = lv_label_create(buttonPrintValue, NULL);
193
+    buttonPrintValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_PRINT);
194
+    labelPrintValue = lv_label_create_empty(buttonPrintValue);
206 195
 
207 196
     line1 = lv_line_create(scr, NULL);
208 197
     lv_ex_line(line1, line_points[0]);
209 198
 
210
-    labelRetraText = lv_label_create(scr, NULL);
211
-    lv_obj_set_style(labelRetraText, &tft_style_label_rel);
212
-    lv_obj_set_pos(labelRetraText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
213
-    lv_label_set_text(labelRetraText, machine_menu.RetractAcceleration);
199
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.RetractAcceleration);
214 200
 
215
-    buttonRetraValue = lv_btn_create(scr, NULL);
216
-    lv_obj_set_pos(buttonRetraValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
217
-    lv_obj_set_size(buttonRetraValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
218
-    lv_obj_set_event_cb_mks(buttonRetraValue, event_handler, ID_ACCE_RETRA, NULL, 0);
219
-    lv_btn_set_style(buttonRetraValue, LV_BTN_STYLE_REL, &style_para_value);
220
-    lv_btn_set_style(buttonRetraValue, LV_BTN_STYLE_PR, &style_para_value);
221
-    labelRetraValue = lv_label_create(buttonRetraValue, NULL);
201
+    buttonRetraValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_RETRA);
202
+    labelRetraValue = lv_label_create_empty(buttonRetraValue);
222 203
 
223 204
     line2 = lv_line_create(scr, NULL);
224 205
     lv_ex_line(line2, line_points[1]);
225 206
 
226
-    labelTravelText = lv_label_create(scr, NULL);
227
-    lv_obj_set_style(labelTravelText, &tft_style_label_rel);
228
-    lv_obj_set_pos(labelTravelText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
229
-    lv_label_set_text(labelTravelText, machine_menu.TravelAcceleration);
207
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.TravelAcceleration);
230 208
 
231
-    buttonTravelValue = lv_btn_create(scr, NULL);
232
-    lv_obj_set_pos(buttonTravelValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
233
-    lv_obj_set_size(buttonTravelValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
234
-    lv_obj_set_event_cb_mks(buttonTravelValue, event_handler, ID_ACCE_TRAVEL, NULL, 0);
235
-    lv_btn_set_style(buttonTravelValue, LV_BTN_STYLE_REL, &style_para_value);
236
-    lv_btn_set_style(buttonTravelValue, LV_BTN_STYLE_PR, &style_para_value);
237
-    labelTravelValue = lv_label_create(buttonTravelValue, NULL);
209
+    buttonTravelValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_TRAVEL);
210
+    labelTravelValue = lv_label_create_empty(buttonTravelValue);
238 211
 
239 212
     line3 = lv_line_create(scr, NULL);
240 213
     lv_ex_line(line3, line_points[2]);
241 214
 
242
-    labelXText = lv_label_create(scr, NULL);
243
-    lv_obj_set_style(labelXText, &tft_style_label_rel);
244
-    lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
245
-    lv_label_set_text(labelXText, machine_menu.X_Acceleration);
215
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.X_Acceleration);
246 216
 
247
-    buttonXValue = lv_btn_create(scr, NULL);
248
-    lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V);
249
-    lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
250
-    lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_ACCE_X, NULL, 0);
251
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
252
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
253
-    labelXValue = lv_label_create(buttonXValue, NULL);
217
+    buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_X);
218
+    labelXValue = lv_label_create_empty(buttonXValue);
254 219
 
255 220
     line4 = lv_line_create(scr, NULL);
256 221
     lv_ex_line(line4, line_points[3]);
257 222
 
258
-    buttonTurnPage = lv_btn_create(scr, NULL);
259
-    lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_ACCE_DOWN, NULL, 0);
260
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
261
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
223
+    buttonTurnPage = lv_btn_create_back(scr, event_handler, ID_ACCE_DOWN);
262 224
 
263 225
     #if HAS_ROTARY_ENCODER
264 226
       if (gCfgItems.encoder_enable) {
@@ -271,81 +233,43 @@ void lv_draw_acceleration_settings(void) {
271 233
     #endif
272 234
   }
273 235
   else {
274
-    labelYText = lv_label_create(scr, NULL);
275
-    lv_obj_set_style(labelYText, &tft_style_label_rel);
276
-    lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
277
-    lv_label_set_text(labelYText, machine_menu.Y_Acceleration);
278
-
279
-    buttonYValue = lv_btn_create(scr, NULL);
280
-    lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
281
-    lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
282
-    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_ACCE_Y, NULL, 0);
283
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
284
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
285
-    labelYValue = lv_label_create(buttonYValue, NULL);
236
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.Y_Acceleration);
237
+
238
+    buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_Y);
239
+    labelYValue = lv_label_create_empty(buttonYValue);
286 240
 
287 241
     line1 = lv_line_create(scr, NULL);
288 242
     lv_ex_line(line1, line_points[0]);
289 243
 
290
-    labelZText = lv_label_create(scr, NULL);
291
-    lv_obj_set_style(labelZText, &tft_style_label_rel);
292
-    lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
293
-    lv_label_set_text(labelZText, machine_menu.Z_Acceleration);
244
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.Z_Acceleration);
294 245
 
295
-    buttonZValue = lv_btn_create(scr, NULL);
296
-    lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
297
-    lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_ACCE_Y, NULL, 0);
298
-    lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_ACCE_Z, NULL, 0);
299
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
300
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
301
-    labelZValue = lv_label_create(buttonZValue, NULL);
246
+    buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_Z);
247
+    labelZValue = lv_label_create_empty(buttonZValue);
302 248
 
303 249
 
304 250
     line2 = lv_line_create(scr, NULL);
305 251
     lv_ex_line(line2, line_points[1]);
306 252
 
307
-    labelE0Text = lv_label_create(scr, NULL);
308
-    lv_obj_set_style(labelE0Text, &tft_style_label_rel);
309
-    lv_obj_set_pos(labelE0Text, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
310
-    lv_label_set_text(labelE0Text, machine_menu.E0_Acceleration);
253
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.E0_Acceleration);
311 254
 
312
-    buttonE0Value = lv_btn_create(scr, NULL);
313
-    lv_obj_set_pos(buttonE0Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
314
-    lv_obj_set_size(buttonE0Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_ACCE_Y, NULL, 0);
315
-    lv_obj_set_event_cb_mks(buttonE0Value, event_handler, ID_ACCE_E0, NULL, 0);
316
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_REL, &style_para_value);
317
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_PR, &style_para_value);
318
-    labelE0Value = lv_label_create(buttonE0Value, NULL);
255
+    buttonE0Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_E0);
256
+    labelE0Value = lv_label_create_empty(buttonE0Value);
319 257
 
320 258
 
321 259
     line3 = lv_line_create(scr, NULL);
322 260
     lv_ex_line(line3, line_points[2]);
323 261
 
324
-    labelE1Text = lv_label_create(scr, NULL);
325
-    lv_obj_set_style(labelE1Text, &tft_style_label_rel);
326
-    lv_obj_set_pos(labelE1Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
327
-    lv_label_set_text(labelE1Text, machine_menu.E1_Acceleration);
328
-
329
-    buttonE1Value = lv_btn_create(scr, NULL);
330
-    lv_obj_set_pos(buttonE1Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V);
331
-    lv_obj_set_size(buttonE1Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_ACCE_Y, NULL, 0);
332
-    lv_obj_set_event_cb_mks(buttonE1Value, event_handler, ID_ACCE_E1, NULL, 0);
333
-    lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_REL, &style_para_value);
334
-    lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_PR, &style_para_value);
335
-    labelE1Value = lv_label_create(buttonE1Value, NULL);
262
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.E1_Acceleration);
336 263
 
264
+    buttonE1Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_ACCE_E1);
265
+    labelE1Value = lv_label_create_empty(buttonE1Value);
337 266
 
338 267
     line4 = lv_line_create(scr, NULL);
339 268
     lv_ex_line(line4, line_points[3]);
340 269
 
341
-    buttonTurnPage = lv_btn_create(scr, NULL);
342
-    lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_ACCE_UP, NULL, 0);
343
-    //lv_imgbtn_set_src(buttonTurnPage, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
344
-    //lv_imgbtn_set_src(buttonTurnPage, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
345
-    //lv_imgbtn_set_style(buttonTurnPage, LV_BTN_STATE_PR, &tft_style_label_pre);
346
-    //lv_imgbtn_set_style(buttonTurnPage, LV_BTN_STATE_REL, &tft_style_label_rel);
347
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
348
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
270
+    buttonTurnPage = lv_btn_create_back(scr, event_handler, ID_ACCE_UP);
271
+    //lv_imgbtn_set_src_both(buttonTurnPage, "F:/bmp_back70x40.bin");
272
+    //lv_imgbtn_use_label_style(buttonTurnPage);
349 273
 
350 274
     #if HAS_ROTARY_ENCODER
351 275
       if (gCfgItems.encoder_enable) {
@@ -360,22 +284,15 @@ void lv_draw_acceleration_settings(void) {
360 284
 
361 285
   //lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
362 286
   //lv_btn_set_layout(buttonTurnPage, LV_LAYOUT_OFF);
363
-  //labelTurnPage = lv_label_create(buttonTurnPage, NULL);
287
+  //labelTurnPage = lv_label_create_empty(buttonTurnPage);
364 288
   lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
365 289
   lv_obj_set_size(buttonTurnPage, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
366
-  labelTurnPage = lv_label_create(buttonTurnPage, NULL);
367
-
368
-  buttonBack = lv_btn_create(scr, NULL);
369
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_ACCE_RETURN, NULL, 0);
370
-  //lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
371
-  //lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
372
-  //lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
373
-  //lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
374
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
375
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
376
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
377
-  lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
378
-  label_Back = lv_label_create(buttonBack, NULL);
290
+  labelTurnPage = lv_label_create_empty(buttonTurnPage);
291
+
292
+  buttonBack = lv_btn_create_back(scr, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_ACCE_RETURN);
293
+  //lv_imgbtn_set_src_both(buttonBack, "F:/bmp_back70x40.bin");
294
+  //lv_imgbtn_use_label_style(buttonBack);
295
+  label_Back = lv_label_create_empty(buttonBack);
379 296
   #if HAS_ROTARY_ENCODER
380 297
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
381 298
   #endif

+ 41
- 93
Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp Vedi File

@@ -133,14 +133,14 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
133 133
 
134 134
 void lv_draw_advance_settings(void) {
135 135
   lv_obj_t *buttonBack, *label_Back;
136
-  lv_obj_t *buttonPausePos, *labelPausePos, *buttonPausePosNarrow;
137
-  lv_obj_t *buttonFilamentSettings, *labelFilamentSettings, *buttonFilamentSettingsNarrow;
136
+  lv_obj_t *buttonPausePos, *labelPausePos;
137
+  lv_obj_t *buttonFilamentSettings, *labelFilamentSettings;
138 138
   lv_obj_t * line1,* line2;
139 139
   #if ENABLED(USE_WIFI_FUNCTION)
140
-    lv_obj_t *buttonWifiSet,*labelWifiSet,*buttonWifiSetNarrow;
140
+    lv_obj_t *buttonWifiSet, *labelWifiSet, *buttonWifiSetNarrow;
141 141
   #endif
142 142
   #if HAS_ROTARY_ENCODER
143
-    lv_obj_t *buttonEcoder,*labelEcoder,*buttonEcoderNarrow;
143
+    lv_obj_t *buttonEncoder, *labelEncoder, *buttonEncoderNarrow;
144 144
   #endif
145 145
 
146 146
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != ADVANCED_UI) {
@@ -155,10 +155,7 @@ void lv_draw_advance_settings(void) {
155 155
   lv_scr_load(scr);
156 156
   lv_obj_clean(scr);
157 157
 
158
-  lv_obj_t * title = lv_label_create(scr, NULL);
159
-  lv_obj_set_style(title, &tft_style_label_rel);
160
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
161
-  lv_label_set_text(title, machine_menu.AdvancedConfTitle);
158
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.AdvancedConfTitle);
162 159
 
163 160
   lv_refr_now(lv_refr_get_disp_refreshing());
164 161
 
@@ -167,22 +164,14 @@ void lv_draw_advance_settings(void) {
167 164
   lv_obj_set_size(buttonPausePos, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);
168 165
   //lv_obj_set_event_cb(buttonMachine, event_handler);
169 166
   lv_obj_set_event_cb_mks(buttonPausePos, event_handler, ID_PAUSE_POS, NULL, 0);
170
-  lv_btn_set_style(buttonPausePos, LV_BTN_STYLE_REL, &tft_style_label_rel);
171
-  lv_btn_set_style(buttonPausePos, LV_BTN_STYLE_PR, &tft_style_label_pre);
167
+  lv_btn_use_label_style(buttonPausePos);
172 168
   lv_btn_set_layout(buttonPausePos, LV_LAYOUT_OFF);
173
-  labelPausePos = lv_label_create(buttonPausePos, NULL);
169
+  labelPausePos = lv_label_create_empty(buttonPausePos);
174 170
   #if HAS_ROTARY_ENCODER
175 171
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonPausePos);
176 172
   #endif
177 173
 
178
-  buttonPausePosNarrow = lv_imgbtn_create(scr, NULL);
179
-  lv_obj_set_pos(buttonPausePosNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V);
180
-  lv_obj_set_event_cb_mks(buttonPausePosNarrow, event_handler, ID_PAUSE_POS_ARROW, NULL, 0);
181
-  lv_imgbtn_set_src(buttonPausePosNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
182
-  lv_imgbtn_set_src(buttonPausePosNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
183
-  lv_imgbtn_set_style(buttonPausePosNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
184
-  lv_imgbtn_set_style(buttonPausePosNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
185
-  lv_btn_set_layout(buttonPausePosNarrow, LV_LAYOUT_OFF);
174
+  (void)lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V, event_handler, ID_PAUSE_POS_ARROW);
186 175
 
187 176
   line1 = lv_line_create(lv_scr_act(), NULL);
188 177
   lv_ex_line(line1, line_points[0]);
@@ -191,22 +180,14 @@ void lv_draw_advance_settings(void) {
191 180
   lv_obj_set_pos(buttonFilamentSettings, PARA_UI_POS_X, PARA_UI_POS_Y*2);
192 181
   lv_obj_set_size(buttonFilamentSettings, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);
193 182
   lv_obj_set_event_cb_mks(buttonFilamentSettings, event_handler, ID_FILAMENT_SETTINGS, NULL, 0);
194
-  lv_btn_set_style(buttonFilamentSettings, LV_BTN_STYLE_REL, &tft_style_label_rel);
195
-  lv_btn_set_style(buttonFilamentSettings, LV_BTN_STYLE_PR, &tft_style_label_pre);
183
+  lv_btn_use_label_style(buttonFilamentSettings);
196 184
   lv_btn_set_layout(buttonFilamentSettings, LV_LAYOUT_OFF);
197
-  labelFilamentSettings = lv_label_create(buttonFilamentSettings, NULL);
185
+  labelFilamentSettings = lv_label_create_empty(buttonFilamentSettings);
198 186
   #if HAS_ROTARY_ENCODER
199 187
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonFilamentSettings);
200 188
   #endif
201 189
 
202
-  buttonFilamentSettingsNarrow = lv_imgbtn_create(scr, NULL);
203
-  lv_obj_set_pos(buttonFilamentSettingsNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y*2 + PARA_UI_ARROW_V);
204
-  lv_obj_set_event_cb_mks(buttonFilamentSettingsNarrow, event_handler, ID_FILAMENT_SETTINGS_ARROW, NULL, 0);
205
-  lv_imgbtn_set_src(buttonFilamentSettingsNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
206
-  lv_imgbtn_set_src(buttonFilamentSettingsNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
207
-  lv_imgbtn_set_style(buttonFilamentSettingsNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
208
-  lv_imgbtn_set_style(buttonFilamentSettingsNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
209
-  lv_btn_set_layout(buttonFilamentSettingsNarrow, LV_LAYOUT_OFF);
190
+  (void)lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y*2 + PARA_UI_ARROW_V, event_handler, ID_FILAMENT_SETTINGS_ARROW);
210 191
 
211 192
   line2 = lv_line_create(lv_scr_act(), NULL);
212 193
   lv_ex_line(line2, line_points[1]);
@@ -216,91 +197,58 @@ void lv_draw_advance_settings(void) {
216 197
     buttonWifiSet = lv_btn_create(scr, NULL);     /*Add a button the current screen*/
217 198
     lv_obj_set_pos(buttonWifiSet, PARA_UI_POS_X,PARA_UI_POS_Y*3);
218 199
     lv_obj_set_size(buttonWifiSet, PARA_UI_SIZE_X,PARA_UI_SIZE_Y);
219
-    lv_obj_set_event_cb_mks(buttonWifiSet, event_handler,ID_WIFI_PARA,NULL,0);
220
-    lv_btn_set_style(buttonWifiSet, LV_BTN_STYLE_REL, &tft_style_label_rel);
221
-    lv_btn_set_style(buttonWifiSet, LV_BTN_STYLE_PR, &tft_style_label_pre);
200
+    lv_obj_set_event_cb_mks(buttonWifiSet, event_handler,ID_WIFI_PARA,NULL, 0);
201
+    lv_btn_use_label_style(buttonWifiSet);
222 202
     lv_btn_set_layout(buttonWifiSet, LV_LAYOUT_OFF);
223
-    labelWifiSet = lv_label_create(buttonWifiSet, NULL);
203
+    labelWifiSet = lv_label_create_empty(buttonWifiSet);
224 204
     #if HAS_ROTARY_ENCODER
225 205
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonWifiSet);
226 206
     #endif
227 207
 
228
-    buttonWifiSetNarrow = lv_imgbtn_create(scr, NULL);
229
-    lv_obj_set_pos(buttonWifiSetNarrow,PARA_UI_POS_X+PARA_UI_SIZE_X,PARA_UI_POS_Y*3+PARA_UI_ARROW_V);
230
-    lv_obj_set_event_cb_mks(buttonWifiSetNarrow, event_handler,ID_WIFI_PARA_ARROW, NULL,0);
231
-    lv_imgbtn_set_src(buttonWifiSetNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
232
-    lv_imgbtn_set_src(buttonWifiSetNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
233
-    lv_imgbtn_set_style(buttonWifiSetNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
234
-    lv_imgbtn_set_style(buttonWifiSetNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
235
-    lv_btn_set_layout(buttonWifiSetNarrow, LV_LAYOUT_OFF);
208
+    buttonWifiSetNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V, event_handler, ID_WIFI_PARA_ARROW);
236 209
 
237 210
     lv_obj_t * line3 = lv_line_create(scr, NULL);
238 211
     lv_ex_line(line3,line_points[2]);
239 212
 
240 213
     #if HAS_ROTARY_ENCODER
241
-      buttonEcoder = lv_btn_create(scr, NULL);     /*Add a button the current screen*/
242
-      lv_obj_set_pos(buttonEcoder, PARA_UI_POS_X,PARA_UI_POS_Y*4);
243
-      lv_obj_set_size(buttonEcoder, PARA_UI_SIZE_X,PARA_UI_SIZE_Y);
244
-      lv_obj_set_event_cb_mks(buttonEcoder, event_handler,ID_ENCODER_SETTINGS,NULL,0);
245
-      lv_btn_set_style(buttonEcoder, LV_BTN_STYLE_REL, &tft_style_label_rel);
246
-      lv_btn_set_style(buttonEcoder, LV_BTN_STYLE_PR, &tft_style_label_pre);
247
-      lv_btn_set_layout(buttonEcoder, LV_LAYOUT_OFF);
248
-      labelEcoder = lv_label_create(buttonEcoder, NULL);
249
-
250
-      if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonEcoder);
251
-
252
-      buttonEcoderNarrow = lv_imgbtn_create(scr, NULL);
253
-      lv_obj_set_pos(buttonEcoderNarrow,PARA_UI_POS_X+PARA_UI_SIZE_X,PARA_UI_POS_Y*4+PARA_UI_ARROW_V);
254
-      lv_obj_set_event_cb_mks(buttonEcoderNarrow, event_handler,ID_ENCODER_SETTINGS_ARROW, NULL,0);
255
-      lv_imgbtn_set_src(buttonEcoderNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
256
-      lv_imgbtn_set_src(buttonEcoderNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
257
-      lv_imgbtn_set_style(buttonEcoderNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
258
-      lv_imgbtn_set_style(buttonEcoderNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
259
-      lv_btn_set_layout(buttonEcoderNarrow, LV_LAYOUT_OFF);
214
+      buttonEncoder = lv_btn_create(scr, NULL);     /*Add a button the current screen*/
215
+      lv_obj_set_pos(buttonEncoder, PARA_UI_POS_X,PARA_UI_POS_Y*4);
216
+      lv_obj_set_size(buttonEncoder, PARA_UI_SIZE_X,PARA_UI_SIZE_Y);
217
+      lv_obj_set_event_cb_mks(buttonEncoder, event_handler,ID_ENCODER_SETTINGS,NULL, 0);
218
+      lv_btn_use_label_style(buttonEncoder);
219
+      lv_btn_set_layout(buttonEncoder, LV_LAYOUT_OFF);
220
+      labelEncoder = lv_label_create_empty(buttonEncoder);
221
+
222
+      if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonEncoder);
223
+
224
+      buttonEncoderNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 4 + PARA_UI_ARROW_V, event_handler, ID_ENCODER_SETTINGS_ARROW);
260 225
 
261 226
       lv_obj_t * line4 = lv_line_create(scr, NULL);
262 227
       lv_ex_line(line4,line_points[3]);
263 228
     #endif
264 229
 
265 230
   #elif HAS_ROTARY_ENCODER
266
-    buttonEcoder = lv_btn_create(scr, NULL);     /*Add a button the current screen*/
267
-    lv_obj_set_pos(buttonEcoder, PARA_UI_POS_X,PARA_UI_POS_Y*3);
268
-    lv_obj_set_size(buttonEcoder, PARA_UI_SIZE_X,PARA_UI_SIZE_Y);
269
-    lv_obj_set_event_cb_mks(buttonEcoder, event_handler,ID_ENCODER_SETTINGS,NULL,0);
270
-    lv_btn_set_style(buttonEcoder, LV_BTN_STYLE_REL, &tft_style_label_rel);
271
-    lv_btn_set_style(buttonEcoder, LV_BTN_STYLE_PR, &tft_style_label_pre);
272
-    lv_btn_set_layout(buttonEcoder, LV_LAYOUT_OFF);
273
-    labelEcoder = lv_label_create(buttonEcoder, NULL);
274
-
275
-    if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonEcoder);
276
-
277
-    buttonEcoderNarrow = lv_imgbtn_create(scr, NULL);
278
-    lv_obj_set_pos(buttonEcoderNarrow,PARA_UI_POS_X+PARA_UI_SIZE_X,PARA_UI_POS_Y*3+PARA_UI_ARROW_V);
279
-    lv_obj_set_event_cb_mks(buttonEcoderNarrow, event_handler,ID_ENCODER_SETTINGS_ARROW, NULL,0);
280
-    lv_imgbtn_set_src(buttonEcoderNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
281
-    lv_imgbtn_set_src(buttonEcoderNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
282
-    lv_imgbtn_set_style(buttonEcoderNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
283
-    lv_imgbtn_set_style(buttonEcoderNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
284
-    lv_btn_set_layout(buttonEcoderNarrow, LV_LAYOUT_OFF);
231
+    buttonEncoder = lv_btn_create(scr, NULL);     /*Add a button the current screen*/
232
+    lv_obj_set_pos(buttonEncoder, PARA_UI_POS_X,PARA_UI_POS_Y*3);
233
+    lv_obj_set_size(buttonEncoder, PARA_UI_SIZE_X,PARA_UI_SIZE_Y);
234
+    lv_obj_set_event_cb_mks(buttonEncoder, event_handler,ID_ENCODER_SETTINGS,NULL, 0);
235
+    lv_btn_use_label_style(buttonEncoder);
236
+    lv_btn_set_layout(buttonEncoder, LV_LAYOUT_OFF);
237
+    labelEncoder = lv_label_create_empty(buttonEncoder);
238
+
239
+    if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonEncoder);
240
+
241
+    buttonEncoderNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V, event_handler, ID_ENCODER_SETTINGS_ARROW);
285 242
 
286 243
     lv_obj_t * line3 = lv_line_create(scr, NULL);
287 244
     lv_ex_line(line3,line_points[2]);
288 245
   #endif
289 246
 
290
-  buttonBack = lv_imgbtn_create(scr, NULL);
291
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_ADVANCE_RETURN, NULL, 0);
292
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
293
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
294
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
295
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
296
-
247
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_ADVANCE_RETURN);
297 248
   #if HAS_ROTARY_ENCODER
298 249
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
299 250
   #endif
300
-
301
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
302
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
303
-  label_Back = lv_label_create(buttonBack, NULL);
251
+  label_Back = lv_label_create_empty(buttonBack);
304 252
 
305 253
   if (gCfgItems.multiple_language) {
306 254
     lv_label_set_text(label_Back, common_menu.text_back);
@@ -317,8 +265,8 @@ void lv_draw_advance_settings(void) {
317 265
       lv_obj_align(labelWifiSet, buttonWifiSet, LV_ALIGN_IN_LEFT_MID,0, 0);
318 266
     #endif
319 267
     #if HAS_ROTARY_ENCODER
320
-      lv_label_set_text(labelEcoder, machine_menu.EncoderSettings);
321
-      lv_obj_align(labelEcoder, buttonEcoder, LV_ALIGN_IN_LEFT_MID,0, 0);
268
+      lv_label_set_text(labelEncoder, machine_menu.EncoderSettings);
269
+      lv_obj_align(labelEncoder, buttonEncoder, LV_ALIGN_IN_LEFT_MID,0, 0);
322 270
     #endif
323 271
   }
324 272
 

+ 15
- 47
Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp Vedi File

@@ -83,9 +83,9 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
83 83
 
84 84
 void lv_draw_auto_level_offset_settings(void) {
85 85
   lv_obj_t *buttonBack = NULL, *label_Back = NULL;
86
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
87
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
88
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
86
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
87
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
88
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
89 89
   lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL;
90 90
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != NOZZLE_PROBE_OFFSET_UI) {
91 91
     disp_state_stack._disp_index++;
@@ -99,68 +99,36 @@ void lv_draw_auto_level_offset_settings(void) {
99 99
   lv_scr_load(scr);
100 100
   lv_obj_clean(scr);
101 101
 
102
-  lv_obj_t * title = lv_label_create(scr, NULL);
103
-  lv_obj_set_style(title, &tft_style_label_rel);
104
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
105
-  lv_label_set_text(title, machine_menu.OffsetConfTitle);
102
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.OffsetConfTitle);
106 103
 
107 104
   lv_refr_now(lv_refr_get_disp_refreshing());
108 105
 
109
-  labelXText = lv_label_create(scr, NULL);
110
-  lv_obj_set_style(labelXText, &tft_style_label_rel);
111
-  lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
112
-  lv_label_set_text(labelXText, machine_menu.Xoffset);
106
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.Xoffset);
113 107
 
114
-  buttonXValue = lv_btn_create(scr, NULL);
115
-  lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
116
-  lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
117
-  lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_OFFSET_X, NULL, 0);
118
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
119
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
120
-  labelXValue = lv_label_create(buttonXValue, NULL);
108
+  buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_OFFSET_X);
109
+  labelXValue = lv_label_create_empty(buttonXValue);
121 110
 
122 111
   line1 = lv_line_create(scr, NULL);
123 112
   lv_ex_line(line1, line_points[0]);
124 113
 
125
-  labelYText = lv_label_create(scr, NULL);
126
-  lv_obj_set_style(labelYText, &tft_style_label_rel);
127
-  lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
128
-  lv_label_set_text(labelYText, machine_menu.Yoffset);
114
+  lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.Yoffset);
129 115
 
130
-  buttonYValue = lv_btn_create(scr, NULL);
131
-  lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2);
132
-  lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
133
-  lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_OFFSET_Y, NULL, 0);
134
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
135
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
136
-  labelYValue = lv_label_create(buttonYValue, NULL);
116
+  buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_OFFSET_Y);
117
+  labelYValue = lv_label_create_empty(buttonYValue);
137 118
 
138 119
   line2 = lv_line_create(scr, NULL);
139 120
   lv_ex_line(line2, line_points[1]);
140 121
 
141
-  labelZText = lv_label_create(scr, NULL);
142
-  lv_obj_set_style(labelZText, &tft_style_label_rel);
143
-  lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
144
-  lv_label_set_text(labelZText, machine_menu.Zoffset);
122
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.Zoffset);
145 123
 
146
-  buttonZValue = lv_btn_create(scr, NULL);
147
-  lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2);
148
-  lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
149
-  lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_OFFSET_Z, NULL, 0);
150
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
151
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
152
-  labelZValue = lv_label_create(buttonZValue, NULL);
124
+  buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_OFFSET_Z);
125
+  labelZValue = lv_label_create_empty(buttonZValue);
153 126
 
154 127
   line3 = lv_line_create(scr, NULL);
155 128
   lv_ex_line(line3, line_points[2]);
156 129
 
157
-  buttonBack = lv_btn_create(scr, NULL);
158
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_OFFSET_RETURN, NULL, 0);
159
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
160
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
161
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
162
-  lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
163
-  label_Back = lv_label_create(buttonBack, NULL);
130
+  buttonBack = lv_btn_create_back(scr, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_OFFSET_RETURN);
131
+  label_Back = lv_label_create_empty(buttonBack);
164 132
 
165 133
   #if HAS_ROTARY_ENCODER
166 134
     if (gCfgItems.encoder_enable) {

+ 29
- 112
Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp Vedi File

@@ -30,6 +30,10 @@
30 30
 #include "../../../../gcode/gcode.h"
31 31
 #include "../../../../inc/MarlinConfig.h"
32 32
 
33
+#if ENABLED(EEPROM_SETTINGS)
34
+  #include "../../../../module/settings.h"
35
+#endif
36
+
33 37
 #if HAS_BED_PROBE
34 38
   #include "../../../../module/probe.h"
35 39
 #endif
@@ -59,7 +63,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
59 63
         // nothing to do
60 64
       }
61 65
       else if (event == LV_EVENT_RELEASED) {
62
-        ZERO(baby_buf);
63 66
         sprintf_P(baby_buf, PSTR("M290 X%.3f"),babystep_dist);
64 67
         gcode.process_subcommands_now_P(PSTR(baby_buf));
65 68
         has_adjust_z = 1;
@@ -70,7 +73,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
70 73
         // nothing to do
71 74
       }
72 75
       else if (event == LV_EVENT_RELEASED) {
73
-        ZERO(baby_buf);
74 76
         sprintf_P(baby_buf, PSTR("M290 X%.3f"),((float)0 - babystep_dist));
75 77
         gcode.process_subcommands_now_P(PSTR(baby_buf));
76 78
         has_adjust_z = 1;
@@ -81,7 +83,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
81 83
         // nothing to do
82 84
       }
83 85
       else if (event == LV_EVENT_RELEASED) {
84
-        ZERO(baby_buf);
85 86
         sprintf_P(baby_buf, PSTR("M290 Y%.3f"), babystep_dist);
86 87
         gcode.process_subcommands_now_P(PSTR(baby_buf));
87 88
         has_adjust_z = 1;
@@ -92,7 +93,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
92 93
         // nothing to do
93 94
       }
94 95
       else if (event == LV_EVENT_RELEASED) {
95
-        ZERO(baby_buf);
96 96
         sprintf_P(baby_buf, PSTR("M290 Y%.3f"),((float)0 - babystep_dist));
97 97
         gcode.process_subcommands_now_P(PSTR(baby_buf));
98 98
         has_adjust_z = 1;
@@ -103,7 +103,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
103 103
         // nothing to do
104 104
       }
105 105
       else if (event == LV_EVENT_RELEASED) {
106
-        ZERO(baby_buf);
107 106
         sprintf_P(baby_buf, PSTR("M290 Z%.3f"), babystep_dist);
108 107
         gcode.process_subcommands_now_P(PSTR(baby_buf));
109 108
         has_adjust_z = 1;
@@ -114,7 +113,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
114 113
         // nothing to do
115 114
       }
116 115
       else if (event == LV_EVENT_RELEASED) {
117
-        ZERO(baby_buf);
118 116
         sprintf_P(baby_buf, PSTR("M290 Z%.3f"),((float)0 - babystep_dist));
119 117
         gcode.process_subcommands_now_P(PSTR(baby_buf));
120 118
         has_adjust_z = 1;
@@ -141,7 +139,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
141 139
       }
142 140
       else if (event == LV_EVENT_RELEASED) {
143 141
         if (has_adjust_z == 1) {
144
-          gcode.process_subcommands_now_P(PSTR("M500"));
142
+          TERN_(EEPROM_SETTINGS, (void)settings.save());
145 143
           has_adjust_z = 0;
146 144
         }
147 145
         clear_cur_ui();
@@ -152,8 +150,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
152 150
 }
153 151
 
154 152
 void lv_draw_baby_stepping(void) {
155
-  lv_obj_t *buttonXI, *buttonXD, *buttonYI, *buttonYD, *buttonZI, *buttonZD, *buttonBack;
156
-
157 153
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != BABY_STEP_UI) {
158 154
     disp_state_stack._disp_index++;
159 155
     disp_state_stack._disp_state[disp_state_stack._disp_index] = BABY_STEP_UI;
@@ -166,98 +162,29 @@ void lv_draw_baby_stepping(void) {
166 162
   lv_scr_load(scr);
167 163
   lv_obj_clean(scr);
168 164
 
169
-  lv_obj_t * title = lv_label_create(scr, NULL);
170
-  lv_obj_set_style(title, &tft_style_label_rel);
171
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
172
-  lv_label_set_text(title, creat_title_text());
165
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
173 166
 
174 167
   lv_refr_now(lv_refr_get_disp_refreshing());
175 168
 
176 169
   // Create an Image button
177
-  buttonXI   = lv_imgbtn_create(scr, NULL);
178
-  buttonXD   = lv_imgbtn_create(scr, NULL);
179
-  buttonYI   = lv_imgbtn_create(scr, NULL);
180
-  buttonYD   = lv_imgbtn_create(scr, NULL);
181
-  buttonZI   = lv_imgbtn_create(scr, NULL);
182
-  buttonZD   = lv_imgbtn_create(scr, NULL);
183
-  buttonV    = lv_imgbtn_create(scr, NULL);
184
-  buttonBack = lv_imgbtn_create(scr, NULL);
185
-
186
-  lv_obj_set_event_cb_mks(buttonXI, event_handler, ID_BABY_STEP_X_P, NULL, 0);
187
-  lv_imgbtn_set_src(buttonXI, LV_BTN_STATE_REL, "F:/bmp_xAdd.bin");
188
-  lv_imgbtn_set_src(buttonXI, LV_BTN_STATE_PR, "F:/bmp_xAdd.bin");
189
-  lv_imgbtn_set_style(buttonXI, LV_BTN_STATE_PR, &tft_style_label_pre);
190
-  lv_imgbtn_set_style(buttonXI, LV_BTN_STATE_REL, &tft_style_label_rel);
191
-
192
-  #if 1
193
-    lv_obj_set_event_cb_mks(buttonXD, event_handler, ID_BABY_STEP_X_N, NULL, 0);
194
-    lv_imgbtn_set_src(buttonXD, LV_BTN_STATE_REL, "F:/bmp_xDec.bin");
195
-    lv_imgbtn_set_src(buttonXD, LV_BTN_STATE_PR, "F:/bmp_xDec.bin");
196
-    lv_imgbtn_set_style(buttonXD, LV_BTN_STATE_PR, &tft_style_label_pre);
197
-    lv_imgbtn_set_style(buttonXD, LV_BTN_STATE_REL, &tft_style_label_rel);
198
-
199
-    lv_obj_set_event_cb_mks(buttonYI, event_handler, ID_BABY_STEP_Y_P, NULL, 0);
200
-    lv_imgbtn_set_src(buttonYI, LV_BTN_STATE_REL, "F:/bmp_yAdd.bin");
201
-    lv_imgbtn_set_src(buttonYI, LV_BTN_STATE_PR, "F:/bmp_yAdd.bin");
202
-    lv_imgbtn_set_style(buttonYI, LV_BTN_STATE_PR, &tft_style_label_pre);
203
-    lv_imgbtn_set_style(buttonYI, LV_BTN_STATE_REL, &tft_style_label_rel);
204
-
205
-    lv_obj_set_event_cb_mks(buttonYD, event_handler, ID_BABY_STEP_Y_N, NULL, 0);
206
-    lv_imgbtn_set_src(buttonYD, LV_BTN_STATE_REL, "F:/bmp_yDec.bin");
207
-    lv_imgbtn_set_src(buttonYD, LV_BTN_STATE_PR, "F:/bmp_yDec.bin");
208
-    lv_imgbtn_set_style(buttonYD, LV_BTN_STATE_PR, &tft_style_label_pre);
209
-    lv_imgbtn_set_style(buttonYD, LV_BTN_STATE_REL, &tft_style_label_rel);
210
-
211
-    lv_obj_set_event_cb_mks(buttonZI, event_handler, ID_BABY_STEP_Z_P, NULL, 0);
212
-    lv_imgbtn_set_src(buttonZI, LV_BTN_STATE_REL, "F:/bmp_zAdd.bin");
213
-    lv_imgbtn_set_src(buttonZI, LV_BTN_STATE_PR, "F:/bmp_zAdd.bin");
214
-    lv_imgbtn_set_style(buttonZI, LV_BTN_STATE_PR, &tft_style_label_pre);
215
-    lv_imgbtn_set_style(buttonZI, LV_BTN_STATE_REL, &tft_style_label_rel);
216
-
217
-    lv_obj_set_event_cb_mks(buttonZD, event_handler, ID_BABY_STEP_Z_N, NULL, 0);
218
-    lv_imgbtn_set_src(buttonZD, LV_BTN_STATE_REL, "F:/bmp_zDec.bin");
219
-    lv_imgbtn_set_src(buttonZD, LV_BTN_STATE_PR, "F:/bmp_zDec.bin");
220
-    lv_imgbtn_set_style(buttonZD, LV_BTN_STATE_PR, &tft_style_label_pre);
221
-    lv_imgbtn_set_style(buttonZD, LV_BTN_STATE_REL, &tft_style_label_rel);
222
-
223
-    lv_obj_set_event_cb_mks(buttonV, event_handler, ID_BABY_STEP_DIST, NULL, 0);
224
-    lv_imgbtn_set_style(buttonV, LV_BTN_STATE_PR, &tft_style_label_pre);
225
-    lv_imgbtn_set_style(buttonV, LV_BTN_STATE_REL, &tft_style_label_rel);
226
-
227
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_BABY_STEP_RETURN, NULL, 0);
228
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
229
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
230
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
231
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
232
-
233
-  #endif // if 1
234
-  lv_obj_set_pos(buttonXI, INTERVAL_V, titleHeight);
235
-  lv_obj_set_pos(buttonYI, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
236
-  lv_obj_set_pos(buttonZI, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
237
-  lv_obj_set_pos(buttonV, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
238
-  lv_obj_set_pos(buttonXD, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
239
-  lv_obj_set_pos(buttonYD, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
240
-  lv_obj_set_pos(buttonZD, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
241
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
170
+  lv_obj_t *buttonXI = lv_imgbtn_create(scr, "F:/bmp_xAdd.bin", INTERVAL_V, titleHeight, event_handler, ID_BABY_STEP_X_P);
171
+  lv_obj_t *buttonXD = lv_imgbtn_create(scr, "F:/bmp_xDec.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_X_N);
172
+  lv_obj_t *buttonYI = lv_imgbtn_create(scr, "F:/bmp_yAdd.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABY_STEP_Y_P);
173
+  lv_obj_t *buttonYD = lv_imgbtn_create(scr, "F:/bmp_yDec.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_Y_N);
174
+  lv_obj_t *buttonZI = lv_imgbtn_create(scr, "F:/bmp_zAdd.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABY_STEP_Z_P);
175
+  lv_obj_t *buttonZD = lv_imgbtn_create(scr, "F:/bmp_zDec.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_Z_N);
176
+             buttonV = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
177
+  lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);
242 178
 
243 179
   // Create labels on the image buttons
244
-  lv_btn_set_layout(buttonXI, LV_LAYOUT_OFF);
245
-  lv_btn_set_layout(buttonXD, LV_LAYOUT_OFF);
246
-  lv_btn_set_layout(buttonYI, LV_LAYOUT_OFF);
247
-  lv_btn_set_layout(buttonYD, LV_LAYOUT_OFF);
248
-  lv_btn_set_layout(buttonZI, LV_LAYOUT_OFF);
249
-  lv_btn_set_layout(buttonZD, LV_LAYOUT_OFF);
250
-  lv_btn_set_layout(buttonV, LV_LAYOUT_OFF);
251
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
252
-
253
-  lv_obj_t *labelXI = lv_label_create(buttonXI, NULL);
254
-  lv_obj_t *labelXD = lv_label_create(buttonXD, NULL);
255
-  lv_obj_t *labelYI = lv_label_create(buttonYI, NULL);
256
-  lv_obj_t *labelYD = lv_label_create(buttonYD, NULL);
257
-  lv_obj_t *labelZI = lv_label_create(buttonZI, NULL);
258
-  lv_obj_t *labelZD = lv_label_create(buttonZD, NULL);
259
-  labelV = lv_label_create(buttonV, NULL);
260
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
180
+  lv_obj_t *labelXI = lv_label_create_empty(buttonXI);
181
+  lv_obj_t *labelXD = lv_label_create_empty(buttonXD);
182
+  lv_obj_t *labelYI = lv_label_create_empty(buttonYI);
183
+  lv_obj_t *labelYD = lv_label_create_empty(buttonYD);
184
+  lv_obj_t *labelZI = lv_label_create_empty(buttonZI);
185
+  lv_obj_t *labelZD = lv_label_create_empty(buttonZD);
186
+  labelV = lv_label_create_empty(buttonV);
187
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
261 188
 
262 189
   if (gCfgItems.multiple_language) {
263 190
     lv_label_set_text(labelXI, move_menu.x_add);
@@ -297,27 +224,19 @@ void lv_draw_baby_stepping(void) {
297 224
 
298 225
   disp_baby_step_dist();
299 226
 
300
-  zOffsetText = lv_label_create(scr, NULL);
301
-  lv_obj_set_style(zOffsetText, &tft_style_label_rel);
302
-  lv_obj_set_pos(zOffsetText, 290, TITLE_YPOS);
227
+  zOffsetText = lv_label_create(scr, 290, TITLE_YPOS, NULL);
303 228
   disp_z_offset_value();
304 229
 }
305 230
 
306 231
 void disp_baby_step_dist() {
307 232
   // char buf[30] = {0};
233
+  if ((int)(100 * babystep_dist) == 1)
234
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_baby_move0_01.bin");
235
+  else if ((int)(100 * babystep_dist) == 5)
236
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_baby_move0_05.bin");
237
+  else if ((int)(100 * babystep_dist) == 10)
238
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_baby_move0_1.bin");
308 239
 
309
-  if ((int)(100 * babystep_dist) == 1) {
310
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_REL, "F:/bmp_baby_move0_01.bin");
311
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_PR, "F:/bmp_baby_move0_01.bin");
312
-  }
313
-  else if ((int)(100 * babystep_dist) == 5) {
314
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_REL, "F:/bmp_baby_move0_05.bin");
315
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_PR, "F:/bmp_baby_move0_05.bin");
316
-  }
317
-  else if ((int)(100 * babystep_dist) == 10) {
318
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_REL, "F:/bmp_baby_move0_1.bin");
319
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_PR, "F:/bmp_baby_move0_1.bin");
320
-  }
321 240
   if (gCfgItems.multiple_language) {
322 241
     if ((int)(100 * babystep_dist) == 1) {
323 242
       lv_label_set_text(labelV, move_menu.step_001mm);
@@ -336,8 +255,6 @@ void disp_baby_step_dist() {
336 255
 
337 256
 void disp_z_offset_value() {
338 257
   char buf[20];
339
-
340
-  ZERO(buf);
341 258
   sprintf_P(buf, PSTR("offset Z: %.3f"), (double)TERN(HAS_BED_PROBE, probe.offset.z, 0));
342 259
   lv_label_set_text(zOffsetText, buf);
343 260
 }

+ 25
- 84
Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp Vedi File

@@ -168,75 +168,25 @@ void lv_draw_change_speed(void) {
168 168
   lv_scr_load(scr);
169 169
   lv_obj_clean(scr);
170 170
 
171
-  lv_obj_t * title = lv_label_create(scr, NULL);
172
-  lv_obj_set_style(title, &tft_style_label_rel);
173
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
174
-  lv_label_set_text(title, creat_title_text());
171
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
175 172
 
176 173
   lv_refr_now(lv_refr_get_disp_refreshing());
177 174
 
178
-
179 175
   // Create an Image button
180
-  buttonAdd  = lv_imgbtn_create(scr, NULL);
181
-  buttonDec  = lv_imgbtn_create(scr, NULL);
182
-  buttonMov  = lv_imgbtn_create(scr, NULL);
183
-  buttonExt  = lv_imgbtn_create(scr, NULL);
184
-  buttonStep = lv_imgbtn_create(scr, NULL);
185
-  buttonBack = lv_imgbtn_create(scr, NULL);
186
-
187
-  lv_obj_set_event_cb_mks(buttonAdd, event_handler, ID_C_ADD, NULL, 0);
188
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_REL, "F:/bmp_Add.bin");
189
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_PR, "F:/bmp_Add.bin");
190
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_PR, &tft_style_label_pre);
191
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_REL, &tft_style_label_rel);
192
-
193
-  #if 1
194
-    lv_obj_set_event_cb_mks(buttonDec, event_handler, ID_C_DEC, NULL, 0);
195
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_REL, "F:/bmp_Dec.bin");
196
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_PR, "F:/bmp_Dec.bin");
197
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_PR, &tft_style_label_pre);
198
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_REL, &tft_style_label_rel);
199
-
200
-    lv_obj_set_event_cb_mks(buttonMov, event_handler, ID_C_MOVE, NULL, 0);
201
-    lv_imgbtn_set_style(buttonMov, LV_BTN_STATE_PR, &tft_style_label_pre);
202
-    lv_imgbtn_set_style(buttonMov, LV_BTN_STATE_REL, &tft_style_label_rel);
203
-
204
-    lv_obj_set_event_cb_mks(buttonExt, event_handler, ID_C_EXT, NULL, 0);
205
-    lv_imgbtn_set_style(buttonExt, LV_BTN_STATE_PR, &tft_style_label_pre);
206
-    lv_imgbtn_set_style(buttonExt, LV_BTN_STATE_REL, &tft_style_label_rel);
207
-
208
-    lv_obj_set_event_cb_mks(buttonStep, event_handler, ID_C_STEP, NULL, 0);
209
-    lv_imgbtn_set_style(buttonStep, LV_BTN_STATE_PR, &tft_style_label_pre);
210
-    lv_imgbtn_set_style(buttonStep, LV_BTN_STATE_REL, &tft_style_label_rel);
211
-
212
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_C_RETURN, NULL, 0);
213
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
214
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
215
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
216
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
217
-  #endif
218
-
219
-  lv_obj_set_pos(buttonAdd, INTERVAL_V, titleHeight);
220
-  lv_obj_set_pos(buttonDec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
221
-  lv_obj_set_pos(buttonMov, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
222
-  lv_obj_set_pos(buttonExt, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
223
-  lv_obj_set_pos(buttonStep, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
224
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
176
+  buttonAdd  = lv_imgbtn_create(scr, "F:/bmp_Add.bin", INTERVAL_V, titleHeight, event_handler, ID_C_ADD);
177
+  buttonDec  = lv_imgbtn_create(scr, "F:/bmp_Dec.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_C_DEC);
178
+  buttonMov  = lv_imgbtn_create(scr, NULL, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
179
+  buttonExt  = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
180
+  buttonStep = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
181
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
225 182
 
226 183
   // Create labels on the image buttons
227
-  lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
228
-  lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
229
-  lv_btn_set_layout(buttonMov, LV_LAYOUT_OFF);
230
-  lv_btn_set_layout(buttonExt, LV_LAYOUT_OFF);
231
-  lv_btn_set_layout(buttonStep, LV_LAYOUT_OFF);
232
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
233
-
234
-  lv_obj_t *labelAdd    = lv_label_create(buttonAdd, NULL);
235
-  lv_obj_t *labelDec    = lv_label_create(buttonDec, NULL);
236
-  labelMov              = lv_label_create(buttonMov, NULL);
237
-  labelExt              = lv_label_create(buttonExt, NULL);
238
-  labelStep             = lv_label_create(buttonStep, NULL);
239
-  lv_obj_t *label_Back  = lv_label_create(buttonBack, NULL);
184
+  lv_obj_t *labelAdd    = lv_label_create_empty(buttonAdd);
185
+  lv_obj_t *labelDec    = lv_label_create_empty(buttonDec);
186
+  labelMov              = lv_label_create_empty(buttonMov);
187
+  labelExt              = lv_label_create_empty(buttonExt);
188
+  labelStep             = lv_label_create_empty(buttonStep);
189
+  lv_obj_t *label_Back  = lv_label_create_empty(buttonBack);
240 190
 
241 191
   if (gCfgItems.multiple_language) {
242 192
     lv_label_set_text(labelAdd, speed_menu.add);
@@ -262,24 +212,19 @@ void lv_draw_change_speed(void) {
262 212
   disp_speed_type();
263 213
   disp_speed_step();
264 214
 
265
-  printSpeedText = lv_label_create(scr, NULL);
215
+  printSpeedText = lv_label_create_empty(scr);
266 216
   lv_obj_set_style(printSpeedText, &tft_style_label_rel);
267 217
   disp_print_speed();
268 218
 }
269 219
 
270 220
 void disp_speed_step() {
271
-  if (uiCfg.stepPrintSpeed == 1) {
272
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step1_percent.bin");
273
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step1_percent.bin");
274
-  }
275
-  else if (uiCfg.stepPrintSpeed == 5) {
276
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step5_percent.bin");
277
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step5_percent.bin");
278
-  }
279
-  else if (uiCfg.stepPrintSpeed == 10) {
280
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step10_percent.bin");
281
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step10_percent.bin");
282
-  }
221
+  if (uiCfg.stepPrintSpeed == 1)
222
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_percent.bin");
223
+  else if (uiCfg.stepPrintSpeed == 5)
224
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_percent.bin");
225
+  else if (uiCfg.stepPrintSpeed == 10)
226
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_percent.bin");
227
+
283 228
   if (gCfgItems.multiple_language) {
284 229
     if (uiCfg.stepPrintSpeed == 1) {
285 230
       lv_label_set_text(labelStep, speed_menu.step_1percent);
@@ -320,17 +265,13 @@ void disp_print_speed() {
320 265
 void disp_speed_type() {
321 266
   switch (speedType) {
322 267
     case 1:
323
-      lv_imgbtn_set_src(buttonMov, LV_BTN_STATE_REL, "F:/bmp_mov_changeSpeed.bin");
324
-      lv_imgbtn_set_src(buttonMov, LV_BTN_STATE_PR, "F:/bmp_mov_changeSpeed.bin");
325
-      lv_imgbtn_set_src(buttonExt, LV_BTN_STATE_REL, "F:/bmp_extruct_sel.bin");
326
-      lv_imgbtn_set_src(buttonExt, LV_BTN_STATE_PR, "F:/bmp_extruct_sel.bin");
268
+      lv_imgbtn_set_src_both(buttonMov, "F:/bmp_mov_changeSpeed.bin");
269
+      lv_imgbtn_set_src_both(buttonExt, "F:/bmp_extruct_sel.bin");
327 270
       break;
328 271
 
329 272
     default:
330
-      lv_imgbtn_set_src(buttonMov, LV_BTN_STATE_REL, "F:/bmp_mov_sel.bin");
331
-      lv_imgbtn_set_src(buttonMov, LV_BTN_STATE_PR, "F:/bmp_mov_sel.bin");
332
-      lv_imgbtn_set_src(buttonExt, LV_BTN_STATE_REL, "F:/bmp_speed_extruct.bin");
333
-      lv_imgbtn_set_src(buttonExt, LV_BTN_STATE_PR, "F:/bmp_speed_extruct.bin");
273
+      lv_imgbtn_set_src_both(buttonMov, "F:/bmp_mov_sel.bin");
274
+      lv_imgbtn_set_src_both(buttonExt, "F:/bmp_speed_extruct.bin");
334 275
       break;
335 276
   }
336 277
   lv_obj_refresh_ext_draw_pad(buttonExt);

+ 45
- 60
Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp Vedi File

@@ -43,6 +43,10 @@
43 43
 #include "../../../../gcode/gcode.h"
44 44
 #include "../../../../inc/MarlinConfig.h"
45 45
 
46
+#if ENABLED(EEPROM_SETTINGS)
47
+  #include "../../../../module/settings.h"
48
+#endif
49
+
46 50
 #if ENABLED(POWER_LOSS_RECOVERY)
47 51
   #include "../../../../feature/powerloss.h"
48 52
 #endif
@@ -155,17 +159,17 @@ static void btn_ok_event_cb(lv_obj_t * btn, lv_event_t event) {
155 159
       }
156 160
     #endif
157 161
     else if (uiCfg.dialogType == DIALOG_STORE_EEPROM_TIPS) {
158
-      gcode.process_subcommands_now_P(PSTR("M500"));
162
+      TERN_(EEPROM_SETTINGS, (void)settings.save());
159 163
       clear_cur_ui();
160 164
       draw_return_ui();
161 165
     }
162 166
     else if (uiCfg.dialogType == DIALOG_READ_EEPROM_TIPS) {
163
-      gcode.process_subcommands_now_P(PSTR("M501"));
167
+      TERN_(EEPROM_SETTINGS, (void)settings.load());
164 168
       clear_cur_ui();
165 169
       draw_return_ui();
166 170
     }
167 171
     else if (uiCfg.dialogType == DIALOG_REVERT_EEPROM_TIPS) {
168
-      gcode.process_subcommands_now_P(PSTR("M502"));
172
+      TERN_(EEPROM_SETTINGS, (void)settings.reset());
169 173
       clear_cur_ui();
170 174
       draw_return_ui();
171 175
     }
@@ -199,7 +203,7 @@ static void btn_cancel_event_cb(lv_obj_t * btn, lv_event_t event) {
199 203
         pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
200 204
       #endif
201 205
     }
202
-    else if ((uiCfg.dialogType      == DIALOG_TYPE_FILAMENT_LOAD_HEAT)
206
+    else if ((uiCfg.dialogType == DIALOG_TYPE_FILAMENT_LOAD_HEAT)
203 207
           || (uiCfg.dialogType == DIALOG_TYPE_FILAMENT_UNLOAD_HEAT)
204 208
           || (uiCfg.dialogType == DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED)
205 209
           || (uiCfg.dialogType == DIALOG_TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED)
@@ -244,19 +248,14 @@ void lv_draw_dialog(uint8_t type) {
244 248
 
245 249
   scr = lv_obj_create(NULL, NULL);
246 250
 
247
-
248 251
   lv_obj_set_style(scr, &tft_style_scr);
249 252
   lv_scr_load(scr);
250 253
   lv_obj_clean(scr);
251 254
 
252
-  lv_obj_t * title = lv_label_create(scr, NULL);
253
-  lv_obj_set_style(title, &tft_style_label_rel);
254
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
255
-  lv_label_set_text(title, creat_title_text());
255
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
256 256
 
257 257
   lv_refr_now(lv_refr_get_disp_refreshing());
258 258
 
259
-
260 259
   static lv_style_t style_btn_rel;                                 // A variable to store the released style
261 260
   lv_style_copy(&style_btn_rel, &lv_style_plain);                  // Initialize from a built-in style
262 261
   style_btn_rel.body.border.color = lv_color_hex3(0x269);
@@ -278,17 +277,21 @@ void lv_draw_dialog(uint8_t type) {
278 277
   style_btn_pr.text.color        = lv_color_hex3(0xBCD);
279 278
   style_btn_pr.text.font         = &TERN(HAS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
280 279
 
281
-  lv_obj_t *labelDialog = lv_label_create(scr, NULL);
282
-  lv_obj_set_style(labelDialog, &tft_style_label_rel);
280
+  // Set button styles for Released and Pressed
281
+  auto lv_btn_use_button_style = [&](lv_obj_t *btn) {
282
+    lv_btn_set_style(btn, LV_BTN_STYLE_REL, &style_btn_rel);
283
+    lv_btn_set_style(btn, LV_BTN_STYLE_PR,  &style_btn_pr);
284
+  };
285
+
286
+  lv_obj_t *labelDialog = lv_label_create_empty(scr);
283 287
 
284 288
   if (uiCfg.dialogType == DIALOG_TYPE_FINISH_PRINT || uiCfg.dialogType == DIALOG_PAUSE_MESSAGE_RESUME) {
285 289
       btnOk = lv_btn_create(scr, NULL);                   // Add a button the current screen
286 290
       lv_obj_set_pos(btnOk, BTN_OK_X + 90, BTN_OK_Y);                // Set its position
287 291
       lv_obj_set_size(btnOk, 100, 50);                               // Set its size
288 292
       lv_obj_set_event_cb(btnOk, btn_ok_event_cb);
289
-      lv_btn_set_style(btnOk, LV_BTN_STYLE_REL, &style_btn_rel);     // Set the button's released style
290
-      lv_btn_set_style(btnOk, LV_BTN_STYLE_PR, &style_btn_pr);       // Set the button's pressed style
291
-      lv_obj_t *labelOk = lv_label_create(btnOk, NULL);             // Add a label to the button
293
+      lv_btn_use_button_style(btnOk);
294
+      lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
292 295
       lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
293 296
   }
294 297
   else if (uiCfg.dialogType == DIALOG_PAUSE_MESSAGE_WAITING
@@ -299,9 +302,8 @@ void lv_draw_dialog(uint8_t type) {
299 302
     lv_obj_set_pos(btnOk, BTN_OK_X + 90, BTN_OK_Y);                // Set its position
300 303
     lv_obj_set_size(btnOk, 100, 50);                               // Set its size
301 304
     lv_obj_set_event_cb(btnOk, btn_ok_event_cb);
302
-    lv_btn_set_style(btnOk, LV_BTN_STYLE_REL, &style_btn_rel);     // Set the button's released style
303
-    lv_btn_set_style(btnOk, LV_BTN_STYLE_PR, &style_btn_pr);       // Set the button's pressed style
304
-    lv_obj_t *labelOk = lv_label_create(btnOk, NULL);             // Add a label to the button
305
+    lv_btn_use_button_style(btnOk);
306
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
305 307
     lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
306 308
   }
307 309
   else if (uiCfg.dialogType == DIALOG_PAUSE_MESSAGE_PAUSING
@@ -319,9 +321,8 @@ void lv_draw_dialog(uint8_t type) {
319 321
     lv_obj_set_pos(btnCancel, BTN_OK_X+90, BTN_OK_Y);
320 322
     lv_obj_set_size(btnCancel, 100, 50);
321 323
     lv_obj_set_event_cb(btnCancel, btn_cancel_event_cb);
322
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_REL, &style_btn_rel);
323
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_PR, &style_btn_pr);
324
-    lv_obj_t *labelCancel = lv_label_create(btnCancel, NULL);
324
+    lv_btn_use_button_style(btnCancel);
325
+    lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
325 326
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancle);
326 327
   }
327 328
   else if (uiCfg.dialogType == DIALOG_TRANSFER_NO_DEVICE) {
@@ -329,9 +330,8 @@ void lv_draw_dialog(uint8_t type) {
329 330
     lv_obj_set_pos(btnCancel, BTN_OK_X+90, BTN_OK_Y);
330 331
     lv_obj_set_size(btnCancel, 100, 50);
331 332
     lv_obj_set_event_cb(btnCancel, btn_cancel_event_cb);
332
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_REL, &style_btn_rel);
333
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_PR, &style_btn_pr);
334
-    lv_obj_t *labelCancel = lv_label_create(btnCancel, NULL);
333
+    lv_btn_use_button_style(btnCancel);
334
+    lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
335 335
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancle);
336 336
   }
337 337
   #if ENABLED(USE_WIFI_FUNCTION)
@@ -341,9 +341,8 @@ void lv_draw_dialog(uint8_t type) {
341 341
         lv_obj_set_pos(btnCancel, BTN_OK_X+90, BTN_OK_Y);
342 342
         lv_obj_set_size(btnCancel, 100, 50);
343 343
         lv_obj_set_event_cb(btnCancel, btn_cancel_event_cb);
344
-        lv_btn_set_style(btnCancel, LV_BTN_STYLE_REL, &style_btn_rel);
345
-        lv_btn_set_style(btnCancel, LV_BTN_STYLE_PR, &style_btn_pr);
346
-        lv_obj_t *labelCancel = lv_label_create(btnCancel, NULL);
344
+        lv_btn_use_button_style(btnCancel);
345
+        lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
347 346
         lv_label_set_text(labelCancel, print_file_dialog_menu.cancle);
348 347
       }
349 348
       else if (upload_result == 3) {
@@ -351,9 +350,8 @@ void lv_draw_dialog(uint8_t type) {
351 350
         lv_obj_set_pos(btnOk, BTN_OK_X+90, BTN_OK_Y);
352 351
         lv_obj_set_size(btnOk, 100, 50);
353 352
         lv_obj_set_event_cb(btnOk, btn_ok_event_cb);
354
-        lv_btn_set_style(btnOk, LV_BTN_STYLE_REL, &style_btn_rel);
355
-        lv_btn_set_style(btnOk, LV_BTN_STYLE_PR, &style_btn_pr);
356
-        lv_obj_t *labelOk = lv_label_create(btnOk, NULL);
353
+        lv_btn_use_button_style(btnOk);
354
+        lv_obj_t *labelOk = lv_label_create_empty(btnOk);
357 355
         lv_label_set_text(labelOk, print_file_dialog_menu.confirm);
358 356
       }
359 357
     }
@@ -365,25 +363,22 @@ void lv_draw_dialog(uint8_t type) {
365 363
     lv_obj_set_pos(btnCancel, BTN_OK_X+90, BTN_OK_Y);
366 364
     lv_obj_set_size(btnCancel, 100, 50);
367 365
     lv_obj_set_event_cb(btnCancel, btn_cancel_event_cb);
368
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_REL, &style_btn_rel);
369
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_PR, &style_btn_pr);
370
-    lv_obj_t *labelCancel = lv_label_create(btnCancel, NULL);
366
+    lv_btn_use_button_style(btnCancel);
367
+    lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
371 368
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancle);
372 369
 
373
-    tempText1 = lv_label_create(scr, NULL);
374
-    lv_obj_set_style(tempText1, &tft_style_label_rel);
370
+    tempText1 = lv_label_create_empty(scr);
375 371
     filament_sprayer_temp();
376 372
   }
377 373
   else if (uiCfg.dialogType == DIALOG_TYPE_FILAMENT_LOAD_COMPLETED
378 374
         || uiCfg.dialogType == DIALOG_TYPE_FILAMENT_UNLOAD_COMPLETED
379 375
   ) {
380 376
     btnOk = lv_btn_create(scr, NULL);
381
-    lv_obj_set_pos(btnOk, BTN_OK_X+90, BTN_OK_Y);
377
+    lv_obj_set_pos(btnOk, BTN_OK_X + 90, BTN_OK_Y);
382 378
     lv_obj_set_size(btnOk, 100, 50);
383 379
     lv_obj_set_event_cb(btnOk, btn_ok_event_cb);
384
-    lv_btn_set_style(btnOk, LV_BTN_STYLE_REL, &style_btn_rel);
385
-    lv_btn_set_style(btnOk, LV_BTN_STYLE_PR, &style_btn_pr);
386
-    lv_obj_t *labelOk = lv_label_create(btnOk, NULL);
380
+    lv_btn_use_button_style(btnOk);
381
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);
387 382
     lv_label_set_text(labelOk, print_file_dialog_menu.confirm);
388 383
   }
389 384
   else if (uiCfg.dialogType == DIALOG_TYPE_FILAMENT_LOADING
@@ -393,9 +388,8 @@ void lv_draw_dialog(uint8_t type) {
393 388
     lv_obj_set_pos(btnCancel, BTN_OK_X+90, BTN_OK_Y);
394 389
     lv_obj_set_size(btnCancel, 100, 50);
395 390
     lv_obj_set_event_cb(btnCancel, btn_cancel_event_cb);
396
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_REL, &style_btn_rel);
397
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_PR, &style_btn_pr);
398
-    lv_obj_t *labelCancel = lv_label_create(btnCancel, NULL);
391
+    lv_btn_use_button_style(btnCancel);
392
+    lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
399 393
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancle);
400 394
 
401 395
     filament_bar = lv_bar_create(scr, NULL);
@@ -410,17 +404,15 @@ void lv_draw_dialog(uint8_t type) {
410 404
     lv_obj_set_pos(btnOk, BTN_OK_X, BTN_OK_Y);                     // Set its position
411 405
     lv_obj_set_size(btnOk, 100, 50);                               // Set its size
412 406
     lv_obj_set_event_cb(btnOk, btn_ok_event_cb);
413
-    lv_btn_set_style(btnOk, LV_BTN_STYLE_REL, &style_btn_rel);     // Set the button's released style
414
-    lv_btn_set_style(btnOk, LV_BTN_STYLE_PR, &style_btn_pr);       // Set the button's pressed style
415
-    lv_obj_t *labelOk = lv_label_create(btnOk, NULL);             // Add a label to the button
407
+    lv_btn_use_button_style(btnOk);
408
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
416 409
 
417 410
     btnCancel = lv_btn_create(scr, NULL);               // Add a button the current screen
418 411
     lv_obj_set_pos(btnCancel, BTN_CANCEL_X, BTN_CANCEL_Y);         // Set its position
419 412
     lv_obj_set_size(btnCancel, 100, 50);                           // Set its size
420 413
     lv_obj_set_event_cb(btnCancel, btn_cancel_event_cb);
421
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_REL, &style_btn_rel); // Set the button's released style
422
-    lv_btn_set_style(btnCancel, LV_BTN_STYLE_PR, &style_btn_pr);   // Set the button's pressed style
423
-    lv_obj_t *labelCancel = lv_label_create(btnCancel, NULL);     // Add a label to the button
414
+    lv_btn_use_button_style(btnCancel);
415
+    lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);     // Add a label to the button
424 416
 
425 417
     if (uiCfg.dialogType == DIALOG_PAUSE_MESSAGE_OPTION) {
426 418
       lv_label_set_text(labelOk, pause_msg_menu.purgeMore);        // Set the labels text
@@ -435,10 +427,7 @@ void lv_draw_dialog(uint8_t type) {
435 427
     lv_label_set_text(labelDialog, print_file_dialog_menu.print_file);
436 428
     lv_obj_align(labelDialog, NULL, LV_ALIGN_CENTER, 0, -20);
437 429
 
438
-    lv_obj_t *labelFile = lv_label_create(scr, NULL);
439
-    lv_obj_set_style(labelFile, &tft_style_label_rel);
440
-
441
-    lv_label_set_text(labelFile, list_file.long_name[sel_id]);
430
+    lv_obj_t *labelFile = lv_label_create(scr, list_file.long_name[sel_id]);
442 431
     lv_obj_align(labelFile, NULL, LV_ALIGN_CENTER, 0, -60);
443 432
   }
444 433
   else if (uiCfg.dialogType == DIALOG_TYPE_STOP) {
@@ -558,7 +547,6 @@ void lv_draw_dialog(uint8_t type) {
558 547
 
559 548
         lv_label_set_text(labelDialog, buf);
560 549
         lv_obj_align(labelDialog, NULL, LV_ALIGN_CENTER, 0, -20);
561
-
562 550
       }
563 551
     }
564 552
   #endif //USE_WIFI_FUNCTION
@@ -634,10 +622,8 @@ void filament_dialog_handle() {
634 622
     planner.synchronize();
635 623
     uiCfg.filament_loading_time_flg = 1;
636 624
     uiCfg.filament_loading_time_cnt = 0;
637
-    ZERO(public_buf_m);
638
-    sprintf_P(public_buf_m,PSTR("T%d\nG91\nG1 E%d F%d\nG90"),uiCfg.curSprayerChoose,gCfgItems.filamentchange_load_length,gCfgItems.filamentchange_load_speed);
639
-    queue.inject_P(PSTR(public_buf_m));
640
-    //gcode.process_subcommands_now_P(PSTR(public_buf_m));
625
+    sprintf_P(public_buf_m, PSTR("T%d\nG91\nG1 E%d F%d\nG90"), uiCfg.curSprayerChoose, gCfgItems.filamentchange_load_length, gCfgItems.filamentchange_load_speed);
626
+    queue.inject(public_buf_m);
641 627
   }
642 628
   if (uiCfg.filament_heat_completed_unload == 1) {
643 629
     uiCfg.filament_heat_completed_unload = 0;
@@ -646,9 +632,8 @@ void filament_dialog_handle() {
646 632
     planner.synchronize();
647 633
     uiCfg.filament_unloading_time_flg = 1;
648 634
     uiCfg.filament_unloading_time_cnt = 0;
649
-    ZERO(public_buf_m);
650
-    sprintf_P(public_buf_m,PSTR("T%d\nG91\nG1 E-%d F%d\nG90"),uiCfg.curSprayerChoose,gCfgItems.filamentchange_unload_length,gCfgItems.filamentchange_unload_speed);
651
-    queue.inject_P(PSTR(public_buf_m));
635
+    sprintf_P(public_buf_m, PSTR("T%d\nG91\nG1 E-%d F%d\nG90"), uiCfg.curSprayerChoose, gCfgItems.filamentchange_unload_length, gCfgItems.filamentchange_unload_speed);
636
+    queue.inject(public_buf_m);
652 637
   }
653 638
 
654 639
   if (((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius - gCfgItems.filament_limit_temper)) <= 1)

+ 11
- 38
Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp Vedi File

@@ -111,9 +111,9 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
111 111
 
112 112
 void lv_draw_eeprom_settings(void) {
113 113
   lv_obj_t *buttonBack, *label_Back;
114
-  lv_obj_t *buttonStore,*labelStore,*buttonStoreNarrow;
114
+  lv_obj_t *buttonStore, *labelStore;
115 115
   //lv_obj_t *buttonRead,*labelRead,*buttonReadNarrow;
116
-  lv_obj_t *buttonRevert, *labelRevert, *buttonRevertNarrow;
116
+  lv_obj_t *buttonRevert, *labelRevert;
117 117
   lv_obj_t * line1, * line2; //* line3;
118 118
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != EEPROM_SETTINGS_UI) {
119 119
     disp_state_stack._disp_index++;
@@ -127,10 +127,7 @@ void lv_draw_eeprom_settings(void) {
127 127
   lv_scr_load(scr);
128 128
   lv_obj_clean(scr);
129 129
 
130
-  lv_obj_t * title = lv_label_create(scr, NULL);
131
-  lv_obj_set_style(title, &tft_style_label_rel);
132
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
133
-  lv_label_set_text(title, creat_title_text());
130
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
134 131
 
135 132
   lv_refr_now(lv_refr_get_disp_refreshing());
136 133
 
@@ -139,19 +136,11 @@ void lv_draw_eeprom_settings(void) {
139 136
   lv_obj_set_size(buttonRevert, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);                       /*Set its size*/
140 137
   //lv_obj_set_event_cb(buttonMotor, event_handler);
141 138
   lv_obj_set_event_cb_mks(buttonRevert, event_handler, ID_EEPROM_REVERT, NULL, 0);
142
-  lv_btn_set_style(buttonRevert, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
143
-  lv_btn_set_style(buttonRevert, LV_BTN_STYLE_PR, &tft_style_label_pre);    /*Set the button's pressed style*/
139
+  lv_btn_use_label_style(buttonRevert);
144 140
   lv_btn_set_layout(buttonRevert, LV_LAYOUT_OFF);
145
-  labelRevert = lv_label_create(buttonRevert, NULL);        /*Add a label to the button*/
141
+  labelRevert = lv_label_create_empty(buttonRevert);        /*Add a label to the button*/
146 142
 
147
-  buttonRevertNarrow = lv_imgbtn_create(scr, NULL);
148
-  lv_obj_set_pos(buttonRevertNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V);
149
-  lv_obj_set_event_cb_mks(buttonRevertNarrow, event_handler, ID_EEPROM_REVERT_ARROW, NULL, 0);
150
-  lv_imgbtn_set_src(buttonRevertNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
151
-  lv_imgbtn_set_src(buttonRevertNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
152
-  lv_imgbtn_set_style(buttonRevertNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
153
-  lv_imgbtn_set_style(buttonRevertNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
154
-  lv_btn_set_layout(buttonRevertNarrow, LV_LAYOUT_OFF);
143
+  (void)lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V, event_handler, ID_EEPROM_REVERT_ARROW);
155 144
 
156 145
   //line3 = lv_line_create(scr, NULL);
157 146
   //lv_ex_line(line3,line_points[2]);
@@ -163,33 +152,17 @@ void lv_draw_eeprom_settings(void) {
163 152
   lv_obj_set_size(buttonStore, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);                       /*Set its size*/
164 153
   //lv_obj_set_event_cb(buttonMotor, event_handler);
165 154
   lv_obj_set_event_cb_mks(buttonStore, event_handler, ID_EEPROM_STORE, NULL, 0);
166
-  lv_btn_set_style(buttonStore, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
167
-  lv_btn_set_style(buttonStore, LV_BTN_STYLE_PR, &tft_style_label_pre);    /*Set the button's pressed style*/
155
+  lv_btn_use_label_style(buttonStore);
168 156
   lv_btn_set_layout(buttonStore, LV_LAYOUT_OFF);
169
-  labelStore = lv_label_create(buttonStore, NULL);        /*Add a label to the button*/
157
+  labelStore = lv_label_create_empty(buttonStore);        /*Add a label to the button*/
170 158
 
171
-  buttonStoreNarrow = lv_imgbtn_create(scr, NULL);
172
-  lv_obj_set_pos(buttonStoreNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V);
173
-  lv_obj_set_event_cb_mks(buttonStoreNarrow, event_handler, ID_EEPROM_STORE_ARROW, NULL, 0);
174
-  lv_imgbtn_set_src(buttonStoreNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
175
-  lv_imgbtn_set_src(buttonStoreNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
176
-  lv_imgbtn_set_style(buttonStoreNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
177
-  lv_imgbtn_set_style(buttonStoreNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
178
-  lv_btn_set_layout(buttonStoreNarrow, LV_LAYOUT_OFF);
159
+  (void)lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V, event_handler, ID_EEPROM_STORE_ARROW);
179 160
 
180 161
   line2 = lv_line_create(scr, NULL);
181 162
   lv_ex_line(line2, line_points[1]);
182 163
 
183
-  buttonBack = lv_imgbtn_create(scr, NULL);
184
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_EEPROM_RETURN, NULL, 0);
185
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
186
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
187
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
188
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
189
-
190
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
191
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
192
-  label_Back = lv_label_create(buttonBack, NULL);
164
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_EEPROM_RETURN);
165
+  label_Back = lv_label_create_empty(buttonBack);
193 166
 
194 167
   if (gCfgItems.multiple_language) {
195 168
     lv_label_set_text(label_Back, common_menu.text_back);

+ 7
- 31
Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp Vedi File

@@ -55,8 +55,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
55 55
       }
56 56
       else if (event == LV_EVENT_RELEASED) {
57 57
         gCfgItems.encoder_enable ^= true;
58
-        lv_imgbtn_set_src(buttonEncoderState, LV_BTN_STATE_REL, gCfgItems.encoder_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin");
59
-        lv_imgbtn_set_src(buttonEncoderState, LV_BTN_STATE_PR, gCfgItems.encoder_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin");
58
+        lv_imgbtn_set_src_both(buttonEncoderState, gCfgItems.encoder_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin");
60 59
         lv_label_set_text(labelEncoderState, machine_menu.enable);
61 60
         update_spi_flash();
62 61
       }
@@ -82,43 +81,20 @@ void lv_draw_encoder_settings(void) {
82 81
   lv_scr_load(scr);
83 82
   lv_obj_clean(scr);
84 83
 
85
-  lv_obj_t * title = lv_label_create(scr, NULL);
86
-  lv_obj_set_style(title, &tft_style_label_rel);
87
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
88
-  lv_label_set_text(title, machine_menu.EncoderConfTitle);
84
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.EncoderConfTitle);
89 85
 
90 86
   lv_refr_now(lv_refr_get_disp_refreshing());
91 87
 
92
-  labelEncoderTips = lv_label_create(scr, NULL);
93
-  lv_obj_set_style(labelEncoderTips, &tft_style_label_rel);
94
-  lv_obj_set_pos(labelEncoderTips, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
95
-  lv_label_set_text(labelEncoderTips, machine_menu.EncoderConfText);
88
+  labelEncoderTips = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.EncoderConfText);
96 89
 
97
-  buttonEncoderState = lv_imgbtn_create(scr, NULL);
98
-  lv_obj_set_pos(buttonEncoderState, PARA_UI_STATE_POS_X, PARA_UI_POS_Y + PARA_UI_STATE_V);
99
-  lv_imgbtn_set_src(buttonEncoderState, LV_BTN_STATE_REL, gCfgItems.encoder_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin");
100
-  lv_imgbtn_set_src(buttonEncoderState, LV_BTN_STATE_PR, gCfgItems.encoder_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin");
101
-
102
-  lv_obj_set_event_cb_mks(buttonEncoderState, event_handler, ID_ENCODER_STATE, NULL, 0);
103
-
104
-  lv_imgbtn_set_style(buttonEncoderState, LV_BTN_STATE_PR, &tft_style_label_pre);
105
-  lv_imgbtn_set_style(buttonEncoderState, LV_BTN_STATE_REL, &tft_style_label_rel);
106
-  lv_btn_set_layout(buttonEncoderState, LV_LAYOUT_OFF);
107
-  labelEncoderState = lv_label_create(buttonEncoderState, NULL);
90
+  buttonEncoderState = lv_imgbtn_create(scr, gCfgItems.encoder_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y + PARA_UI_STATE_V, event_handler, ID_ENCODER_STATE);
91
+  labelEncoderState = lv_label_create_empty(buttonEncoderState);
108 92
 
109 93
   line1 = lv_line_create(scr, NULL);
110 94
   lv_ex_line(line1, line_points[0]);
111 95
 
112
-  buttonBack = lv_imgbtn_create(scr, NULL);
113
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_ENCODER_RETURN, NULL, 0);
114
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
115
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
116
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
117
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
118
-
119
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
120
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
121
-  label_Back = lv_label_create(buttonBack, NULL);
96
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_ENCODER_RETURN);
97
+  label_Back = lv_label_create_empty(buttonBack);
122 98
 
123 99
   lv_label_set_text(labelEncoderState, gCfgItems.encoder_enable ? machine_menu.enable : machine_menu.disable);
124 100
   lv_obj_align(labelEncoderState, buttonEncoderState, LV_ALIGN_CENTER, 0, 0);

+ 3
- 9
Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp Vedi File

@@ -56,20 +56,14 @@ void lv_draw_error_message(PGM_P const msg) {
56 56
     lv_refr_now(lv_refr_get_disp_refreshing());
57 57
 
58 58
     if (msg) {
59
-      message = lv_label_create(scr, NULL);
60
-      lv_obj_set_style(message, &tft_style_label_rel);
61
-      lv_label_set_text(message, msg);
59
+      message = lv_label_create(scr, msg);
62 60
       lv_obj_align(message, NULL, LV_ALIGN_CENTER, 0, -50);
63 61
     }
64 62
 
65
-    kill_message = lv_label_create(scr, NULL);
66
-    lv_obj_set_style(kill_message, &tft_style_label_rel);
67
-    lv_label_set_text(kill_message, "PRINTER HALTED");
63
+    kill_message = lv_label_create(scr, "PRINTER HALTED");
68 64
     lv_obj_align(kill_message, NULL, LV_ALIGN_CENTER, 0, -10);
69 65
 
70
-    reset_tips = lv_label_create(scr, NULL);
71
-    lv_obj_set_style(reset_tips, &tft_style_label_rel);
72
-    lv_label_set_text(reset_tips, "Please Reset");
66
+    reset_tips = lv_label_create(scr, "Please Reset");
73 67
     lv_obj_align(reset_tips, NULL, LV_ALIGN_CENTER, 0, 30);
74 68
 
75 69
     lv_task_handler();

+ 38
- 100
Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp Vedi File

@@ -34,14 +34,14 @@
34 34
 #include "../../../../gcode/queue.h"
35 35
 #include "../../../../inc/MarlinConfig.h"
36 36
 
37
-static lv_obj_t * scr;
38
-extern lv_group_t*  g;
39
-static lv_obj_t * buttoType, *buttonStep, *buttonSpeed;
37
+static lv_obj_t *scr;
38
+extern lv_group_t *g;
39
+static lv_obj_t *buttonType, *buttonStep, *buttonSpeed;
40 40
 static lv_obj_t *labelType;
41 41
 static lv_obj_t *labelStep;
42 42
 static lv_obj_t *labelSpeed;
43
-static lv_obj_t * tempText;
44
-static lv_obj_t * ExtruText;
43
+static lv_obj_t *tempText;
44
+static lv_obj_t *ExtruText;
45 45
 
46 46
 #define ID_E_ADD    1
47 47
 #define ID_E_DEC    2
@@ -165,75 +165,27 @@ void lv_draw_extrusion(void) {
165 165
   lv_scr_load(scr);
166 166
   lv_obj_clean(scr);
167 167
 
168
-  lv_obj_t * title = lv_label_create(scr, NULL);
169
-  lv_obj_set_style(title, &tft_style_label_rel);
170
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
171
-  lv_label_set_text(title, creat_title_text());
168
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
172 169
 
173 170
   lv_refr_now(lv_refr_get_disp_refreshing());
174 171
 
175 172
   // Create image buttons
176
-  buttonAdd   = lv_imgbtn_create(scr, NULL);
177
-  buttonDec   = lv_imgbtn_create(scr, NULL);
178
-  buttoType   = lv_imgbtn_create(scr, NULL);
179
-  buttonStep  = lv_imgbtn_create(scr, NULL);
180
-  buttonSpeed = lv_imgbtn_create(scr, NULL);
181
-  buttonBack  = lv_imgbtn_create(scr, NULL);
182
-
183
-  lv_obj_set_event_cb_mks(buttonAdd, event_handler, ID_E_ADD, NULL, 0);
184
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_REL, "F:/bmp_in.bin");
185
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_PR, "F:/bmp_in.bin");
186
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_PR, &tft_style_label_pre);
187
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_REL, &tft_style_label_rel);
173
+  buttonAdd = lv_imgbtn_create(scr, "F:/bmp_in.bin", INTERVAL_V, titleHeight, event_handler, ID_E_ADD);
188 174
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
189 175
 
190
-  #if 1
191
-    lv_obj_set_event_cb_mks(buttonDec, event_handler, ID_E_DEC, NULL, 0);
192
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_REL, "F:/bmp_out.bin");
193
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_PR, "F:/bmp_out.bin");
194
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_PR, &tft_style_label_pre);
195
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_REL, &tft_style_label_rel);
196
-
197
-    lv_obj_set_event_cb_mks(buttoType, event_handler, ID_E_TYPE, NULL, 0);
198
-    lv_imgbtn_set_style(buttoType, LV_BTN_STATE_PR, &tft_style_label_pre);
199
-    lv_imgbtn_set_style(buttoType, LV_BTN_STATE_REL, &tft_style_label_rel);
200
-
201
-    lv_obj_set_event_cb_mks(buttonStep, event_handler, ID_E_STEP, NULL, 0);
202
-    lv_imgbtn_set_style(buttonStep, LV_BTN_STATE_PR, &tft_style_label_pre);
203
-    lv_imgbtn_set_style(buttonStep, LV_BTN_STATE_REL, &tft_style_label_rel);
204
-
205
-    lv_obj_set_event_cb_mks(buttonSpeed, event_handler, ID_E_SPEED, NULL, 0);
206
-    lv_imgbtn_set_style(buttonSpeed, LV_BTN_STATE_PR, &tft_style_label_pre);
207
-    lv_imgbtn_set_style(buttonSpeed, LV_BTN_STATE_REL, &tft_style_label_rel);
208
-
209
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_E_RETURN, NULL, 0);
210
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
211
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
212
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
213
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
214
-  #endif
215
-
216
-  lv_obj_set_pos(buttonAdd, INTERVAL_V, titleHeight);
217
-  lv_obj_set_pos(buttonDec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
218
-  lv_obj_set_pos(buttoType, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
219
-  lv_obj_set_pos(buttonStep, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
220
-  lv_obj_set_pos(buttonSpeed, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
221
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
176
+  buttonDec = lv_imgbtn_create(scr, "F:/bmp_out.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_E_DEC);
177
+  buttonType = lv_imgbtn_create(scr, NULL, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_TYPE);
178
+  buttonStep = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_STEP);
179
+  buttonSpeed = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_SPEED);
180
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_RETURN);
222 181
 
223 182
   // Create labels on the image buttons
224
-  lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
225
-  lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
226
-  lv_btn_set_layout(buttoType, LV_LAYOUT_OFF);
227
-  lv_btn_set_layout(buttonStep, LV_LAYOUT_OFF);
228
-  lv_btn_set_layout(buttonSpeed, LV_LAYOUT_OFF);
229
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
230
-
231
-  lv_obj_t *labelAdd   = lv_label_create(buttonAdd, NULL);
232
-  lv_obj_t *labelDec   = lv_label_create(buttonDec, NULL);
233
-  labelType             = lv_label_create(buttoType, NULL);
234
-  labelStep             = lv_label_create(buttonStep, NULL);
235
-  labelSpeed            = lv_label_create(buttonSpeed, NULL);
236
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
183
+  lv_obj_t *labelAdd   = lv_label_create_empty(buttonAdd);
184
+  lv_obj_t *labelDec   = lv_label_create_empty(buttonDec);
185
+  labelType             = lv_label_create_empty(buttonType);
186
+  labelStep             = lv_label_create_empty(buttonStep);
187
+  labelSpeed            = lv_label_create_empty(buttonSpeed);
188
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
237 189
 
238 190
   if (gCfgItems.multiple_language) {
239 191
     lv_label_set_text(labelAdd, extrude_menu.in);
@@ -250,7 +202,7 @@ void lv_draw_extrusion(void) {
250 202
     if (gCfgItems.encoder_enable) {
251 203
       lv_group_add_obj(g, buttonAdd);
252 204
       lv_group_add_obj(g, buttonDec);
253
-      lv_group_add_obj(g, buttoType);
205
+      lv_group_add_obj(g, buttonType);
254 206
       lv_group_add_obj(g, buttonStep);
255 207
       lv_group_add_obj(g, buttonSpeed);
256 208
       lv_group_add_obj(g, buttonBack);
@@ -261,47 +213,39 @@ void lv_draw_extrusion(void) {
261 213
   disp_ext_step();
262 214
   disp_ext_speed();
263 215
 
264
-  tempText = lv_label_create(scr, NULL);
216
+  tempText = lv_label_create_empty(scr);
265 217
   lv_obj_set_style(tempText, &tft_style_label_rel);
266 218
   disp_hotend_temp();
267 219
 
268
-  ExtruText = lv_label_create(scr, NULL);
220
+  ExtruText = lv_label_create_empty(scr);
269 221
   lv_obj_set_style(ExtruText, &tft_style_label_rel);
270 222
   disp_extru_amount();
271 223
 }
272 224
 
273 225
 void disp_ext_type() {
274 226
   if (uiCfg.curSprayerChoose == 1) {
275
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_extru2.bin");
276
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_extru2.bin");
227
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
277 228
     if (gCfgItems.multiple_language) {
278 229
       lv_label_set_text(labelType, extrude_menu.ext2);
279
-      lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
230
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
280 231
     }
281 232
   }
282 233
   else {
283
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_extru1.bin");
284
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_extru1.bin");
234
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
285 235
     if (gCfgItems.multiple_language) {
286 236
       lv_label_set_text(labelType, extrude_menu.ext1);
287
-      lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
237
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
288 238
     }
289 239
   }
290 240
 }
291 241
 
292 242
 void disp_ext_speed() {
293
-  if (uiCfg.extruSpeed == 20) {
294
-    lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_REL, "F:/bmp_speed_high.bin");
295
-    lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_PR, "F:/bmp_speed_high.bin");
296
-  }
297
-  else if (uiCfg.extruSpeed == 1) {
298
-  lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_REL, "F:/bmp_speed_slow.bin");
299
-    lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_PR, "F:/bmp_speed_slow.bin");
300
-  }
301
-  else {
302
-  lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_REL, "F:/bmp_speed_normal.bin");
303
-    lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_PR, "F:/bmp_speed_normal.bin");
304
-  }
243
+  if (uiCfg.extruSpeed == 20)
244
+    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_high.bin");
245
+  else if (uiCfg.extruSpeed == 1)
246
+    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_slow.bin");
247
+  else
248
+    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_normal.bin");
305 249
 
306 250
   if (gCfgItems.multiple_language) {
307 251
     if (uiCfg.extruSpeed == 20) {
@@ -323,7 +267,7 @@ void disp_hotend_temp() {
323 267
   char buf[20] = {0};
324 268
   public_buf_l[0] = '\0';
325 269
   strcat(public_buf_l, extrude_menu.temper_text);
326
-  sprintf(buf, extrude_menu.temp_value, (int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius,  (int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].target);
270
+  sprintf(buf, extrude_menu.temp_value, (int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius, (int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].target);
327 271
   strcat(public_buf_l, buf);
328 272
   lv_label_set_text(tempText, public_buf_l);
329 273
   lv_obj_align(tempText, NULL, LV_ALIGN_CENTER, 0, -50);
@@ -364,18 +308,12 @@ void disp_extru_amount() {
364 308
 }
365 309
 
366 310
 void disp_ext_step() {
367
-  if (uiCfg.extruStep == 1) {
368
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step1_mm.bin");
369
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step1_mm.bin");
370
-  }
371
-  else if (uiCfg.extruStep == 5) {
372
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step5_mm.bin");
373
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step5_mm.bin");
374
-  }
375
-  else if (uiCfg.extruStep == 10) {
376
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step10_mm.bin");
377
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step10_mm.bin");
378
-  }
311
+  if (uiCfg.extruStep == 1)
312
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_mm.bin");
313
+  else if (uiCfg.extruStep == 5)
314
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_mm.bin");
315
+  else if (uiCfg.extruStep == 10)
316
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_mm.bin");
379 317
 
380 318
   if (gCfgItems.multiple_language) {
381 319
     if (uiCfg.extruStep == 1) {

+ 14
- 69
Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp Vedi File

@@ -132,82 +132,27 @@ void lv_draw_fan(void) {
132 132
   lv_scr_load(scr);
133 133
   lv_obj_clean(scr);
134 134
 
135
-  lv_obj_t * title = lv_label_create(scr, NULL);
136
-  lv_obj_set_style(title, &tft_style_label_rel);
137
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
138
-  lv_label_set_text(title, creat_title_text());
135
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
139 136
 
140 137
   lv_refr_now(lv_refr_get_disp_refreshing());
141 138
 
142 139
   // Create an Image button
143
-  buttonAdd  = lv_imgbtn_create(scr, NULL);
144
-  buttonDec  = lv_imgbtn_create(scr, NULL);
145
-  buttonHigh = lv_imgbtn_create(scr, NULL);
146
-  buttonMid  = lv_imgbtn_create(scr, NULL);
147
-  buttonOff  = lv_imgbtn_create(scr, NULL);
148
-  buttonBack = lv_imgbtn_create(scr, NULL);
149
-
150
-  lv_obj_set_event_cb_mks(buttonAdd, event_handler, ID_F_ADD, NULL, 0);
151
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_REL, "F:/bmp_Add.bin");
152
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_PR, "F:/bmp_Add.bin");
153
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_PR, &tft_style_label_pre);
154
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_REL, &tft_style_label_rel);
140
+  buttonAdd  = lv_imgbtn_create(scr, "F:/bmp_Add.bin", INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
155 141
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
156 142
 
157
-  #if 1
158
-    lv_obj_set_event_cb_mks(buttonDec, event_handler, ID_F_DEC, NULL, 0);
159
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_REL, "F:/bmp_Dec.bin");
160
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_PR, "F:/bmp_Dec.bin");
161
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_PR, &tft_style_label_pre);
162
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_REL, &tft_style_label_rel);
163
-
164
-    lv_obj_set_event_cb_mks(buttonHigh, event_handler,ID_F_HIGH, NULL,0);
165
-    lv_imgbtn_set_src(buttonHigh, LV_BTN_STATE_REL, "F:/bmp_speed255.bin");
166
-    lv_imgbtn_set_src(buttonHigh, LV_BTN_STATE_PR, "F:/bmp_speed255.bin");
167
-    lv_imgbtn_set_style(buttonHigh, LV_BTN_STATE_PR, &tft_style_label_pre);
168
-    lv_imgbtn_set_style(buttonHigh, LV_BTN_STATE_REL, &tft_style_label_rel);
169
-
170
-    lv_obj_set_event_cb_mks(buttonMid, event_handler,ID_F_MID, NULL,0);
171
-    lv_imgbtn_set_src(buttonMid, LV_BTN_STATE_REL, "F:/bmp_speed127.bin");
172
-    lv_imgbtn_set_src(buttonMid, LV_BTN_STATE_PR, "F:/bmp_speed127.bin");
173
-    lv_imgbtn_set_style(buttonMid, LV_BTN_STATE_PR, &tft_style_label_pre);
174
-    lv_imgbtn_set_style(buttonMid, LV_BTN_STATE_REL, &tft_style_label_rel);
175
-
176
-    lv_obj_set_event_cb_mks(buttonOff, event_handler,ID_F_OFF, NULL,0);
177
-    lv_imgbtn_set_src(buttonOff, LV_BTN_STATE_REL, "F:/bmp_speed0.bin");
178
-    lv_imgbtn_set_src(buttonOff, LV_BTN_STATE_PR, "F:/bmp_speed0.bin");
179
-    lv_imgbtn_set_style(buttonOff, LV_BTN_STATE_PR, &tft_style_label_pre);
180
-    lv_imgbtn_set_style(buttonOff, LV_BTN_STATE_REL, &tft_style_label_rel);
181
-
182
-    lv_obj_set_event_cb_mks(buttonBack, event_handler,ID_F_RETURN, NULL,0);
183
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
184
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
185
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
186
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
187
-
188
-  #endif
189
-
190
-  lv_obj_set_pos(buttonAdd, INTERVAL_V, titleHeight);
191
-  lv_obj_set_pos(buttonDec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
192
-  lv_obj_set_pos(buttonHigh, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
193
-  lv_obj_set_pos(buttonMid, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
194
-  lv_obj_set_pos(buttonOff, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
195
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
143
+  buttonDec  = lv_imgbtn_create(scr, "F:/bmp_Dec.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
144
+  buttonHigh = lv_imgbtn_create(scr, "F:/bmp_speed255.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
145
+  buttonMid  = lv_imgbtn_create(scr, "F:/bmp_speed127.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_MID);
146
+  buttonOff  = lv_imgbtn_create(scr, "F:/bmp_speed0.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_OFF);
147
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_RETURN);
196 148
 
197 149
   // Create labels on the image buttons
198
-  lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
199
-  lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
200
-  lv_btn_set_layout(buttonHigh, LV_LAYOUT_OFF);
201
-  lv_btn_set_layout(buttonMid, LV_LAYOUT_OFF);
202
-  lv_btn_set_layout(buttonOff, LV_LAYOUT_OFF);
203
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
204
-
205
-  lv_obj_t *labelAdd = lv_label_create(buttonAdd, NULL);
206
-  lv_obj_t *labelDec = lv_label_create(buttonDec, NULL);
207
-  lv_obj_t *labelHigh = lv_label_create(buttonHigh, NULL);
208
-  lv_obj_t *labelMid = lv_label_create(buttonMid, NULL);
209
-  lv_obj_t *labelOff = lv_label_create(buttonOff, NULL);
210
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
150
+  lv_obj_t *labelAdd = lv_label_create_empty(buttonAdd);
151
+  lv_obj_t *labelDec = lv_label_create_empty(buttonDec);
152
+  lv_obj_t *labelHigh = lv_label_create_empty(buttonHigh);
153
+  lv_obj_t *labelMid = lv_label_create_empty(buttonMid);
154
+  lv_obj_t *labelOff = lv_label_create_empty(buttonOff);
155
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
211 156
 
212 157
   if (gCfgItems.multiple_language) {
213 158
     lv_label_set_text(labelAdd, fan_menu.add);
@@ -239,7 +184,7 @@ void lv_draw_fan(void) {
239 184
     }
240 185
   #endif
241 186
 
242
-  fanText = lv_label_create(scr, NULL);
187
+  fanText = lv_label_create_empty(scr);
243 188
   lv_obj_set_style(fanText, &tft_style_label_rel);
244 189
   disp_fan_value();
245 190
 }

+ 19
- 55
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp Vedi File

@@ -32,11 +32,11 @@
32 32
 #include "../../../../module/planner.h"
33 33
 #include "../../../../inc/MarlinConfig.h"
34 34
 
35
-extern lv_group_t * g;
36
-static lv_obj_t * scr;
37
-static lv_obj_t *buttoType;
35
+extern lv_group_t *g;
36
+static lv_obj_t *scr;
37
+static lv_obj_t *buttonType;
38 38
 static lv_obj_t *labelType;
39
-static lv_obj_t * tempText1;
39
+static lv_obj_t *tempText1;
40 40
 
41 41
 #define ID_FILAMNT_IN     1
42 42
 #define ID_FILAMNT_OUT    2
@@ -144,57 +144,23 @@ void lv_draw_filament_change(void) {
144 144
   lv_scr_load(scr);
145 145
   lv_obj_clean(scr);
146 146
 
147
-  lv_obj_t * title = lv_label_create(scr, NULL);
148
-  lv_obj_set_style(title, &tft_style_label_rel);
149
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
150
-  lv_label_set_text(title, creat_title_text());
147
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
151 148
 
152 149
   lv_refr_now(lv_refr_get_disp_refreshing());
153 150
 
154 151
   // Create an Image button
155
-  buttonIn   = lv_imgbtn_create(scr, NULL);
156
-  buttonOut  = lv_imgbtn_create(scr, NULL);
157
-  buttoType  = lv_imgbtn_create(scr, NULL);
158
-  buttonBack = lv_imgbtn_create(scr, NULL);
159
-
160
-  lv_obj_set_event_cb_mks(buttonIn, event_handler, ID_FILAMNT_IN, NULL, 0);
161
-  lv_imgbtn_set_src(buttonIn, LV_BTN_STATE_REL, "F:/bmp_in.bin");
162
-  lv_imgbtn_set_src(buttonIn, LV_BTN_STATE_PR, "F:/bmp_in.bin");
163
-  lv_imgbtn_set_style(buttonIn, LV_BTN_STATE_PR, &tft_style_label_pre);
164
-  lv_imgbtn_set_style(buttonIn, LV_BTN_STATE_REL, &tft_style_label_rel);
152
+  buttonIn = lv_imgbtn_create(scr, "F:/bmp_in.bin", INTERVAL_V, titleHeight, event_handler, ID_FILAMNT_IN);
165 153
   lv_obj_clear_protect(buttonIn, LV_PROTECT_FOLLOW);
166 154
 
167
-  lv_obj_set_event_cb_mks(buttonOut, event_handler, ID_FILAMNT_OUT, NULL, 0);
168
-  lv_imgbtn_set_src(buttonOut, LV_BTN_STATE_REL, "F:/bmp_out.bin");
169
-  lv_imgbtn_set_src(buttonOut, LV_BTN_STATE_PR, "F:/bmp_out.bin");
170
-  lv_imgbtn_set_style(buttonOut, LV_BTN_STATE_PR, &tft_style_label_pre);
171
-  lv_imgbtn_set_style(buttonOut, LV_BTN_STATE_REL, &tft_style_label_rel);
172
-
173
-  lv_obj_set_event_cb_mks(buttoType, event_handler, ID_FILAMNT_TYPE, NULL, 0);
174
-  lv_imgbtn_set_style(buttoType, LV_BTN_STATE_PR, &tft_style_label_pre);
175
-  lv_imgbtn_set_style(buttoType, LV_BTN_STATE_REL, &tft_style_label_rel);
176
-
177
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_FILAMNT_RETURN, NULL, 0);
178
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
179
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
180
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
181
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
182
-
183
-  lv_obj_set_pos(buttonIn, INTERVAL_V, titleHeight);
184
-  lv_obj_set_pos(buttonOut, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
185
-  lv_obj_set_pos(buttoType, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
186
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
155
+  buttonOut = lv_imgbtn_create(scr, "F:/bmp_out.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_FILAMNT_OUT);
156
+  buttonType = lv_imgbtn_create(scr, NULL, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
157
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
187 158
 
188 159
   // Create labels on the image buttons
189
-  lv_btn_set_layout(buttonIn, LV_LAYOUT_OFF);
190
-  lv_btn_set_layout(buttonOut, LV_LAYOUT_OFF);
191
-  lv_btn_set_layout(buttoType, LV_LAYOUT_OFF);
192
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
193
-
194
-  lv_obj_t *labelIn  = lv_label_create(buttonIn, NULL);
195
-  lv_obj_t *labelOut = lv_label_create(buttonOut, NULL);
196
-  labelType = lv_label_create(buttoType, NULL);
197
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
160
+  lv_obj_t *labelIn  = lv_label_create_empty(buttonIn);
161
+  lv_obj_t *labelOut = lv_label_create_empty(buttonOut);
162
+  labelType = lv_label_create_empty(buttonType);
163
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
198 164
 
199 165
   if (gCfgItems.multiple_language) {
200 166
     lv_label_set_text(labelIn, filament_menu.in);
@@ -211,33 +177,31 @@ void lv_draw_filament_change(void) {
211 177
     if (gCfgItems.encoder_enable) {
212 178
       lv_group_add_obj(g, buttonIn);
213 179
       lv_group_add_obj(g, buttonOut);
214
-      lv_group_add_obj(g, buttoType);
180
+      lv_group_add_obj(g, buttonType);
215 181
       lv_group_add_obj(g, buttonBack);
216 182
     }
217 183
   #endif
218 184
 
219 185
   disp_filament_type();
220 186
 
221
-  tempText1 = lv_label_create(scr, NULL);
187
+  tempText1 = lv_label_create_empty(scr);
222 188
   lv_obj_set_style(tempText1, &tft_style_label_rel);
223 189
   disp_filament_temp();
224 190
 }
225 191
 
226 192
 void disp_filament_type() {
227 193
   if (uiCfg.curSprayerChoose == 1) {
228
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_extru2.bin");
229
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_extru2.bin");
194
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
230 195
     if (gCfgItems.multiple_language) {
231 196
       lv_label_set_text(labelType, preheat_menu.ext2);
232
-      lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
197
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
233 198
     }
234 199
   }
235 200
   else {
236
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_extru1.bin");
237
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_extru1.bin");
201
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
238 202
     if (gCfgItems.multiple_language) {
239 203
       lv_label_set_text(labelType, preheat_menu.ext1);
240
-      lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
204
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
241 205
     }
242 206
   }
243 207
 }

+ 29
- 90
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp Vedi File

@@ -127,12 +127,12 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
127 127
 
128 128
 void lv_draw_filament_settings(void) {
129 129
   lv_obj_t *buttonBack = NULL, *label_Back = NULL, *buttonTurnPage = NULL, *labelTurnPage = NULL;
130
-  lv_obj_t *labelInLengthText = NULL, *buttonInLengthValue = NULL, *labelInLengthValue = NULL;
131
-  lv_obj_t *labelInSpeedText = NULL, *buttonInSpeedValue = NULL, *labelInSpeedValue = NULL;
132
-  lv_obj_t *labelOutLengthText = NULL, *buttonOutLengthValue = NULL, *labelOutLengthValue = NULL;
133
-  lv_obj_t *labelOutSpeedText = NULL, *buttonOutSpeedValue = NULL, *labelOutSpeedValue = NULL;
134
-  lv_obj_t *labelTemperText = NULL, *buttonTemperValue = NULL, *labelTemperValue = NULL;
135
-  lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
130
+  lv_obj_t *buttonInLengthValue = NULL, *labelInLengthValue = NULL;
131
+  lv_obj_t *buttonInSpeedValue = NULL, *labelInSpeedValue = NULL;
132
+  lv_obj_t *buttonOutLengthValue = NULL, *labelOutLengthValue = NULL;
133
+  lv_obj_t *buttonOutSpeedValue = NULL, *labelOutSpeedValue = NULL;
134
+  lv_obj_t *buttonTemperValue = NULL, *labelTemperValue = NULL;
135
+  lv_obj_t *line1 = NULL, *line2 = NULL, *line3 = NULL, *line4 = NULL;
136 136
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != FILAMENT_SETTINGS_UI) {
137 137
     disp_state_stack._disp_index++;
138 138
     disp_state_stack._disp_state[disp_state_stack._disp_index] = FILAMENT_SETTINGS_UI;
@@ -145,82 +145,44 @@ void lv_draw_filament_settings(void) {
145 145
   lv_scr_load(scr);
146 146
   lv_obj_clean(scr);
147 147
 
148
-  lv_obj_t * title = lv_label_create(scr, NULL);
149
-  lv_obj_set_style(title, &tft_style_label_rel);
150
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
151
-  lv_label_set_text(title, machine_menu.FilamentConfTitle);
148
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.FilamentConfTitle);
152 149
 
153 150
   lv_refr_now(lv_refr_get_disp_refreshing());
154 151
 
155 152
   if (uiCfg.para_ui_page != 1) {
156
-    labelInLengthText = lv_label_create(scr, NULL);
157
-    lv_obj_set_style(labelInLengthText, &tft_style_label_rel);
158
-    lv_obj_set_pos(labelInLengthText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
159
-    lv_label_set_text(labelInLengthText, machine_menu.InLength);
160
-
161
-    buttonInLengthValue = lv_btn_create(scr, NULL);
162
-    lv_obj_set_pos(buttonInLengthValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
163
-    lv_obj_set_size(buttonInLengthValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
164
-    lv_obj_set_event_cb_mks(buttonInLengthValue, event_handler, ID_FILAMENT_SET_IN_LENGTH, NULL, 0);
165
-    lv_btn_set_style(buttonInLengthValue, LV_BTN_STYLE_REL, &style_para_value);
166
-    lv_btn_set_style(buttonInLengthValue, LV_BTN_STYLE_PR, &style_para_value);
167
-    labelInLengthValue = lv_label_create(buttonInLengthValue, NULL);
153
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.InLength);
154
+
155
+    buttonInLengthValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_IN_LENGTH);
156
+    labelInLengthValue = lv_label_create_empty(buttonInLengthValue);
168 157
 
169 158
     line1 = lv_line_create(scr, NULL);
170 159
     lv_ex_line(line1, line_points[0]);
171 160
 
172
-    labelInSpeedText = lv_label_create(scr, NULL);
173
-    lv_obj_set_style(labelInSpeedText, &tft_style_label_rel);
174
-    lv_obj_set_pos(labelInSpeedText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
175
-    lv_label_set_text(labelInSpeedText, machine_menu.InSpeed);
161
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.InSpeed);
176 162
 
177
-    buttonInSpeedValue = lv_btn_create(scr, NULL);
178
-    lv_obj_set_pos(buttonInSpeedValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2);
179
-    lv_obj_set_size(buttonInSpeedValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
180
-    lv_obj_set_event_cb_mks(buttonInSpeedValue, event_handler, ID_FILAMENT_SET_IN_SPEED, NULL, 0);
181
-    lv_btn_set_style(buttonInSpeedValue, LV_BTN_STYLE_REL, &style_para_value);
182
-    lv_btn_set_style(buttonInSpeedValue, LV_BTN_STYLE_PR, &style_para_value);
183
-    labelInSpeedValue = lv_label_create(buttonInSpeedValue, NULL);
163
+    buttonInSpeedValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_IN_SPEED);
164
+    labelInSpeedValue = lv_label_create_empty(buttonInSpeedValue);
184 165
 
185 166
     line2 = lv_line_create(scr, NULL);
186 167
     lv_ex_line(line2, line_points[1]);
187 168
 
188
-    labelOutLengthText = lv_label_create(scr, NULL);
189
-    lv_obj_set_style(labelOutLengthText, &tft_style_label_rel);
190
-    lv_obj_set_pos(labelOutLengthText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 6);
191
-    lv_label_set_text(labelOutLengthText, machine_menu.OutLength);
169
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 6, machine_menu.OutLength);
192 170
 
193
-    buttonOutLengthValue = lv_btn_create(scr, NULL);
194
-    lv_obj_set_pos(buttonOutLengthValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2);
195
-    lv_obj_set_size(buttonOutLengthValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
196
-    lv_obj_set_event_cb_mks(buttonOutLengthValue, event_handler, ID_FILAMENT_SET_OUT_LENGTH, NULL, 0);
197
-    lv_btn_set_style(buttonOutLengthValue, LV_BTN_STYLE_REL, &style_para_value);
198
-    lv_btn_set_style(buttonOutLengthValue, LV_BTN_STYLE_PR, &style_para_value);
199
-    labelOutLengthValue = lv_label_create(buttonOutLengthValue, NULL);
171
+    buttonOutLengthValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_OUT_LENGTH);
172
+    labelOutLengthValue = lv_label_create_empty(buttonOutLengthValue);
200 173
 
201 174
     line3 = lv_line_create(scr, NULL);
202 175
     lv_ex_line(line3, line_points[2]);
203 176
 
204
-    labelOutSpeedText = lv_label_create(scr, NULL);
205
-    lv_obj_set_style(labelOutSpeedText, &tft_style_label_rel);
206
-    lv_obj_set_pos(labelOutSpeedText, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
207
-    lv_label_set_text(labelOutSpeedText, machine_menu.OutSpeed);
177
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.OutSpeed);
208 178
 
209
-    buttonOutSpeedValue = lv_btn_create(scr, NULL);
210
-    lv_obj_set_pos(buttonOutSpeedValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2);
211
-    lv_obj_set_size(buttonOutSpeedValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
212
-    lv_obj_set_event_cb_mks(buttonOutSpeedValue, event_handler, ID_FILAMENT_SET_OUT_SPEED, NULL, 0);
213
-    lv_btn_set_style(buttonOutSpeedValue, LV_BTN_STYLE_REL, &style_para_value);
214
-    lv_btn_set_style(buttonOutSpeedValue, LV_BTN_STYLE_PR, &style_para_value);
215
-    labelOutSpeedValue = lv_label_create(buttonOutSpeedValue, NULL);
179
+    buttonOutSpeedValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_OUT_SPEED);
180
+    labelOutSpeedValue = lv_label_create_empty(buttonOutSpeedValue);
216 181
 
217 182
     line4 = lv_line_create(scr, NULL);
218 183
     lv_ex_line(line4, line_points[3]);
219 184
 
220
-    buttonTurnPage = lv_btn_create(scr, NULL);
221
-    lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_FILAMENT_SET_DOWN, NULL, 0);
222
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
223
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
185
+    buttonTurnPage = lv_btn_create_back(scr, event_handler, ID_FILAMENT_SET_DOWN);
224 186
 
225 187
     #if HAS_ROTARY_ENCODER
226 188
       if (gCfgItems.encoder_enable) {
@@ -233,26 +195,15 @@ void lv_draw_filament_settings(void) {
233 195
     #endif
234 196
   }
235 197
   else {
236
-    labelTemperText = lv_label_create(scr, NULL);
237
-    lv_obj_set_style(labelTemperText, &tft_style_label_rel);
238
-    lv_obj_set_pos(labelTemperText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
239
-    lv_label_set_text(labelTemperText, machine_menu.FilamentTemperature);
240
-
241
-    buttonTemperValue = lv_btn_create(scr, NULL);
242
-    lv_obj_set_pos(buttonTemperValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
243
-    lv_obj_set_size(buttonTemperValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
244
-    lv_obj_set_event_cb_mks(buttonTemperValue, event_handler, ID_FILAMENT_SET_TEMP, NULL, 0);
245
-    lv_btn_set_style(buttonTemperValue, LV_BTN_STYLE_REL, &style_para_value);
246
-    lv_btn_set_style(buttonTemperValue, LV_BTN_STYLE_PR, &style_para_value);
247
-    labelTemperValue = lv_label_create(buttonTemperValue, NULL);
198
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.FilamentTemperature);
199
+
200
+    buttonTemperValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_TEMP);
201
+    labelTemperValue = lv_label_create_empty(buttonTemperValue);
248 202
 
249 203
     line1 = lv_line_create(scr, NULL);
250 204
     lv_ex_line(line1, line_points[0]);
251 205
 
252
-    buttonTurnPage = lv_btn_create(scr, NULL);
253
-    lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_FILAMENT_SET_UP, NULL, 0);
254
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
255
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
206
+    buttonTurnPage = lv_btn_create_back(scr, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_UP);
256 207
 
257 208
     #if HAS_ROTARY_ENCODER
258 209
       if (gCfgItems.encoder_enable) {
@@ -262,17 +213,10 @@ void lv_draw_filament_settings(void) {
262 213
     #endif
263 214
   }
264 215
 
265
-  lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
266
-  lv_obj_set_size(buttonTurnPage, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
267
-  labelTurnPage = lv_label_create(buttonTurnPage, NULL);
216
+  labelTurnPage = lv_label_create_empty(buttonTurnPage);
268 217
 
269
-  buttonBack = lv_btn_create(scr, NULL);
270
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_FILAMENT_SET_RETURN, NULL, 0);
271
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
272
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
273
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
274
-  lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
275
-  label_Back = lv_label_create(buttonBack, NULL);
218
+  buttonBack = lv_btn_create_back(scr, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_FILAMENT_SET_RETURN);
219
+  label_Back = lv_label_create_empty(buttonBack);
276 220
 
277 221
   #if HAS_ROTARY_ENCODER
278 222
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
@@ -280,22 +224,18 @@ void lv_draw_filament_settings(void) {
280 224
 
281 225
   if (gCfgItems.multiple_language) {
282 226
     if (uiCfg.para_ui_page != 1) {
283
-      ZERO(public_buf_l);
284 227
       sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_load_length);
285 228
       lv_label_set_text(labelInLengthValue, public_buf_l);
286 229
       lv_obj_align(labelInLengthValue, buttonInLengthValue, LV_ALIGN_CENTER, 0, 0);
287 230
 
288
-      ZERO(public_buf_l);
289 231
       sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_load_speed);
290 232
       lv_label_set_text(labelInSpeedValue, public_buf_l);
291 233
       lv_obj_align(labelInSpeedValue, buttonInSpeedValue, LV_ALIGN_CENTER, 0, 0);
292 234
 
293
-      ZERO(public_buf_l);
294 235
       sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_unload_length);
295 236
       lv_label_set_text(labelOutLengthValue, public_buf_l);
296 237
       lv_obj_align(labelOutLengthValue, buttonOutLengthValue, LV_ALIGN_CENTER, 0, 0);
297 238
 
298
-      ZERO(public_buf_l);
299 239
       sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_unload_speed);
300 240
       lv_label_set_text(labelOutSpeedValue, public_buf_l);
301 241
       lv_obj_align(labelOutSpeedValue, buttonOutSpeedValue, LV_ALIGN_CENTER, 0, 0);
@@ -304,7 +244,6 @@ void lv_draw_filament_settings(void) {
304 244
       lv_obj_align(labelTurnPage, buttonTurnPage, LV_ALIGN_CENTER, 0, 0);
305 245
     }
306 246
     else {
307
-      ZERO(public_buf_l);
308 247
       sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filament_limit_temper);
309 248
       lv_label_set_text(labelTemperValue, public_buf_l);
310 249
       lv_obj_align(labelTemperValue, buttonTemperValue, LV_ALIGN_CENTER, 0, 0);

+ 15
- 78
Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp Vedi File

@@ -120,92 +120,29 @@ void lv_draw_home(void) {
120 120
   lv_scr_load(scr);
121 121
   lv_obj_clean(scr);
122 122
 
123
-  lv_obj_t * title = lv_label_create(scr, NULL);
124
-  lv_obj_set_style(title, &tft_style_label_rel);
125
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
126
-  lv_label_set_text(title, creat_title_text());
123
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
127 124
 
128 125
   lv_refr_now(lv_refr_get_disp_refreshing());
129 126
 
130 127
   // Create image buttons
131 128
   //buttonWifi     = lv_imgbtn_create(scr, NULL);
132
-  buttonHomeAll    = lv_imgbtn_create(scr, NULL);
133
-  buttonHomeX      = lv_imgbtn_create(scr, NULL);
134 129
   //buttonContinue = lv_imgbtn_create(scr, NULL);
135
-  buttonHomeY      = lv_imgbtn_create(scr, NULL);
136
-  buttonHomeZ      = lv_imgbtn_create(scr, NULL);
137
-  buttonOffAll     = lv_imgbtn_create(scr, NULL);
138
-  buttonOffXY      = lv_imgbtn_create(scr, NULL);
139
-  buttonBack       = lv_imgbtn_create(scr, NULL);
140
-
141
-  #if 1
142
-    lv_obj_set_event_cb_mks(buttonHomeAll, event_handler,ID_H_ALL, NULL,0);
143
-    lv_imgbtn_set_src(buttonHomeAll, LV_BTN_STATE_REL, "F:/bmp_zeroAll.bin");
144
-    lv_imgbtn_set_src(buttonHomeAll, LV_BTN_STATE_PR, "F:/bmp_zeroAll.bin");
145
-    lv_imgbtn_set_style(buttonHomeAll, LV_BTN_STATE_PR, &tft_style_label_pre);
146
-    lv_imgbtn_set_style(buttonHomeAll, LV_BTN_STATE_REL, &tft_style_label_rel);
147
-
148
-    lv_obj_set_event_cb_mks(buttonHomeX, event_handler, ID_H_X, NULL, 0);
149
-    lv_imgbtn_set_src(buttonHomeX, LV_BTN_STATE_REL, "F:/bmp_zeroX.bin");
150
-    lv_imgbtn_set_src(buttonHomeX, LV_BTN_STATE_PR, "F:/bmp_zeroX.bin");
151
-    lv_imgbtn_set_style(buttonHomeX, LV_BTN_STATE_PR, &tft_style_label_pre);
152
-    lv_imgbtn_set_style(buttonHomeX, LV_BTN_STATE_REL, &tft_style_label_rel);
153
-
154
-    lv_obj_set_event_cb_mks(buttonHomeY, event_handler, ID_H_Y, NULL, 0);
155
-    lv_imgbtn_set_src(buttonHomeY, LV_BTN_STATE_REL, "F:/bmp_zeroY.bin");
156
-    lv_imgbtn_set_src(buttonHomeY, LV_BTN_STATE_PR, "F:/bmp_zeroY.bin");
157
-    lv_imgbtn_set_style(buttonHomeY, LV_BTN_STATE_PR, &tft_style_label_pre);
158
-    lv_imgbtn_set_style(buttonHomeY, LV_BTN_STATE_REL, &tft_style_label_rel);
159
-
160
-    lv_obj_set_event_cb_mks(buttonHomeZ, event_handler, ID_H_Z, NULL, 0);
161
-    lv_imgbtn_set_src(buttonHomeZ, LV_BTN_STATE_REL, "F:/bmp_zeroZ.bin");
162
-    lv_imgbtn_set_src(buttonHomeZ, LV_BTN_STATE_PR, "F:/bmp_zeroZ.bin");
163
-    lv_imgbtn_set_style(buttonHomeZ, LV_BTN_STATE_PR, &tft_style_label_pre);
164
-    lv_imgbtn_set_style(buttonHomeZ, LV_BTN_STATE_REL, &tft_style_label_rel);
165
-
166
-    lv_obj_set_event_cb_mks(buttonOffAll, event_handler,ID_H_OFF_ALL, NULL,0);
167
-    lv_imgbtn_set_src(buttonOffAll, LV_BTN_STATE_REL, "F:/bmp_function1.bin");
168
-    lv_imgbtn_set_src(buttonOffAll, LV_BTN_STATE_PR, "F:/bmp_function1.bin");
169
-    lv_imgbtn_set_style(buttonOffAll, LV_BTN_STATE_PR, &tft_style_label_pre);
170
-    lv_imgbtn_set_style(buttonOffAll, LV_BTN_STATE_REL, &tft_style_label_rel);
171
-
172
-    lv_obj_set_event_cb_mks(buttonOffXY, event_handler,ID_H_OFF_XY, NULL,0);
173
-    lv_imgbtn_set_src(buttonOffXY, LV_BTN_STATE_REL, "F:/bmp_function1.bin");
174
-    lv_imgbtn_set_src(buttonOffXY, LV_BTN_STATE_PR, "F:/bmp_function1.bin");
175
-    lv_imgbtn_set_style(buttonOffXY, LV_BTN_STATE_PR, &tft_style_label_pre);
176
-    lv_imgbtn_set_style(buttonOffXY, LV_BTN_STATE_REL, &tft_style_label_rel);
177
-
178
-    lv_obj_set_event_cb_mks(buttonBack, event_handler,ID_H_RETURN, NULL,0);
179
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
180
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
181
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
182
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
183
-  #endif
184
-
185
-  lv_obj_set_pos(buttonHomeAll, INTERVAL_V, titleHeight);
186
-  lv_obj_set_pos(buttonHomeX, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
187
-  lv_obj_set_pos(buttonHomeY, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
188
-  lv_obj_set_pos(buttonHomeZ, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
189
-  lv_obj_set_pos(buttonOffAll, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
190
-  lv_obj_set_pos(buttonOffXY, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
191
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
130
+  buttonHomeAll = lv_imgbtn_create(scr, "F:/bmp_zeroAll.bin", INTERVAL_V, titleHeight, event_handler, ID_H_ALL);
131
+  buttonHomeX   = lv_imgbtn_create(scr, "F:/bmp_zeroX.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_H_X);
132
+  buttonHomeY   = lv_imgbtn_create(scr, "F:/bmp_zeroY.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_H_Y);
133
+  buttonHomeZ   = lv_imgbtn_create(scr, "F:/bmp_zeroZ.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_H_Z);
134
+  buttonOffAll  = lv_imgbtn_create(scr, "F:/bmp_function1.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_ALL);
135
+  buttonOffXY   = lv_imgbtn_create(scr, "F:/bmp_function1.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_XY);
136
+  buttonBack    = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_RETURN);
192 137
 
193 138
   // Create labels on the image buttons
194
-  lv_btn_set_layout(buttonHomeAll, LV_LAYOUT_OFF);
195
-  lv_btn_set_layout(buttonHomeX, LV_LAYOUT_OFF);
196
-  lv_btn_set_layout(buttonHomeY, LV_LAYOUT_OFF);
197
-  lv_btn_set_layout(buttonHomeZ, LV_LAYOUT_OFF);
198
-  lv_btn_set_layout(buttonOffAll, LV_LAYOUT_OFF);
199
-  lv_btn_set_layout(buttonOffXY, LV_LAYOUT_OFF);
200
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
201
-
202
-  lv_obj_t *labelHomeAll = lv_label_create(buttonHomeAll, NULL);
203
-  lv_obj_t *labelHomeX = lv_label_create(buttonHomeX, NULL);
204
-  lv_obj_t *labelHomeY = lv_label_create(buttonHomeY, NULL);
205
-  lv_obj_t *labelHomeZ = lv_label_create(buttonHomeZ, NULL);
206
-  lv_obj_t *labelOffAll = lv_label_create(buttonOffAll, NULL);
207
-  lv_obj_t *labelOffXY = lv_label_create(buttonOffXY, NULL);
208
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
139
+  lv_obj_t *labelHomeAll = lv_label_create_empty(buttonHomeAll);
140
+  lv_obj_t *labelHomeX = lv_label_create_empty(buttonHomeX);
141
+  lv_obj_t *labelHomeY = lv_label_create_empty(buttonHomeY);
142
+  lv_obj_t *labelHomeZ = lv_label_create_empty(buttonHomeZ);
143
+  lv_obj_t *labelOffAll = lv_label_create_empty(buttonOffAll);
144
+  lv_obj_t *labelOffXY = lv_label_create_empty(buttonOffXY);
145
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
209 146
 
210 147
   if (gCfgItems.multiple_language) {
211 148
     lv_label_set_text(labelHomeAll, home_menu.home_all);

+ 21
- 61
Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp Vedi File

@@ -98,13 +98,13 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
98 98
 
99 99
 void lv_draw_homing_sensitivity_settings(void) {
100 100
   lv_obj_t *buttonBack = NULL, *label_Back = NULL;
101
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
102
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
103
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
101
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
102
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
103
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
104 104
   lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL;
105 105
   #if Z2_SENSORLESS
106
-    lv_obj_t *labelZ2Text = NULL, *buttonZ2Value = NULL, *labelZ2Value = NULL;
107
-    lv_obj_t * line4 = NULL;
106
+    lv_obj_t *buttonZ2Value = NULL, *labelZ2Value = NULL;
107
+    lv_obj_t *line4 = NULL;
108 108
   #endif
109 109
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != HOMING_SENSITIVITY_UI) {
110 110
     disp_state_stack._disp_index++;
@@ -118,25 +118,14 @@ void lv_draw_homing_sensitivity_settings(void) {
118 118
   lv_scr_load(scr);
119 119
   lv_obj_clean(scr);
120 120
 
121
-  lv_obj_t * title = lv_label_create(scr, NULL);
122
-  lv_obj_set_style(title, &tft_style_label_rel);
123
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
124
-  lv_label_set_text(title, machine_menu.HomingSensitivityConfTitle);
121
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.HomingSensitivityConfTitle);
125 122
 
126 123
   lv_refr_now(lv_refr_get_disp_refreshing());
127 124
 
128
-  labelXText = lv_label_create(scr, NULL);
129
-  lv_obj_set_style(labelXText, &tft_style_label_rel);
130
-  lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
131
-  lv_label_set_text(labelXText, machine_menu.X_Sensitivity);
125
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.X_Sensitivity);
132 126
 
133
-  buttonXValue = lv_btn_create(scr, NULL);
134
-  lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
135
-  lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
136
-  lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_SENSITIVITY_X, NULL, 0);
137
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
138
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
139
-  labelXValue = lv_label_create(buttonXValue, NULL);
127
+  buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_SENSITIVITY_X);
128
+  labelXValue = lv_label_create_empty(buttonXValue);
140 129
 
141 130
   #if HAS_ROTARY_ENCODER
142 131
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonXValue);
@@ -145,18 +134,10 @@ void lv_draw_homing_sensitivity_settings(void) {
145 134
   line1 = lv_line_create(scr, NULL);
146 135
   lv_ex_line(line1, line_points[0]);
147 136
 
148
-  labelYText = lv_label_create(scr, NULL);
149
-  lv_obj_set_style(labelYText, &tft_style_label_rel);
150
-  lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
151
-  lv_label_set_text(labelYText, machine_menu.Y_Sensitivity);
137
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.Y_Sensitivity);
152 138
 
153
-  buttonYValue = lv_btn_create(scr, NULL);
154
-  lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2);
155
-  lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
156
-  lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_SENSITIVITY_Y, NULL, 0);
157
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
158
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
159
-  labelYValue = lv_label_create(buttonYValue, NULL);
139
+  buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_SENSITIVITY_Y);
140
+  labelYValue = lv_label_create_empty(buttonYValue);
160 141
 
161 142
   #if HAS_ROTARY_ENCODER
162 143
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonYValue);
@@ -165,18 +146,10 @@ void lv_draw_homing_sensitivity_settings(void) {
165 146
   line2 = lv_line_create(scr, NULL);
166 147
   lv_ex_line(line2, line_points[1]);
167 148
 
168
-  labelZText = lv_label_create(scr, NULL);
169
-  lv_obj_set_style(labelZText, &tft_style_label_rel);
170
-  lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
171
-  lv_label_set_text(labelZText, machine_menu.Z_Sensitivity);
149
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.Z_Sensitivity);
172 150
 
173
-  buttonZValue = lv_btn_create(scr, NULL);
174
-  lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2);
175
-  lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
176
-  lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_SENSITIVITY_Z, NULL, 0);
177
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
178
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
179
-  labelZValue = lv_label_create(buttonZValue, NULL);
151
+  buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_SENSITIVITY_Z);
152
+  labelZValue = lv_label_create_empty(buttonZValue);
180 153
 
181 154
   #if HAS_ROTARY_ENCODER
182 155
     if (gCfgItems.encoder_enable == true) lv_group_add_obj(g, buttonZValue);
@@ -186,18 +159,10 @@ void lv_draw_homing_sensitivity_settings(void) {
186 159
   lv_ex_line(line3, line_points[2]);
187 160
 
188 161
   #if Z2_SENSORLESS
189
-    labelZ2Text = lv_label_create(scr, NULL);
190
-    lv_obj_set_style(labelZ2Text, &tft_style_label_rel);
191
-    lv_obj_set_pos(labelZ2Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
192
-    lv_label_set_text(labelZ2Text, machine_menu.Z2_Sensitivity);
193
-
194
-    buttonZ2Value = lv_btn_create(scr, NULL);
195
-    lv_obj_set_pos(buttonZ2Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2);
196
-    lv_obj_set_size(buttonZ2Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
197
-    lv_obj_set_event_cb_mks(buttonZ2Value, event_handler, ID_SENSITIVITY_Z2, NULL, 0);
198
-    lv_btn_set_style(buttonZ2Value, LV_BTN_STYLE_REL, &style_para_value);
199
-    lv_btn_set_style(buttonZ2Value, LV_BTN_STYLE_PR, &style_para_value);
200
-    labelZ2Value = lv_label_create(buttonZ2Value, NULL);
162
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.Z2_Sensitivity);
163
+
164
+    buttonZ2Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_SENSITIVITY_Z2);
165
+    labelZ2Value = lv_label_create_empty(buttonZ2Value);
201 166
 
202 167
     #if HAS_ROTARY_ENCODER
203 168
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonZ2Value);
@@ -207,13 +172,8 @@ void lv_draw_homing_sensitivity_settings(void) {
207 172
     lv_ex_line(line4, line_points[3]);
208 173
   #endif
209 174
 
210
-  buttonBack = lv_btn_create(scr, NULL);
211
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_SENSITIVITY_RETURN, NULL, 0);
212
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
213
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
214
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
215
-  lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
216
-  label_Back = lv_label_create(buttonBack, NULL);
175
+  buttonBack = lv_btn_create_back(scr, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_SENSITIVITY_RETURN);
176
+  label_Back = lv_label_create_empty(buttonBack);
217 177
 
218 178
   #if HAS_ROTARY_ENCODER
219 179
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);

+ 20
- 61
Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp Vedi File

@@ -94,11 +94,11 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
94 94
 
95 95
 void lv_draw_jerk_settings(void) {
96 96
   lv_obj_t *buttonBack = NULL, *label_Back = NULL;
97
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
98
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
99
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
100
-  lv_obj_t *labelEText = NULL, *buttonEValue = NULL, *labelEValue = NULL;
101
-  lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
97
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
98
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
99
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
100
+  lv_obj_t *buttonEValue = NULL, *labelEValue = NULL;
101
+  lv_obj_t *line1 = NULL, *line2 = NULL, *line3 = NULL, *line4 = NULL;
102 102
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != JERK_UI) {
103 103
     disp_state_stack._disp_index++;
104 104
     disp_state_stack._disp_state[disp_state_stack._disp_index] = JERK_UI;
@@ -111,85 +111,44 @@ void lv_draw_jerk_settings(void) {
111 111
   lv_scr_load(scr);
112 112
   lv_obj_clean(scr);
113 113
 
114
-  lv_obj_t * title = lv_label_create(scr, NULL);
115
-  lv_obj_set_style(title, &tft_style_label_rel);
116
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
117
-  lv_label_set_text(title, machine_menu.JerkConfTitle);
114
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.JerkConfTitle);
118 115
 
119 116
   lv_refr_now(lv_refr_get_disp_refreshing());
120 117
 
121
-  labelXText = lv_label_create(scr, NULL);
122
-  lv_obj_set_style(labelXText, &tft_style_label_rel);
123
-  lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
124
-  lv_label_set_text(labelXText, machine_menu.X_Jerk);
118
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.X_Jerk);
125 119
 
126
-  buttonXValue = lv_btn_create(scr, NULL);
127
-  lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
128
-  lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
129
-  lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_JERK_X, NULL, 0);
130
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
131
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
132
-  labelXValue = lv_label_create(buttonXValue, NULL);
120
+  buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_JERK_X);
121
+  labelXValue = lv_label_create_empty(buttonXValue);
133 122
 
134 123
   line1 = lv_line_create(scr, NULL);
135 124
   lv_ex_line(line1, line_points[0]);
136 125
 
137
-  labelYText = lv_label_create(scr, NULL);
138
-  lv_obj_set_style(labelYText, &tft_style_label_rel);
139
-  lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
140
-  lv_label_set_text(labelYText, machine_menu.Y_Jerk);
126
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.Y_Jerk);
141 127
 
142
-  buttonYValue = lv_btn_create(scr, NULL);
143
-  lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
144
-  lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
145
-  lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_JERK_Y, NULL, 0);
146
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
147
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
148
-  labelYValue = lv_label_create(buttonYValue, NULL);
128
+  buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_JERK_Y);
129
+  labelYValue = lv_label_create_empty(buttonYValue);
149 130
 
150 131
   line2 = lv_line_create(scr, NULL);
151 132
   lv_ex_line(line2, line_points[1]);
152 133
 
153
-  labelZText = lv_label_create(scr, NULL);
154
-  lv_obj_set_style(labelZText, &tft_style_label_rel);
155
-  lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
156
-  lv_label_set_text(labelZText, machine_menu.Z_Jerk);
134
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.Z_Jerk);
157 135
 
158
-  buttonZValue = lv_btn_create(scr, NULL);
159
-  lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
160
-  lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
161
-  lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_JERK_Z, NULL, 0);
162
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
163
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
164
-  labelZValue = lv_label_create(buttonZValue, NULL);
136
+  buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_JERK_Z);
137
+  labelZValue = lv_label_create_empty(buttonZValue);
165 138
 
166 139
   line3 = lv_line_create(scr, NULL);
167 140
   lv_ex_line(line3, line_points[2]);
168 141
 
169
-  labelEText = lv_label_create(scr, NULL);
170
-  lv_obj_set_style(labelEText, &tft_style_label_rel);
171
-  lv_obj_set_pos(labelEText, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
172
-  lv_label_set_text(labelEText, machine_menu.E_Jerk);
142
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.E_Jerk);
173 143
 
174
-  buttonEValue = lv_btn_create(scr, NULL);
175
-  lv_obj_set_pos(buttonEValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V);
176
-  lv_obj_set_size(buttonEValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
177
-  lv_obj_set_event_cb_mks(buttonEValue, event_handler, ID_JERK_E, NULL, 0);
178
-  lv_btn_set_style(buttonEValue, LV_BTN_STYLE_REL, &style_para_value);
179
-  lv_btn_set_style(buttonEValue, LV_BTN_STYLE_PR, &style_para_value);
180
-  labelEValue = lv_label_create(buttonEValue, NULL);
144
+  buttonEValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_JERK_E);
145
+  labelEValue = lv_label_create_empty(buttonEValue);
181 146
 
182 147
   line4 = lv_line_create(scr, NULL);
183 148
   lv_ex_line(line4, line_points[3]);
184 149
 
185
-  buttonBack = lv_btn_create(scr, NULL);
186
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_JERK_RETURN, NULL, 0);
187
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
188
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
189
-
190
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
191
-  lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
192
-  label_Back = lv_label_create(buttonBack, NULL);
150
+  buttonBack = lv_btn_create_back(scr, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_JERK_RETURN);
151
+  label_Back = lv_label_create_empty(buttonBack);
193 152
 
194 153
   #if HAS_ROTARY_ENCODER
195 154
     if (gCfgItems.encoder_enable == true) {

+ 25
- 106
Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp Vedi File

@@ -62,8 +62,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
62 62
       }
63 63
       else if (event == LV_EVENT_RELEASED) {
64 64
         disp_language(gCfgItems.language, UNSELECTED);
65
-        lv_imgbtn_set_src(buttonCN, LV_BTN_STATE_REL, "F:/bmp_simplified_cn_sel.bin");
66
-        lv_imgbtn_set_src(buttonCN, LV_BTN_STATE_PR, "F:/bmp_simplified_cn_sel.bin");
65
+        lv_imgbtn_set_src_both(buttonCN, "F:/bmp_simplified_cn_sel.bin");
67 66
         lv_obj_refresh_ext_draw_pad(buttonCN);
68 67
         gCfgItems.language = LANG_SIMPLE_CHINESE;
69 68
         update_spi_flash();
@@ -76,8 +75,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
76 75
       }
77 76
       else if (event == LV_EVENT_RELEASED) {
78 77
         disp_language(gCfgItems.language, UNSELECTED);
79
-        lv_imgbtn_set_src(buttonT_CN, LV_BTN_STATE_REL, "F:/bmp_traditional_cn_sel.bin");
80
-        lv_imgbtn_set_src(buttonT_CN, LV_BTN_STATE_PR, "F:/bmp_traditional_cn_sel.bin");
78
+        lv_imgbtn_set_src_both(buttonT_CN, "F:/bmp_traditional_cn_sel.bin");
81 79
         lv_obj_refresh_ext_draw_pad(buttonT_CN);
82 80
         gCfgItems.language = LANG_COMPLEX_CHINESE;
83 81
         update_spi_flash();
@@ -90,8 +88,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
90 88
       }
91 89
       else if (event == LV_EVENT_RELEASED) {
92 90
         disp_language(gCfgItems.language, UNSELECTED);
93
-        lv_imgbtn_set_src(buttonEN, LV_BTN_STATE_REL, "F:/bmp_english_sel.bin");
94
-        lv_imgbtn_set_src(buttonEN, LV_BTN_STATE_PR, "F:/bmp_english_sel.bin");
91
+        lv_imgbtn_set_src_both(buttonEN, "F:/bmp_english_sel.bin");
95 92
         lv_obj_refresh_ext_draw_pad(buttonEN);
96 93
         gCfgItems.language = LANG_ENGLISH;
97 94
         update_spi_flash();
@@ -104,8 +101,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
104 101
       }
105 102
       else if (event == LV_EVENT_RELEASED) {
106 103
         disp_language(gCfgItems.language, UNSELECTED);
107
-        lv_imgbtn_set_src(buttonRU, LV_BTN_STATE_REL, "F:/bmp_russian_sel.bin");
108
-        lv_imgbtn_set_src(buttonRU, LV_BTN_STATE_PR, "F:/bmp_russian_sel.bin");
104
+        lv_imgbtn_set_src_both(buttonRU, "F:/bmp_russian_sel.bin");
109 105
         lv_obj_refresh_ext_draw_pad(buttonRU);
110 106
         gCfgItems.language = LANG_RUSSIAN;
111 107
         update_spi_flash();
@@ -118,8 +114,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
118 114
       }
119 115
       else if (event == LV_EVENT_RELEASED) {
120 116
         disp_language(gCfgItems.language, UNSELECTED);
121
-        lv_imgbtn_set_src(buttonES, LV_BTN_STATE_REL, "F:/bmp_spanish_sel.bin");
122
-        lv_imgbtn_set_src(buttonES, LV_BTN_STATE_PR, "F:/bmp_spanish_sel.bin");
117
+        lv_imgbtn_set_src_both(buttonES, "F:/bmp_spanish_sel.bin");
123 118
         lv_obj_refresh_ext_draw_pad(buttonES);
124 119
         gCfgItems.language = LANG_SPANISH;
125 120
         update_spi_flash();
@@ -132,8 +127,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
132 127
       }
133 128
       else if (event == LV_EVENT_RELEASED) {
134 129
         disp_language(gCfgItems.language, UNSELECTED);
135
-        lv_imgbtn_set_src(buttonFR, LV_BTN_STATE_REL, "F:/bmp_french_sel.bin");
136
-        lv_imgbtn_set_src(buttonFR, LV_BTN_STATE_PR, "F:/bmp_french_sel.bin");
130
+        lv_imgbtn_set_src_both(buttonFR, "F:/bmp_french_sel.bin");
137 131
         lv_obj_refresh_ext_draw_pad(buttonFR);
138 132
         gCfgItems.language = LANG_FRENCH;
139 133
         update_spi_flash();
@@ -146,8 +140,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
146 140
       }
147 141
       else if (event == LV_EVENT_RELEASED) {
148 142
         disp_language(gCfgItems.language, UNSELECTED);
149
-        lv_imgbtn_set_src(buttonIT, LV_BTN_STATE_REL, "F:/bmp_italy_sel.bin");
150
-        lv_imgbtn_set_src(buttonIT, LV_BTN_STATE_PR, "F:/bmp_italy_sel.bin");
143
+        lv_imgbtn_set_src_both(buttonIT, "F:/bmp_italy_sel.bin");
151 144
         lv_obj_refresh_ext_draw_pad(buttonIT);
152 145
         gCfgItems.language = LANG_ITALY;
153 146
         update_spi_flash();
@@ -159,7 +152,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
159 152
 
160 153
       }
161 154
       else if (event == LV_EVENT_RELEASED) {
162
-
163 155
         buttonCN   = NULL;
164 156
         buttonT_CN = NULL;
165 157
         buttonEN   = NULL;
@@ -231,8 +223,7 @@ static void disp_language(uint8_t language, uint8_t state) {
231 223
   strcat_P(public_buf_l, PSTR(".bin"));
232 224
 
233 225
   lv_obj_set_event_cb_mks(obj, event_handler, id, NULL, 0);
234
-  lv_imgbtn_set_src(obj, LV_BTN_STATE_REL, public_buf_l);
235
-  lv_imgbtn_set_src(obj, LV_BTN_STATE_PR, public_buf_l);
226
+  lv_imgbtn_set_src_both(obj, public_buf_l);
236 227
 
237 228
   if (state == UNSELECTED) lv_obj_refresh_ext_draw_pad(obj);
238 229
 }
@@ -253,102 +244,30 @@ void lv_draw_language(void) {
253 244
   lv_scr_load(scr);
254 245
   lv_obj_clean(scr);
255 246
 
256
-  lv_obj_t * title = lv_label_create(scr, NULL);
257
-  lv_obj_set_style(title, &tft_style_label_rel);
258
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
259
-  lv_label_set_text(title, creat_title_text());
247
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
260 248
 
261 249
   lv_refr_now(lv_refr_get_disp_refreshing());
262 250
 
263 251
   // Create image buttons
264
-  buttonCN   = lv_imgbtn_create(scr, NULL);
265
-  buttonT_CN = lv_imgbtn_create(scr, NULL);
266
-  buttonEN   = lv_imgbtn_create(scr, NULL);
267
-  buttonRU   = lv_imgbtn_create(scr, NULL);
268
-  buttonES   = lv_imgbtn_create(scr, NULL);
269
-  buttonFR   = lv_imgbtn_create(scr, NULL);
270
-  buttonIT   = lv_imgbtn_create(scr, NULL);
271
-  buttonBack = lv_imgbtn_create(scr, NULL);
272
-
273
-  lv_obj_set_event_cb_mks(buttonCN, event_handler, ID_CN, NULL, 0);
274
-  lv_imgbtn_set_src(buttonCN, LV_BTN_STATE_REL, "F:/bmp_simplified_cn.bin");
275
-  lv_imgbtn_set_src(buttonCN, LV_BTN_STATE_PR, "F:/bmp_simplified_cn.bin");
276
-  lv_imgbtn_set_style(buttonCN, LV_BTN_STATE_PR, &tft_style_label_pre);
277
-  lv_imgbtn_set_style(buttonCN, LV_BTN_STATE_REL, &tft_style_label_rel);
252
+  buttonCN = lv_imgbtn_create(scr, "F:/bmp_simplified_cn.bin", INTERVAL_V, titleHeight, event_handler, ID_CN);
278 253
   lv_obj_clear_protect(buttonCN, LV_PROTECT_FOLLOW);
279
-
280
-  #if 1
281
-    lv_obj_set_event_cb_mks(buttonT_CN, event_handler, ID_T_CN, NULL, 0);
282
-    lv_imgbtn_set_src(buttonT_CN, LV_BTN_STATE_REL, "F:/bmp_traditional_cn.bin");
283
-    lv_imgbtn_set_src(buttonT_CN, LV_BTN_STATE_PR, "F:/bmp_traditional_cn.bin");
284
-    lv_imgbtn_set_style(buttonT_CN, LV_BTN_STATE_PR, &tft_style_label_pre);
285
-    lv_imgbtn_set_style(buttonT_CN, LV_BTN_STATE_REL, &tft_style_label_rel);
286
-
287
-    lv_obj_set_event_cb_mks(buttonEN, event_handler, ID_EN, NULL, 0);
288
-    lv_imgbtn_set_src(buttonEN, LV_BTN_STATE_REL, "F:/bmp_english.bin");
289
-    lv_imgbtn_set_src(buttonEN, LV_BTN_STATE_PR, "F:/bmp_english.bin");
290
-    lv_imgbtn_set_style(buttonEN, LV_BTN_STATE_PR, &tft_style_label_pre);
291
-    lv_imgbtn_set_style(buttonEN, LV_BTN_STATE_REL, &tft_style_label_rel);
292
-
293
-    lv_obj_set_event_cb_mks(buttonRU, event_handler, ID_RU, NULL, 0);
294
-    lv_imgbtn_set_src(buttonRU, LV_BTN_STATE_REL, "F:/bmp_russian.bin");
295
-    lv_imgbtn_set_src(buttonRU, LV_BTN_STATE_PR, "F:/bmp_russian.bin");
296
-    lv_imgbtn_set_style(buttonRU, LV_BTN_STATE_PR, &tft_style_label_pre);
297
-    lv_imgbtn_set_style(buttonRU, LV_BTN_STATE_REL, &tft_style_label_rel);
298
-
299
-    lv_obj_set_event_cb_mks(buttonES, event_handler, ID_ES, NULL, 0);
300
-    lv_imgbtn_set_src(buttonES, LV_BTN_STATE_REL, "F:/bmp_spanish.bin");
301
-    lv_imgbtn_set_src(buttonES, LV_BTN_STATE_PR, "F:/bmp_spanish.bin");
302
-    lv_imgbtn_set_style(buttonES, LV_BTN_STATE_PR, &tft_style_label_pre);
303
-    lv_imgbtn_set_style(buttonES, LV_BTN_STATE_REL, &tft_style_label_rel);
304
-
305
-    lv_obj_set_event_cb_mks(buttonFR, event_handler, ID_FR, NULL, 0);
306
-    lv_imgbtn_set_src(buttonFR, LV_BTN_STATE_REL, "F:/bmp_french.bin");
307
-    lv_imgbtn_set_src(buttonFR, LV_BTN_STATE_PR, "F:/bmp_french.bin");
308
-    lv_imgbtn_set_style(buttonFR, LV_BTN_STATE_PR, &tft_style_label_pre);
309
-    lv_imgbtn_set_style(buttonFR, LV_BTN_STATE_REL, &tft_style_label_rel);
310
-
311
-    lv_obj_set_event_cb_mks(buttonIT, event_handler, ID_IT, NULL, 0);
312
-    lv_imgbtn_set_src(buttonIT, LV_BTN_STATE_REL, "F:/bmp_italy.bin");
313
-    lv_imgbtn_set_src(buttonIT, LV_BTN_STATE_PR, "F:/bmp_italy.bin");
314
-    lv_imgbtn_set_style(buttonIT, LV_BTN_STATE_PR, &tft_style_label_pre);
315
-    lv_imgbtn_set_style(buttonIT, LV_BTN_STATE_REL, &tft_style_label_rel);
316
-
317
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_L_RETURN, NULL, 0);
318
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
319
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
320
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
321
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
322
-
323
-  #endif // if 1
324
-
325
-  lv_obj_set_pos(buttonCN, INTERVAL_V, titleHeight);
326
-  lv_obj_set_pos(buttonT_CN, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
327
-  lv_obj_set_pos(buttonEN, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
328
-  lv_obj_set_pos(buttonRU, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
329
-  lv_obj_set_pos(buttonES, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
330
-  lv_obj_set_pos(buttonFR, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
331
-  lv_obj_set_pos(buttonIT, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
332
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
254
+  buttonT_CN = lv_imgbtn_create(scr, "F:/bmp_traditional_cn.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_CN);
255
+  buttonEN = lv_imgbtn_create(scr, "F:/bmp_english.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_EN);
256
+  buttonRU = lv_imgbtn_create(scr, "F:/bmp_russian.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_RU);
257
+  buttonES = lv_imgbtn_create(scr, "F:/bmp_spanish.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_ES);
258
+  buttonFR = lv_imgbtn_create(scr, "F:/bmp_french.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FR);
259
+  buttonIT = lv_imgbtn_create(scr, "F:/bmp_italy.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_IT);
260
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_L_RETURN);
333 261
 
334 262
   // Create labels on the image buttons
335
-  lv_btn_set_layout(buttonCN, LV_LAYOUT_OFF);
336
-  lv_btn_set_layout(buttonT_CN, LV_LAYOUT_OFF);
337
-  lv_btn_set_layout(buttonEN, LV_LAYOUT_OFF);
338
-  lv_btn_set_layout(buttonRU, LV_LAYOUT_OFF);
339
-  lv_btn_set_layout(buttonES, LV_LAYOUT_OFF);
340
-  lv_btn_set_layout(buttonFR, LV_LAYOUT_OFF);
341
-  lv_btn_set_layout(buttonIT, LV_LAYOUT_OFF);
342
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
343
-
344
-  lv_obj_t *label_CN   = lv_label_create(buttonCN, NULL);
345
-  lv_obj_t *label_T_CN = lv_label_create(buttonT_CN, NULL);
346
-  lv_obj_t *label_EN   = lv_label_create(buttonEN, NULL);
347
-  lv_obj_t *label_RU   = lv_label_create(buttonRU, NULL);
348
-  lv_obj_t *label_ES   = lv_label_create(buttonES, NULL);
349
-  lv_obj_t *label_FR   = lv_label_create(buttonFR, NULL);
350
-  lv_obj_t *label_IT   = lv_label_create(buttonIT, NULL);
351
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
263
+  lv_obj_t *label_CN   = lv_label_create_empty(buttonCN);
264
+  lv_obj_t *label_T_CN = lv_label_create_empty(buttonT_CN);
265
+  lv_obj_t *label_EN   = lv_label_create_empty(buttonEN);
266
+  lv_obj_t *label_RU   = lv_label_create_empty(buttonRU);
267
+  lv_obj_t *label_ES   = lv_label_create_empty(buttonES);
268
+  lv_obj_t *label_FR   = lv_label_create_empty(buttonFR);
269
+  lv_obj_t *label_IT   = lv_label_create_empty(buttonIT);
270
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
352 271
 
353 272
   disp_language(gCfgItems.language, SELECTED);
354 273
 

+ 12
- 45
Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp Vedi File

@@ -133,10 +133,7 @@ void lv_draw_level_settings(void) {
133 133
   lv_scr_load(scr);
134 134
   lv_obj_clean(scr);
135 135
 
136
-  lv_obj_t * title = lv_label_create(scr, NULL);
137
-  lv_obj_set_style(title, &tft_style_label_rel);
138
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
139
-  lv_label_set_text(title, machine_menu.LevelingParaConfTitle);
136
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.LevelingParaConfTitle);
140 137
 
141 138
   lv_refr_now(lv_refr_get_disp_refreshing());
142 139
 
@@ -145,22 +142,15 @@ void lv_draw_level_settings(void) {
145 142
   lv_obj_set_pos(buttonPosition, PARA_UI_POS_X, PARA_UI_POS_Y);                /*Set its position*/
146 143
   lv_obj_set_size(buttonPosition, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);             /*Set its size*/
147 144
   lv_obj_set_event_cb_mks(buttonPosition, event_handler, ID_LEVEL_POSITION, NULL, 0);
148
-  lv_btn_set_style(buttonPosition, LV_BTN_STYLE_REL, &tft_style_label_rel);    /*Set the button's released style*/
149
-  lv_btn_set_style(buttonPosition, LV_BTN_STYLE_PR, &tft_style_label_pre);     /*Set the button's pressed style*/
145
+  lv_btn_use_label_style(buttonPosition);
150 146
   lv_btn_set_layout(buttonPosition, LV_LAYOUT_OFF);
151
-  labelPosition = lv_label_create(buttonPosition, NULL);                       /*Add a label to the button*/
147
+  labelPosition = lv_label_create_empty(buttonPosition);                       /*Add a label to the button*/
152 148
 
153 149
   #if HAS_ROTARY_ENCODER
154 150
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonPosition);
155 151
   #endif
156 152
 
157
-  buttonPositionNarrow = lv_imgbtn_create(scr, NULL);
158
-  lv_obj_set_pos(buttonPositionNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V);
159
-  lv_obj_set_event_cb_mks(buttonPositionNarrow, event_handler, ID_LEVEL_POSITION_ARROW, NULL, 0);
160
-  lv_imgbtn_set_src(buttonPositionNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
161
-  lv_imgbtn_set_src(buttonPositionNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
162
-  lv_imgbtn_set_style(buttonPositionNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
163
-  lv_imgbtn_set_style(buttonPositionNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
153
+  buttonPositionNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V, event_handler, ID_LEVEL_POSITION_ARROW);
164 154
   lv_btn_set_layout(buttonPositionNarrow, LV_LAYOUT_OFF);
165 155
 
166 156
   line1 = lv_line_create(scr, NULL);
@@ -170,22 +160,15 @@ void lv_draw_level_settings(void) {
170 160
   lv_obj_set_pos(buttonCommand, PARA_UI_POS_X, PARA_UI_POS_Y * 2);
171 161
   lv_obj_set_size(buttonCommand, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);
172 162
   lv_obj_set_event_cb_mks(buttonCommand, event_handler, ID_LEVEL_COMMAND, NULL, 0);
173
-  lv_btn_set_style(buttonCommand, LV_BTN_STYLE_REL, &tft_style_label_rel);
174
-  lv_btn_set_style(buttonCommand, LV_BTN_STYLE_PR, &tft_style_label_pre);
163
+  lv_btn_use_label_style(buttonCommand);
175 164
   lv_btn_set_layout(buttonCommand, LV_LAYOUT_OFF);
176
-  labelCommand = lv_label_create(buttonCommand, NULL);
165
+  labelCommand = lv_label_create_empty(buttonCommand);
177 166
 
178 167
   #if HAS_ROTARY_ENCODER
179 168
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonCommand);
180 169
   #endif
181 170
 
182
-  buttonCommandNarrow = lv_imgbtn_create(scr, NULL);
183
-  lv_obj_set_pos(buttonCommandNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V);
184
-  lv_obj_set_event_cb_mks(buttonCommandNarrow, event_handler, ID_LEVEL_COMMAND_ARROW, NULL, 0);
185
-  lv_imgbtn_set_src(buttonCommandNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
186
-  lv_imgbtn_set_src(buttonCommandNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
187
-  lv_imgbtn_set_style(buttonCommandNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
188
-  lv_imgbtn_set_style(buttonCommandNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
171
+  buttonCommandNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V, event_handler, ID_LEVEL_COMMAND_ARROW);
189 172
   lv_btn_set_layout(buttonCommandNarrow, LV_LAYOUT_OFF);
190 173
 
191 174
   line2 = lv_line_create(scr, NULL);
@@ -193,26 +176,15 @@ void lv_draw_level_settings(void) {
193 176
 
194 177
   #if HAS_BED_PROBE
195 178
 
196
-    buttonZoffset = lv_btn_create(scr, NULL);                                 /*Add a button the current screen*/
197
-    lv_obj_set_pos(buttonZoffset, PARA_UI_POS_X, PARA_UI_POS_Y * 3);          /*Set its position*/
198
-    lv_obj_set_size(buttonZoffset, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           /*Set its size*/
199
-    lv_obj_set_event_cb_mks(buttonZoffset, event_handler, ID_LEVEL_ZOFFSET, NULL, 0);
200
-    lv_btn_set_style(buttonZoffset, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
201
-    lv_btn_set_style(buttonZoffset, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
179
+    buttonZoffset = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3, PARA_UI_SIZE_X, PARA_UI_SIZE_Y, event_handler, ID_LEVEL_ZOFFSET);
202 180
     lv_btn_set_layout(buttonZoffset, LV_LAYOUT_OFF);
203
-    labelZoffset = lv_label_create(buttonZoffset, NULL);                      /*Add a label to the button*/
181
+    labelZoffset = lv_label_create_empty(buttonZoffset);                      /*Add a label to the button*/
204 182
 
205 183
     #if HAS_ROTARY_ENCODER
206 184
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonZoffset);
207 185
     #endif
208 186
 
209
-    buttonZoffsetNarrow = lv_imgbtn_create(scr, NULL);
210
-    lv_obj_set_pos(buttonZoffsetNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V);
211
-    lv_obj_set_event_cb_mks(buttonZoffsetNarrow, event_handler, ID_LEVEL_ZOFFSET_ARROW, NULL, 0);
212
-    lv_imgbtn_set_src(buttonZoffsetNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
213
-    lv_imgbtn_set_src(buttonZoffsetNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
214
-    lv_imgbtn_set_style(buttonZoffsetNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
215
-    lv_imgbtn_set_style(buttonZoffsetNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
187
+    buttonZoffsetNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V, event_handler, ID_LEVEL_ZOFFSET_ARROW);
216 188
     lv_btn_set_layout(buttonZoffsetNarrow, LV_LAYOUT_OFF);
217 189
 
218 190
     line3 = lv_line_create(scr, NULL);
@@ -220,19 +192,14 @@ void lv_draw_level_settings(void) {
220 192
 
221 193
   #endif // HAS_BED_PROBE
222 194
 
223
-  buttonBack = lv_imgbtn_create(scr, NULL);
224
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_LEVEL_RETURN, NULL, 0);
225
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
226
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
227
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
228
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
195
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", event_handler, ID_LEVEL_RETURN);
229 196
   #if HAS_ROTARY_ENCODER
230 197
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
231 198
   #endif
232 199
 
233 200
   lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
234 201
   lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
235
-  label_Back = lv_label_create(buttonBack, NULL);
202
+  label_Back = lv_label_create_empty(buttonBack);
236 203
 
237 204
   if (gCfgItems.multiple_language) {
238 205
     lv_label_set_text(label_Back, common_menu.text_back);

+ 16
- 63
Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp Vedi File

@@ -146,10 +146,7 @@ void lv_draw_machine_para(void) {
146 146
   lv_scr_load(scr);
147 147
   lv_obj_clean(scr);
148 148
 
149
-  lv_obj_t * title = lv_label_create(scr, NULL);
150
-  lv_obj_set_style(title, &tft_style_label_rel);
151
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
152
-  lv_label_set_text(title, creat_title_text());
149
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
153 150
 
154 151
   lv_refr_now(lv_refr_get_disp_refreshing());
155 152
 
@@ -158,19 +155,11 @@ void lv_draw_machine_para(void) {
158 155
   lv_obj_set_size(buttonMachine, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           /*Set its size*/
159 156
   //lv_obj_set_event_cb(buttonMachine, event_handler);
160 157
   lv_obj_set_event_cb_mks(buttonMachine, event_handler, ID_PARA_MACHINE, NULL, 0);
161
-  lv_btn_set_style(buttonMachine, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
162
-  lv_btn_set_style(buttonMachine, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
158
+  lv_btn_use_label_style(buttonMachine);
163 159
   lv_btn_set_layout(buttonMachine, LV_LAYOUT_OFF);
164
-  labelMachine = lv_label_create(buttonMachine, NULL);                      /*Add a label to the button*/
160
+  labelMachine = lv_label_create_empty(buttonMachine);                      /*Add a label to the button*/
165 161
 
166
-  buttonMachineNarrow = lv_imgbtn_create(scr, NULL);
167
-  lv_obj_set_pos(buttonMachineNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V);
168
-  lv_obj_set_event_cb_mks(buttonMachineNarrow, event_handler, ID_PARA_MACHINE_ARROW, NULL, 0);
169
-  lv_imgbtn_set_src(buttonMachineNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
170
-  lv_imgbtn_set_src(buttonMachineNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
171
-  lv_imgbtn_set_style(buttonMachineNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
172
-  lv_imgbtn_set_style(buttonMachineNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
173
-  lv_btn_set_layout(buttonMachineNarrow, LV_LAYOUT_OFF);
162
+  buttonMachineNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V, event_handler, ID_PARA_MACHINE_ARROW);
174 163
 
175 164
   line1 = lv_line_create(scr, NULL);
176 165
   lv_ex_line(line1, line_points[0]);
@@ -180,41 +169,21 @@ void lv_draw_machine_para(void) {
180 169
   lv_obj_set_size(buttonMotor, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);             /*Set its size*/
181 170
   //lv_obj_set_event_cb(buttonMotor, event_handler);
182 171
   lv_obj_set_event_cb_mks(buttonMotor, event_handler, ID_PARA_MOTOR, NULL, 0);
183
-  lv_btn_set_style(buttonMotor, LV_BTN_STYLE_REL, &tft_style_label_rel);    /*Set the button's released style*/
184
-  lv_btn_set_style(buttonMotor, LV_BTN_STYLE_PR, &tft_style_label_pre);     /*Set the button's pressed style*/
172
+  lv_btn_use_label_style(buttonMotor);
185 173
   lv_btn_set_layout(buttonMotor, LV_LAYOUT_OFF);
186
-  labelMotor = lv_label_create(buttonMotor, NULL);                          /*Add a label to the button*/
174
+  labelMotor = lv_label_create_empty(buttonMotor);                          /*Add a label to the button*/
187 175
 
188
-  buttonMotorNarrow = lv_imgbtn_create(scr, NULL);
189
-  lv_obj_set_pos(buttonMotorNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V);
190
-  lv_obj_set_event_cb_mks(buttonMotorNarrow, event_handler, ID_PARA_MOTOR_ARROW, NULL, 0);
191
-  lv_imgbtn_set_src(buttonMotorNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
192
-  lv_imgbtn_set_src(buttonMotorNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
193
-  lv_imgbtn_set_style(buttonMotorNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
194
-  lv_imgbtn_set_style(buttonMotorNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
195
-  lv_btn_set_layout(buttonMotorNarrow, LV_LAYOUT_OFF);
176
+  buttonMotorNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V, event_handler, ID_PARA_MOTOR_ARROW);
196 177
 
197 178
   line2 = lv_line_create(scr, NULL);
198 179
   lv_ex_line(line2, line_points[1]);
199 180
 
200
-  buttonLevel = lv_btn_create(scr, NULL);                                 /*Add a button the current screen*/
201
-  lv_obj_set_pos(buttonLevel, PARA_UI_POS_X, PARA_UI_POS_Y * 3);          /*Set its position*/
202
-  lv_obj_set_size(buttonLevel, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           /*Set its size*/
181
+  buttonLevel = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3, PARA_UI_SIZE_X, PARA_UI_SIZE_Y, event_handler, ID_PARA_LEVEL);
203 182
   //lv_obj_set_event_cb(buttonMotor, event_handler);
204
-  lv_obj_set_event_cb_mks(buttonLevel, event_handler, ID_PARA_LEVEL, NULL, 0);
205
-  lv_btn_set_style(buttonLevel, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
206
-  lv_btn_set_style(buttonLevel, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
207 183
   lv_btn_set_layout(buttonLevel, LV_LAYOUT_OFF);
208
-  labelLevel = lv_label_create(buttonLevel, NULL);                      /*Add a label to the button*/
184
+  labelLevel = lv_label_create_empty(buttonLevel);                      /*Add a label to the button*/
209 185
 
210
-  buttonLevelNarrow = lv_imgbtn_create(scr, NULL);
211
-  lv_obj_set_pos(buttonLevelNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V);
212
-  lv_obj_set_event_cb_mks(buttonLevelNarrow, event_handler, ID_PARA_LEVEL_ARROW, NULL, 0);
213
-  lv_imgbtn_set_src(buttonLevelNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
214
-  lv_imgbtn_set_src(buttonLevelNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
215
-  lv_imgbtn_set_style(buttonLevelNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
216
-  lv_imgbtn_set_style(buttonLevelNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
217
-  lv_btn_set_layout(buttonLevelNarrow, LV_LAYOUT_OFF);
186
+  buttonLevelNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V, event_handler, ID_PARA_LEVEL_ARROW);
218 187
 
219 188
   line3 = lv_line_create(scr, NULL);
220 189
   lv_ex_line(line3, line_points[2]);
@@ -224,33 +193,18 @@ void lv_draw_machine_para(void) {
224 193
   lv_obj_set_size(buttonAdvance, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           /*Set its size*/
225 194
   //lv_obj_set_event_cb(buttonMotor, event_handler);
226 195
   lv_obj_set_event_cb_mks(buttonAdvance, event_handler, ID_PARA_ADVANCE, NULL, 0);
227
-  lv_btn_set_style(buttonAdvance, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
228
-  lv_btn_set_style(buttonAdvance, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
196
+  lv_btn_use_label_style(buttonAdvance);
229 197
   lv_btn_set_layout(buttonAdvance, LV_LAYOUT_OFF);
230
-  labelAdvance = lv_label_create(buttonAdvance, NULL);                      /*Add a label to the button*/
231
-
232
-  buttonAdvanceNarrow = lv_imgbtn_create(scr, NULL);
233
-  lv_obj_set_pos(buttonAdvanceNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 4 + PARA_UI_ARROW_V);
234
-  lv_obj_set_event_cb_mks(buttonAdvanceNarrow, event_handler, ID_PARA_ADVANCE_ARROW, NULL, 0);
235
-  lv_imgbtn_set_src(buttonAdvanceNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
236
-  lv_imgbtn_set_src(buttonAdvanceNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
237
-  lv_imgbtn_set_style(buttonAdvanceNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
238
-  lv_imgbtn_set_style(buttonAdvanceNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
198
+  labelAdvance = lv_label_create_empty(buttonAdvance);                      /*Add a label to the button*/
199
+
200
+  buttonAdvanceNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 4 + PARA_UI_ARROW_V, event_handler, ID_PARA_ADVANCE_ARROW);
239 201
   lv_btn_set_layout(buttonAdvanceNarrow, LV_LAYOUT_OFF);
240 202
 
241 203
   line4 = lv_line_create(scr, NULL);
242 204
   lv_ex_line(line4, line_points[3]);
243 205
 
244
-  buttonBack = lv_imgbtn_create(scr, NULL);
245
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_PARA_RETURN, NULL, 0);
246
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
247
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
248
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
249
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
250
-
251
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y);
252
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
253
-  label_Back = lv_label_create(buttonBack, NULL);
206
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_PARA_RETURN);
207
+  label_Back = lv_label_create_empty(buttonBack);
254 208
 
255 209
   if (gCfgItems.multiple_language) {
256 210
     lv_label_set_text(label_Back, common_menu.text_back);
@@ -277,7 +231,6 @@ void lv_draw_machine_para(void) {
277 231
       lv_group_add_obj(g, buttonBack);
278 232
     }
279 233
   #endif
280
-
281 234
 }
282 235
 
283 236
 void lv_clear_machine_para() {

+ 12
- 44
Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp Vedi File

@@ -132,10 +132,7 @@ void lv_draw_machine_settings(void) {
132 132
   lv_scr_load(scr);
133 133
   lv_obj_clean(scr);
134 134
 
135
-  lv_obj_t * title = lv_label_create(scr, NULL);
136
-  lv_obj_set_style(title, &tft_style_label_rel);
137
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
138
-  lv_label_set_text(title, machine_menu.MachineConfigTitle);
135
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.MachineConfigTitle);
139 136
 
140 137
   lv_refr_now(lv_refr_get_disp_refreshing());
141 138
 
@@ -144,19 +141,11 @@ void lv_draw_machine_settings(void) {
144 141
   lv_obj_set_size(buttonAcceleration, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);          // Set its size
145 142
   //lv_obj_set_event_cb(buttonMachine, event_handler);
146 143
   lv_obj_set_event_cb_mks(buttonAcceleration, event_handler, ID_MACHINE_ACCELERATION, NULL, 0);
147
-  lv_btn_set_style(buttonAcceleration, LV_BTN_STYLE_REL, &tft_style_label_rel); // Set the button's released style
148
-  lv_btn_set_style(buttonAcceleration, LV_BTN_STYLE_PR, &tft_style_label_pre);  // Set the button's pressed style
144
+  lv_btn_use_label_style(buttonAcceleration);
149 145
   lv_btn_set_layout(buttonAcceleration, LV_LAYOUT_OFF);
150
-  labelAcceleration = lv_label_create(buttonAcceleration, NULL);                // Add a label to the button
146
+  labelAcceleration = lv_label_create_empty(buttonAcceleration);                // Add a label to the button
151 147
 
152
-  buttonAccelerationNarrow = lv_imgbtn_create(scr, NULL);
153
-  lv_obj_set_pos(buttonAccelerationNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V);
154
-  lv_obj_set_event_cb_mks(buttonAccelerationNarrow, event_handler, ID_MACHINE_ACCELERATION_ARROW, NULL, 0);
155
-  lv_imgbtn_set_src(buttonAccelerationNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
156
-  lv_imgbtn_set_src(buttonAccelerationNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
157
-  lv_imgbtn_set_style(buttonAccelerationNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
158
-  lv_imgbtn_set_style(buttonAccelerationNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
159
-  lv_btn_set_layout(buttonAccelerationNarrow, LV_LAYOUT_OFF);
148
+  buttonAccelerationNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V, event_handler, ID_MACHINE_ACCELERATION_ARROW);
160 149
 
161 150
   line1 = lv_line_create(lv_scr_act(), NULL);
162 151
   lv_ex_line(line1, line_points[0]);
@@ -166,19 +155,11 @@ void lv_draw_machine_settings(void) {
166 155
   lv_obj_set_size(buttonMaxFeedrate, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           // Set its size
167 156
   //lv_obj_set_event_cb(buttonMachine, event_handler);
168 157
   lv_obj_set_event_cb_mks(buttonMaxFeedrate, event_handler, ID_MACHINE_FEEDRATE, NULL, 0);
169
-  lv_btn_set_style(buttonMaxFeedrate, LV_BTN_STYLE_REL, &tft_style_label_rel);  // Set the button's released style
170
-  lv_btn_set_style(buttonMaxFeedrate, LV_BTN_STYLE_PR, &tft_style_label_pre);   // Set the button's pressed style
158
+  lv_btn_use_label_style(buttonMaxFeedrate);
171 159
   lv_btn_set_layout(buttonMaxFeedrate, LV_LAYOUT_OFF);
172
-  labelMaxFeedrate = lv_label_create(buttonMaxFeedrate, NULL);                  // Add a label to the button
160
+  labelMaxFeedrate = lv_label_create_empty(buttonMaxFeedrate);                  // Add a label to the button
173 161
 
174
-  buttonMaxFeedrateNarrow = lv_imgbtn_create(scr, NULL);
175
-  lv_obj_set_pos(buttonMaxFeedrateNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V);
176
-  lv_obj_set_event_cb_mks(buttonMaxFeedrateNarrow, event_handler, ID_MACHINE_FEEDRATE_ARROW, NULL, 0);
177
-  lv_imgbtn_set_src(buttonMaxFeedrateNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
178
-  lv_imgbtn_set_src(buttonMaxFeedrateNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
179
-  lv_imgbtn_set_style(buttonMaxFeedrateNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
180
-  lv_imgbtn_set_style(buttonMaxFeedrateNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
181
-  lv_btn_set_layout(buttonMaxFeedrateNarrow, LV_LAYOUT_OFF);
162
+  buttonMaxFeedrateNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V, event_handler, ID_MACHINE_FEEDRATE_ARROW);
182 163
 
183 164
   line2 = lv_line_create(lv_scr_act(), NULL);
184 165
   lv_ex_line(line2, line_points[1]);
@@ -189,34 +170,21 @@ void lv_draw_machine_settings(void) {
189 170
     lv_obj_set_size(buttonJerk, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);                // Set its size
190 171
     //lv_obj_set_event_cb(buttonMotor, event_handler);
191 172
     lv_obj_set_event_cb_mks(buttonJerk, event_handler, ID_MACHINE_JERK, NULL, 0);
192
-    lv_btn_set_style(buttonJerk, LV_BTN_STYLE_REL, &tft_style_label_rel);       // Set the button's released style
193
-    lv_btn_set_style(buttonJerk, LV_BTN_STYLE_PR, &tft_style_label_pre);        // Set the button's pressed style
173
+    lv_btn_use_label_style(buttonJerk);
194 174
     lv_btn_set_layout(buttonJerk, LV_LAYOUT_OFF);
195
-    labelJerk = lv_label_create(buttonJerk, NULL);                              // Add a label to the button
175
+    labelJerk = lv_label_create_empty(buttonJerk);                              // Add a label to the button
196 176
 
197
-    buttonJerkNarrow = lv_imgbtn_create(scr, NULL);
198
-    lv_obj_set_pos(buttonJerkNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V);
199
-    lv_obj_set_event_cb_mks(buttonJerkNarrow, event_handler, ID_MACHINE_JERK_ARROW, NULL, 0);
200
-    lv_imgbtn_set_src(buttonJerkNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
201
-    lv_imgbtn_set_src(buttonJerkNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
202
-    lv_imgbtn_set_style(buttonJerkNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
203
-    lv_imgbtn_set_style(buttonJerkNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
204
-    lv_btn_set_layout(buttonJerkNarrow, LV_LAYOUT_OFF);
177
+    buttonJerkNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 3 + PARA_UI_ARROW_V, event_handler, ID_MACHINE_JERK_ARROW);
205 178
 
206 179
     line3 = lv_line_create(lv_scr_act(), NULL);
207 180
     lv_ex_line(line3, line_points[2]);
208 181
   #endif
209 182
 
210
-  buttonBack = lv_imgbtn_create(scr, NULL);
211
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_MACHINE_RETURN, NULL, 0);
212
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
213
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
214
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
215
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
183
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", event_handler, ID_MACHINE_RETURN);
216 184
 
217 185
   lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
218 186
   lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
219
-  label_Back = lv_label_create(buttonBack, NULL);
187
+  label_Back = lv_label_create_empty(buttonBack);
220 188
 
221 189
   if (gCfgItems.multiple_language) {
222 190
     lv_label_set_text(label_Back, common_menu.text_back);

+ 13
- 68
Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp Vedi File

@@ -178,81 +178,26 @@ void lv_draw_manualLevel(void) {
178 178
   lv_scr_load(scr);
179 179
   lv_obj_clean(scr);
180 180
 
181
-  lv_obj_t * title = lv_label_create(scr, NULL);
182
-  lv_obj_set_style(title, &tft_style_label_rel);
183
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
184
-  lv_label_set_text(title, creat_title_text());
181
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
185 182
 
186 183
   lv_refr_now(lv_refr_get_disp_refreshing());
187 184
 
188 185
   // Create an Image button
189
-  buttonPoint1 = lv_imgbtn_create(scr, NULL);
190
-  buttonPoint2 = lv_imgbtn_create(scr, NULL);
191
-  buttonPoint3 = lv_imgbtn_create(scr, NULL);
192
-  buttonPoint4 = lv_imgbtn_create(scr, NULL);
193
-  buttonPoint5 = lv_imgbtn_create(scr, NULL);
194
-  buttonBack   = lv_imgbtn_create(scr, NULL);
195
-
196
-  lv_obj_set_event_cb_mks(buttonPoint1, event_handler, ID_M_POINT1, NULL, 0);
197
-  lv_imgbtn_set_src(buttonPoint1, LV_BTN_STATE_REL, "F:/bmp_leveling1.bin");
198
-  lv_imgbtn_set_src(buttonPoint1, LV_BTN_STATE_PR, "F:/bmp_leveling1.bin");
199
-  lv_imgbtn_set_style(buttonPoint1, LV_BTN_STATE_PR, &tft_style_label_pre);
200
-  lv_imgbtn_set_style(buttonPoint1, LV_BTN_STATE_REL, &tft_style_label_rel);
186
+  buttonPoint1 = lv_imgbtn_create(scr, "F:/bmp_leveling1.bin", INTERVAL_V, titleHeight, event_handler, ID_M_POINT1);
201 187
   lv_obj_clear_protect(buttonPoint1, LV_PROTECT_FOLLOW);
202
-
203
-  #if 1
204
-    lv_obj_set_event_cb_mks(buttonPoint2, event_handler, ID_M_POINT2, NULL, 0);
205
-    lv_imgbtn_set_src(buttonPoint2, LV_BTN_STATE_REL, "F:/bmp_leveling2.bin");
206
-    lv_imgbtn_set_src(buttonPoint2, LV_BTN_STATE_PR, "F:/bmp_leveling2.bin");
207
-    lv_imgbtn_set_style(buttonPoint2, LV_BTN_STATE_PR, &tft_style_label_pre);
208
-    lv_imgbtn_set_style(buttonPoint2, LV_BTN_STATE_REL, &tft_style_label_rel);
209
-
210
-    lv_obj_set_event_cb_mks(buttonPoint3, event_handler, ID_M_POINT3, NULL, 0);
211
-    lv_imgbtn_set_src(buttonPoint3, LV_BTN_STATE_REL, "F:/bmp_leveling3.bin");
212
-    lv_imgbtn_set_src(buttonPoint3, LV_BTN_STATE_PR, "F:/bmp_leveling3.bin");
213
-    lv_imgbtn_set_style(buttonPoint3, LV_BTN_STATE_PR, &tft_style_label_pre);
214
-    lv_imgbtn_set_style(buttonPoint3, LV_BTN_STATE_REL, &tft_style_label_rel);
215
-
216
-    lv_obj_set_event_cb_mks(buttonPoint4, event_handler, ID_M_POINT4, NULL, 0);
217
-    lv_imgbtn_set_src(buttonPoint4, LV_BTN_STATE_REL, "F:/bmp_leveling4.bin");
218
-    lv_imgbtn_set_src(buttonPoint4, LV_BTN_STATE_PR, "F:/bmp_leveling4.bin");
219
-    lv_imgbtn_set_style(buttonPoint4, LV_BTN_STATE_PR, &tft_style_label_pre);
220
-    lv_imgbtn_set_style(buttonPoint4, LV_BTN_STATE_REL, &tft_style_label_rel);
221
-
222
-    lv_obj_set_event_cb_mks(buttonPoint5, event_handler, ID_M_POINT5, NULL, 0);
223
-    lv_imgbtn_set_src(buttonPoint5, LV_BTN_STATE_REL, "F:/bmp_leveling5.bin");
224
-    lv_imgbtn_set_src(buttonPoint5, LV_BTN_STATE_PR, "F:/bmp_leveling5.bin");
225
-    lv_imgbtn_set_style(buttonPoint5, LV_BTN_STATE_PR, &tft_style_label_pre);
226
-    lv_imgbtn_set_style(buttonPoint5, LV_BTN_STATE_REL, &tft_style_label_rel);
227
-
228
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_MANUAL_RETURN, NULL, 0);
229
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
230
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
231
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
232
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
233
-  #endif
234
-
235
-  lv_obj_set_pos(buttonPoint1, INTERVAL_V, titleHeight);
236
-  lv_obj_set_pos(buttonPoint2, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
237
-  lv_obj_set_pos(buttonPoint3, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
238
-  lv_obj_set_pos(buttonPoint4, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
239
-  lv_obj_set_pos(buttonPoint5, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
240
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
188
+  buttonPoint2 = lv_imgbtn_create(scr, "F:/bmp_leveling2.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_M_POINT2);
189
+  buttonPoint3 = lv_imgbtn_create(scr, "F:/bmp_leveling3.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_M_POINT3);
190
+  buttonPoint4 = lv_imgbtn_create(scr, "F:/bmp_leveling4.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_POINT4);
191
+  buttonPoint5 = lv_imgbtn_create(scr, "F:/bmp_leveling5.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_POINT5);
192
+  buttonBack   = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_MANUAL_RETURN);
241 193
 
242 194
   // Create labels on the image buttons
243
-  lv_btn_set_layout(buttonPoint1, LV_LAYOUT_OFF);
244
-  lv_btn_set_layout(buttonPoint2, LV_LAYOUT_OFF);
245
-  lv_btn_set_layout(buttonPoint3, LV_LAYOUT_OFF);
246
-  lv_btn_set_layout(buttonPoint4, LV_LAYOUT_OFF);
247
-  lv_btn_set_layout(buttonPoint5, LV_LAYOUT_OFF);
248
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
249
-
250
-  lv_obj_t *label_Point1 = lv_label_create(buttonPoint1, NULL);
251
-  lv_obj_t *label_Point2 = lv_label_create(buttonPoint2, NULL);
252
-  lv_obj_t *label_Point3 = lv_label_create(buttonPoint3, NULL);
253
-  lv_obj_t *label_Point4 = lv_label_create(buttonPoint4, NULL);
254
-  lv_obj_t *label_Point5 = lv_label_create(buttonPoint5, NULL);
255
-  lv_obj_t *label_Back   = lv_label_create(buttonBack, NULL);
195
+  lv_obj_t *label_Point1 = lv_label_create_empty(buttonPoint1);
196
+  lv_obj_t *label_Point2 = lv_label_create_empty(buttonPoint2);
197
+  lv_obj_t *label_Point3 = lv_label_create_empty(buttonPoint3);
198
+  lv_obj_t *label_Point4 = lv_label_create_empty(buttonPoint4);
199
+  lv_obj_t *label_Point5 = lv_label_create_empty(buttonPoint5);
200
+  lv_obj_t *label_Back   = lv_label_create_empty(buttonBack);
256 201
 
257 202
   if (gCfgItems.multiple_language) {
258 203
     lv_label_set_text(label_Point1, leveling_menu.position1);

+ 46
- 117
Marlin/src/lcd/extui/lib/mks_ui/draw_manual_level_pos_settings.cpp Vedi File

@@ -183,15 +183,15 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
183 183
 
184 184
 void lv_draw_manual_level_pos_settings(void) {
185 185
   lv_obj_t *buttonBack = NULL, *label_Back = NULL, *buttonTurnPage = NULL, *labelTurnPage = NULL;
186
-  lv_obj_t *labelPoint1Text = NULL, *buttonX1Value = NULL, *labelX1Value = NULL;
186
+  lv_obj_t *buttonX1Value = NULL, *labelX1Value = NULL;
187 187
   lv_obj_t *buttonY1Value = NULL, *labelY1Value = NULL;
188
-  lv_obj_t *labelPoint2Text = NULL, *buttonX2Value = NULL, *labelX2Value = NULL;
188
+  lv_obj_t *buttonX2Value = NULL, *labelX2Value = NULL;
189 189
   lv_obj_t *buttonY2Value = NULL, *labelY2Value = NULL;
190
-  lv_obj_t *labelPoint3Text = NULL, *buttonX3Value = NULL, *labelX3Value = NULL;
190
+  lv_obj_t *buttonX3Value = NULL, *labelX3Value = NULL;
191 191
   lv_obj_t *buttonY3Value = NULL, *labelY3Value = NULL;
192
-  lv_obj_t *labelPoint4Text = NULL, *buttonX4Value = NULL, *labelX4Value = NULL;
192
+  lv_obj_t *buttonX4Value = NULL, *labelX4Value = NULL;
193 193
   lv_obj_t *buttonY4Value = NULL, *labelY4Value = NULL;
194
-  lv_obj_t *labelPoint5Text = NULL, *buttonX5Value = NULL, *labelX5Value = NULL;
194
+  lv_obj_t *buttonX5Value = NULL, *labelX5Value = NULL;
195 195
   lv_obj_t *buttonY5Value = NULL, *labelY5Value = NULL;
196 196
   lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
197 197
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != MANUAL_LEVELING_POSIGION_UI) {
@@ -206,114 +206,58 @@ void lv_draw_manual_level_pos_settings(void) {
206 206
   lv_scr_load(scr);
207 207
   lv_obj_clean(scr);
208 208
 
209
-  lv_obj_t * title = lv_label_create(scr, NULL);
210
-  lv_obj_set_style(title, &tft_style_label_rel);
211
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
212
-  lv_label_set_text(title, machine_menu.LevelingParaConfTitle);
209
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.LevelingParaConfTitle);
213 210
 
214 211
   lv_refr_now(lv_refr_get_disp_refreshing());
215 212
 
216 213
   if (uiCfg.para_ui_page != 1) {
217
-    labelPoint1Text = lv_label_create(scr, NULL);
218
-    lv_obj_set_style(labelPoint1Text, &tft_style_label_rel);
219
-    lv_obj_set_pos(labelPoint1Text, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
220
-    lv_label_set_text(labelPoint1Text, leveling_menu.position1);
221
-
222
-    buttonX1Value = lv_btn_create(scr, NULL);
223
-    lv_obj_set_pos(buttonX1Value, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
224
-    lv_obj_set_size(buttonX1Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
225
-    lv_obj_set_event_cb_mks(buttonX1Value, event_handler, ID_MANUAL_POS_X1, NULL, 0);
226
-    lv_btn_set_style(buttonX1Value, LV_BTN_STYLE_REL, &style_para_value);
227
-    lv_btn_set_style(buttonX1Value, LV_BTN_STYLE_PR, &style_para_value);
228
-    labelX1Value = lv_label_create(buttonX1Value, NULL);
229
-
230
-    buttonY1Value = lv_btn_create(scr, NULL);
231
-    lv_obj_set_pos(buttonY1Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
232
-    lv_obj_set_size(buttonY1Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
233
-    lv_obj_set_event_cb_mks(buttonY1Value, event_handler, ID_MANUAL_POS_Y1, NULL, 0);
234
-    lv_btn_set_style(buttonY1Value, LV_BTN_STYLE_REL, &style_para_value);
235
-    lv_btn_set_style(buttonY1Value, LV_BTN_STYLE_PR, &style_para_value);
236
-    labelY1Value = lv_label_create(buttonY1Value, NULL);
214
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, leveling_menu.position1);
215
+
216
+    buttonX1Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_X1);
217
+    labelX1Value = lv_label_create_empty(buttonX1Value);
218
+
219
+    buttonY1Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_Y1);
220
+    labelY1Value = lv_label_create_empty(buttonY1Value);
237 221
 
238 222
     line1 = lv_line_create(scr, NULL);
239 223
     lv_ex_line(line1, line_points[0]);
240 224
 
241
-    labelPoint2Text = lv_label_create(scr, NULL);
242
-    lv_obj_set_style(labelPoint2Text, &tft_style_label_rel);
243
-    lv_obj_set_pos(labelPoint2Text, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
244
-    lv_label_set_text(labelPoint2Text, leveling_menu.position2);
245
-
246
-    buttonX2Value = lv_btn_create(scr, NULL);
247
-    lv_obj_set_pos(buttonX2Value, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2);
248
-    lv_obj_set_size(buttonX2Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
249
-    lv_obj_set_event_cb_mks(buttonX2Value, event_handler, ID_MANUAL_POS_X2, NULL, 0);
250
-    lv_btn_set_style(buttonX2Value, LV_BTN_STYLE_REL, &style_para_value);
251
-    lv_btn_set_style(buttonX2Value, LV_BTN_STYLE_PR, &style_para_value);
252
-    labelX2Value = lv_label_create(buttonX2Value, NULL);
253
-
254
-    buttonY2Value = lv_btn_create(scr, NULL);
255
-    lv_obj_set_pos(buttonY2Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2);
256
-    lv_obj_set_size(buttonY2Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
257
-    lv_obj_set_event_cb_mks(buttonY2Value, event_handler, ID_MANUAL_POS_Y2, NULL, 0);
258
-    lv_btn_set_style(buttonY2Value, LV_BTN_STYLE_REL, &style_para_value);
259
-    lv_btn_set_style(buttonY2Value, LV_BTN_STYLE_PR, &style_para_value);
260
-    labelY2Value = lv_label_create(buttonY2Value, NULL);
225
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, leveling_menu.position2);
226
+
227
+    buttonX2Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_X2);
228
+    labelX2Value = lv_label_create_empty(buttonX2Value);
229
+
230
+    buttonY2Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_Y2);
231
+    labelY2Value = lv_label_create_empty(buttonY2Value);
261 232
 
262 233
     line2 = lv_line_create(scr, NULL);
263 234
     lv_ex_line(line2, line_points[1]);
264 235
 
265
-    labelPoint3Text = lv_label_create(scr, NULL);
266
-    lv_obj_set_style(labelPoint3Text, &tft_style_label_rel);
267
-    lv_obj_set_pos(labelPoint3Text, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
268
-    lv_label_set_text(labelPoint3Text, leveling_menu.position3);
269
-
270
-    buttonX3Value = lv_btn_create(scr, NULL);
271
-    lv_obj_set_pos(buttonX3Value, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2);
272
-    lv_obj_set_size(buttonX3Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
273
-    lv_obj_set_event_cb_mks(buttonX3Value, event_handler, ID_MANUAL_POS_X3, NULL, 0);
274
-    lv_btn_set_style(buttonX3Value, LV_BTN_STYLE_REL, &style_para_value);
275
-    lv_btn_set_style(buttonX3Value, LV_BTN_STYLE_PR, &style_para_value);
276
-    labelX3Value = lv_label_create(buttonX3Value, NULL);
277
-
278
-    buttonY3Value = lv_btn_create(scr, NULL);
279
-    lv_obj_set_pos(buttonY3Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2);
280
-    lv_obj_set_size(buttonY3Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
281
-    lv_obj_set_event_cb_mks(buttonY3Value, event_handler, ID_MANUAL_POS_Y3, NULL, 0);
282
-    lv_btn_set_style(buttonY3Value, LV_BTN_STYLE_REL, &style_para_value);
283
-    lv_btn_set_style(buttonY3Value, LV_BTN_STYLE_PR, &style_para_value);
284
-    labelY3Value = lv_label_create(buttonY3Value, NULL);
236
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, leveling_menu.position3);
237
+
238
+    buttonX3Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_X3);
239
+    labelX3Value = lv_label_create_empty(buttonX3Value);
240
+
241
+    buttonY3Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_Y3);
242
+    labelY3Value = lv_label_create_empty(buttonY3Value);
285 243
 
286 244
     line3 = lv_line_create(scr, NULL);
287 245
     lv_ex_line(line3, line_points[2]);
288 246
 
289
-    labelPoint4Text = lv_label_create(scr, NULL);
290
-    lv_obj_set_style(labelPoint4Text, &tft_style_label_rel);
291
-    lv_obj_set_pos(labelPoint4Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
292
-    lv_label_set_text(labelPoint4Text, leveling_menu.position4);
293
-
294
-    buttonX4Value = lv_btn_create(scr, NULL);
295
-    lv_obj_set_pos(buttonX4Value, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2);
296
-    lv_obj_set_size(buttonX4Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
297
-    lv_obj_set_event_cb_mks(buttonX4Value, event_handler, ID_MANUAL_POS_X4, NULL, 0);
298
-    lv_btn_set_style(buttonX4Value, LV_BTN_STYLE_REL, &style_para_value);
299
-    lv_btn_set_style(buttonX4Value, LV_BTN_STYLE_PR, &style_para_value);
300
-    labelX4Value = lv_label_create(buttonX4Value, NULL);
301
-
302
-    buttonY4Value = lv_btn_create(scr, NULL);
303
-    lv_obj_set_pos(buttonY4Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2);
304
-    lv_obj_set_size(buttonY4Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
305
-    lv_obj_set_event_cb_mks(buttonY4Value, event_handler, ID_MANUAL_POS_Y4, NULL, 0);
306
-    lv_btn_set_style(buttonY4Value, LV_BTN_STYLE_REL, &style_para_value);
307
-    lv_btn_set_style(buttonY4Value, LV_BTN_STYLE_PR, &style_para_value);
308
-    labelY4Value = lv_label_create(buttonY4Value, NULL);
247
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, leveling_menu.position4);
248
+
249
+    buttonX4Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_X4);
250
+    labelX4Value = lv_label_create_empty(buttonX4Value);
251
+
252
+    buttonY4Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_Y4);
253
+    labelY4Value = lv_label_create_empty(buttonY4Value);
309 254
 
310 255
     line4 = lv_line_create(scr, NULL);
311 256
     lv_ex_line(line4, line_points[3]);
312 257
 
313 258
     buttonTurnPage = lv_btn_create(scr, NULL);
314 259
     lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_MANUAL_POS_DOWN, NULL, 0);
315
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
316
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
260
+    lv_btn_set_style_both(buttonTurnPage, &style_para_back);
317 261
 
318 262
     #if HAS_ROTARY_ENCODER
319 263
       if (gCfgItems.encoder_enable) {
@@ -330,34 +274,20 @@ void lv_draw_manual_level_pos_settings(void) {
330 274
     #endif
331 275
   }
332 276
   else {
333
-    labelPoint5Text = lv_label_create(scr, NULL);
334
-    lv_obj_set_style(labelPoint5Text, &tft_style_label_rel);
335
-    lv_obj_set_pos(labelPoint5Text, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
336
-    lv_label_set_text(labelPoint5Text, leveling_menu.position5);
337
-
338
-    buttonX5Value = lv_btn_create(scr, NULL);
339
-    lv_obj_set_pos(buttonX5Value, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
340
-    lv_obj_set_size(buttonX5Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
341
-    lv_obj_set_event_cb_mks(buttonX5Value, event_handler, ID_MANUAL_POS_X5, NULL, 0);
342
-    lv_btn_set_style(buttonX5Value, LV_BTN_STYLE_REL, &style_para_value);
343
-    lv_btn_set_style(buttonX5Value, LV_BTN_STYLE_PR, &style_para_value);
344
-    labelX5Value = lv_label_create(buttonX5Value, NULL);
345
-
346
-    buttonY5Value = lv_btn_create(scr, NULL);
347
-    lv_obj_set_pos(buttonY5Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2);
348
-    lv_obj_set_size(buttonY5Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
349
-    lv_obj_set_event_cb_mks(buttonY5Value, event_handler, ID_MANUAL_POS_Y5, NULL, 0);
350
-    lv_btn_set_style(buttonY5Value, LV_BTN_STYLE_REL, &style_para_value);
351
-    lv_btn_set_style(buttonY5Value, LV_BTN_STYLE_PR, &style_para_value);
352
-    labelY5Value = lv_label_create(buttonY5Value, NULL);
277
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, leveling_menu.position5);
278
+
279
+    buttonX5Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X_2, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_X5);
280
+    labelX5Value = lv_label_create_empty(buttonX5Value);
281
+
282
+    buttonY5Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V_2, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_MANUAL_POS_Y5);
283
+    labelY5Value = lv_label_create_empty(buttonY5Value);
353 284
 
354 285
     line1 = lv_line_create(scr, NULL);
355 286
     lv_ex_line(line1, line_points[0]);
356 287
 
357 288
     buttonTurnPage = lv_btn_create(scr, NULL);
358 289
     lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_MANUAL_POS_UP, NULL, 0);
359
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
360
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
290
+    lv_btn_set_style_both(buttonTurnPage, &style_para_back);
361 291
 
362 292
     #if HAS_ROTARY_ENCODER
363 293
       if (gCfgItems.encoder_enable) {
@@ -370,15 +300,14 @@ void lv_draw_manual_level_pos_settings(void) {
370 300
 
371 301
   lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
372 302
   lv_obj_set_size(buttonTurnPage, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
373
-  labelTurnPage = lv_label_create(buttonTurnPage, NULL);
303
+  labelTurnPage = lv_label_create_empty(buttonTurnPage);
374 304
 
375 305
   buttonBack = lv_btn_create(scr, NULL);
376 306
   lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_MANUAL_POS_RETURN, NULL, 0);
377
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
378
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
307
+  lv_btn_set_style_both(buttonBack, &style_para_back);
379 308
   lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
380 309
   lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
381
-  label_Back = lv_label_create(buttonBack, NULL);
310
+  label_Back = lv_label_create_empty(buttonBack);
382 311
 
383 312
   #if HAS_ROTARY_ENCODER
384 313
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);

+ 32
- 78
Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp Vedi File

@@ -128,12 +128,12 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
128 128
 
129 129
 void lv_draw_max_feedrate_settings(void) {
130 130
   lv_obj_t *buttonBack = NULL, *label_Back = NULL, *buttonTurnPage = NULL, *labelTurnPage = NULL;
131
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
132
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
133
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
134
-  lv_obj_t *labelE0Text = NULL, *buttonE0Value = NULL, *labelE0Value = NULL;
135
-  lv_obj_t *labelE1Text = NULL, *buttonE1Value = NULL, *labelE1Value = NULL;
136
-  lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
131
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
132
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
133
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
134
+  lv_obj_t *buttonE0Value = NULL, *labelE0Value = NULL;
135
+  lv_obj_t *buttonE1Value = NULL, *labelE1Value = NULL;
136
+  lv_obj_t *line1 = NULL, *line2 = NULL, *line3 = NULL, *line4 = NULL;
137 137
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != MAXFEEDRATE_UI) {
138 138
     disp_state_stack._disp_index++;
139 139
     disp_state_stack._disp_state[disp_state_stack._disp_index] = MAXFEEDRATE_UI;
@@ -146,86 +146,50 @@ void lv_draw_max_feedrate_settings(void) {
146 146
   lv_scr_load(scr);
147 147
   lv_obj_clean(scr);
148 148
 
149
-  lv_obj_t * title = lv_label_create(scr, NULL);
150
-  lv_obj_set_style(title, &tft_style_label_rel);
151
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
152
-  lv_label_set_text(title, machine_menu.MaxFeedRateConfTitle);
149
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.MaxFeedRateConfTitle);
153 150
 
154 151
   lv_refr_now(lv_refr_get_disp_refreshing());
155 152
 
156 153
   if (uiCfg.para_ui_page != 1) {
157
-    labelXText = lv_label_create(scr, NULL);
158
-    lv_obj_set_style(labelXText, &tft_style_label_rel);
159
-    lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
160
-    lv_label_set_text(labelXText, machine_menu.XMaxFeedRate);
161
-
162
-    buttonXValue = lv_btn_create(scr, NULL);
163
-    lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
164
-    lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
165
-    lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_FEED_X, NULL, 0);
166
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
167
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
154
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.XMaxFeedRate);
155
+
156
+    buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FEED_X);
168 157
     lv_btn_set_layout(buttonXValue, LV_LAYOUT_OFF);
169
-    labelXValue = lv_label_create(buttonXValue, NULL);
158
+    labelXValue = lv_label_create_empty(buttonXValue);
170 159
 
171 160
     line1 = lv_line_create(scr, NULL);
172 161
     lv_ex_line(line1, line_points[0]);
173 162
 
174
-    labelYText = lv_label_create(scr, NULL);
175
-    lv_obj_set_style(labelYText, &tft_style_label_rel);
176
-    lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
177
-    lv_label_set_text(labelYText, machine_menu.YMaxFeedRate);
178
-
179
-    buttonYValue = lv_btn_create(scr, NULL);
180
-    lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
181
-    lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
182
-    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_FEED_Y, NULL, 0);
183
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
184
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
163
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.YMaxFeedRate);
164
+
165
+    buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FEED_Y);
185 166
     lv_btn_set_layout(buttonYValue, LV_LAYOUT_OFF);
186
-    labelYValue = lv_label_create(buttonYValue, NULL);
167
+    labelYValue = lv_label_create_empty(buttonYValue);
187 168
 
188 169
     line2 = lv_line_create(scr, NULL);
189 170
     lv_ex_line(line2, line_points[1]);
190 171
 
191
-    labelZText = lv_label_create(scr, NULL);
192
-    lv_obj_set_style(labelZText, &tft_style_label_rel);
193
-    lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
194
-    lv_label_set_text(labelZText, machine_menu.ZMaxFeedRate);
195
-
196
-    buttonZValue = lv_btn_create(scr, NULL);
197
-    lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
198
-    lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
199
-    lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_FEED_Z, NULL, 0);
200
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
201
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
172
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.ZMaxFeedRate);
173
+
174
+    buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FEED_Z);
202 175
     lv_btn_set_layout(buttonZValue, LV_LAYOUT_OFF);
203
-    labelZValue = lv_label_create(buttonZValue, NULL);
176
+    labelZValue = lv_label_create_empty(buttonZValue);
204 177
 
205 178
     line3 = lv_line_create(scr, NULL);
206 179
     lv_ex_line(line3, line_points[2]);
207 180
 
208
-    labelE0Text = lv_label_create(scr, NULL);
209
-    lv_obj_set_style(labelE0Text, &tft_style_label_rel);
210
-    lv_obj_set_pos(labelE0Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
211
-    lv_label_set_text(labelE0Text, machine_menu.E0MaxFeedRate);
212
-
213
-    buttonE0Value = lv_btn_create(scr, NULL);
214
-    lv_obj_set_pos(buttonE0Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V);
215
-    lv_obj_set_size(buttonE0Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
216
-    lv_obj_set_event_cb_mks(buttonE0Value, event_handler, ID_FEED_E0, NULL, 0);
217
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_REL, &style_para_value);
218
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_PR, &style_para_value);
181
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.E0MaxFeedRate);
182
+
183
+    buttonE0Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FEED_E0);
219 184
     lv_btn_set_layout(buttonE0Value, LV_LAYOUT_OFF);
220
-    labelE0Value = lv_label_create(buttonE0Value, NULL);
185
+    labelE0Value = lv_label_create_empty(buttonE0Value);
221 186
 
222 187
     line4 = lv_line_create(scr, NULL);
223 188
     lv_ex_line(line4, line_points[3]);
224 189
 
225 190
     buttonTurnPage = lv_btn_create(scr, NULL);
226 191
     lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_FEED_DOWN, NULL, 0);
227
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
228
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
192
+    lv_btn_set_style_both(buttonTurnPage, &style_para_back);
229 193
 
230 194
     #if HAS_ROTARY_ENCODER
231 195
       if (gCfgItems.encoder_enable) {
@@ -238,19 +202,11 @@ void lv_draw_max_feedrate_settings(void) {
238 202
     #endif
239 203
   }
240 204
   else {
241
-    labelE1Text = lv_label_create(scr, NULL);
242
-    lv_obj_set_style(labelE1Text, &tft_style_label_rel);
243
-    lv_obj_set_pos(labelE1Text, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
244
-    lv_label_set_text(labelE1Text, machine_menu.E1MaxFeedRate);
245
-
246
-    buttonE1Value = lv_btn_create(scr, NULL);
247
-    lv_obj_set_pos(buttonE1Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
248
-    lv_obj_set_size(buttonE1Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
249
-    lv_obj_set_event_cb_mks(buttonE1Value, event_handler, ID_FEED_E1, NULL, 0);
250
-    lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_REL, &style_para_value);
251
-    lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_PR, &style_para_value);
205
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.E1MaxFeedRate);
206
+
207
+    buttonE1Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_FEED_E1);
252 208
     lv_btn_set_layout(buttonE1Value, LV_LAYOUT_OFF);
253
-    labelE1Value = lv_label_create(buttonE1Value, NULL);
209
+    labelE1Value = lv_label_create_empty(buttonE1Value);
254 210
 
255 211
 
256 212
     line1 = lv_line_create(scr, NULL);
@@ -258,8 +214,7 @@ void lv_draw_max_feedrate_settings(void) {
258 214
 
259 215
     buttonTurnPage = lv_btn_create(scr, NULL);
260 216
     lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_FEED_UP, NULL, 0);
261
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
262
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
217
+    lv_btn_set_style_both(buttonTurnPage, &style_para_back);
263 218
 
264 219
     #if HAS_ROTARY_ENCODER
265 220
       if (gCfgItems.encoder_enable) {
@@ -271,15 +226,14 @@ void lv_draw_max_feedrate_settings(void) {
271 226
 
272 227
   lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
273 228
   lv_obj_set_size(buttonTurnPage, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
274
-  labelTurnPage = lv_label_create(buttonTurnPage, NULL);
229
+  labelTurnPage = lv_label_create_empty(buttonTurnPage);
275 230
 
276 231
   buttonBack = lv_btn_create(scr, NULL);
277 232
   lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_FEED_RETURN, NULL, 0);
278 233
   lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
279 234
   lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
280
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
281
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
282
-  label_Back = lv_label_create(buttonBack, NULL);
235
+  lv_btn_set_style_both(buttonBack, &style_para_back);
236
+  label_Back = lv_label_create_empty(buttonBack);
283 237
   #if HAS_ROTARY_ENCODER
284 238
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
285 239
   #endif

+ 16
- 67
Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp Vedi File

@@ -169,10 +169,7 @@ void lv_draw_motor_settings(void) {
169 169
   lv_scr_load(scr);
170 170
   lv_obj_clean(scr);
171 171
 
172
-  lv_obj_t * title = lv_label_create(scr, NULL);
173
-  lv_obj_set_style(title, &tft_style_label_rel);
174
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
175
-  lv_label_set_text(title, machine_menu.MotorConfTitle);
172
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.MotorConfTitle);
176 173
 
177 174
   lv_refr_now(lv_refr_get_disp_refreshing());
178 175
 
@@ -181,50 +178,29 @@ void lv_draw_motor_settings(void) {
181 178
   lv_obj_set_size(buttonSteps, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           /*Set its size*/
182 179
   //lv_obj_set_event_cb(buttonMachine, event_handler);
183 180
   lv_obj_set_event_cb_mks(buttonSteps, event_handler, ID_MOTOR_STEPS, NULL, 0);
184
-  lv_btn_set_style(buttonSteps, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
185
-  lv_btn_set_style(buttonSteps, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
181
+  lv_btn_use_label_style(buttonSteps);
186 182
   lv_btn_set_layout(buttonSteps, LV_LAYOUT_OFF);
187
-  labelSteps = lv_label_create(buttonSteps, NULL);                        /*Add a label to the button*/
183
+  labelSteps = lv_label_create_empty(buttonSteps);                        /*Add a label to the button*/
188 184
 
189 185
   #if HAS_ROTARY_ENCODER
190 186
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonSteps);
191 187
   #endif
192 188
 
193
-  buttonStepsNarrow = lv_imgbtn_create(scr, NULL);
194
-  lv_obj_set_pos(buttonStepsNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V);
195
-  lv_obj_set_event_cb_mks(buttonStepsNarrow, event_handler, ID_MOTOR_STEPS_ARROW, NULL, 0);
196
-  lv_imgbtn_set_src(buttonStepsNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
197
-  lv_imgbtn_set_src(buttonStepsNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
198
-  lv_imgbtn_set_style(buttonStepsNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
199
-  lv_imgbtn_set_style(buttonStepsNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
200
-  lv_btn_set_layout(buttonStepsNarrow, LV_LAYOUT_OFF);
189
+  buttonStepsNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y + PARA_UI_ARROW_V, event_handler, ID_MOTOR_STEPS_ARROW);
201 190
 
202 191
   line1 = lv_line_create(scr, NULL);
203 192
   lv_ex_line(line1, line_points[0]);
204 193
 
205 194
   #if USE_SENSORLESS
206
-    buttonSensitivity = lv_btn_create(scr, NULL);                                 /*Add a button the current screen*/
207
-    lv_obj_set_pos(buttonSensitivity, PARA_UI_POS_X, PARA_UI_POS_Y * 2);          /*Set its position*/
208
-    lv_obj_set_size(buttonSensitivity, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);           /*Set its size*/
195
+    buttonSensitivity = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2, PARA_UI_SIZE_X, PARA_UI_SIZE_Y, event_handler, ID_HOME_SENSE);
209 196
     //lv_obj_set_event_cb(buttonMachine, event_handler);
210
-    lv_obj_set_event_cb_mks(buttonSensitivity, event_handler, ID_HOME_SENSE, NULL, 0);
211
-    lv_btn_set_style(buttonSensitivity, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
212
-    lv_btn_set_style(buttonSensitivity, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
213
-    lv_btn_set_layout(buttonSensitivity, LV_LAYOUT_OFF);
214
-    labelSensitivity = lv_label_create(buttonSensitivity, NULL);                  /*Add a label to the button*/
197
+    labelSensitivity = lv_label_create_empty(buttonSensitivity);                  /*Add a label to the button*/
215 198
 
216 199
     #if HAS_ROTARY_ENCODER
217 200
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonSensitivity);
218 201
     #endif
219 202
 
220
-    buttonSensitivityNarrow = lv_imgbtn_create(scr, NULL);
221
-    lv_obj_set_pos(buttonSensitivityNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V);
222
-    lv_obj_set_event_cb_mks(buttonSensitivityNarrow, event_handler, ID_HOME_SENSE_ARROW, NULL, 0);
223
-    lv_imgbtn_set_src(buttonSensitivityNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
224
-    lv_imgbtn_set_src(buttonSensitivityNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
225
-    lv_imgbtn_set_style(buttonSensitivityNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
226
-    lv_imgbtn_set_style(buttonSensitivityNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
227
-    lv_btn_set_layout(buttonSensitivityNarrow, LV_LAYOUT_OFF);
203
+    buttonSensitivityNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, PARA_UI_POS_Y * 2 + PARA_UI_ARROW_V, event_handler, ID_HOME_SENSE_ARROW);
228 204
 
229 205
     line2 = lv_line_create(scr, NULL);
230 206
     lv_ex_line(line2, line_points[1]);
@@ -237,22 +213,15 @@ void lv_draw_motor_settings(void) {
237 213
     lv_obj_set_size(buttonTMCcurrent, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);          /*Set its size*/
238 214
     //lv_obj_set_event_cb(buttonMachine, event_handler);
239 215
     lv_obj_set_event_cb_mks(buttonTMCcurrent, event_handler, ID_MOTOR_TMC_CURRENT, NULL, 0);
240
-    lv_btn_set_style(buttonTMCcurrent, LV_BTN_STYLE_REL, &tft_style_label_rel); /*Set the button's released style*/
241
-    lv_btn_set_style(buttonTMCcurrent, LV_BTN_STYLE_PR, &tft_style_label_pre);  /*Set the button's pressed style*/
216
+    lv_btn_use_label_style(buttonTMCcurrent);
242 217
     lv_btn_set_layout(buttonTMCcurrent, LV_LAYOUT_OFF);
243
-    labelTMCcurrent = lv_label_create(buttonTMCcurrent, NULL);                  /*Add a label to the button*/
218
+    labelTMCcurrent = lv_label_create_empty(buttonTMCcurrent);                  /*Add a label to the button*/
244 219
     #if HAS_ROTARY_ENCODER
245 220
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonTMCcurrent);
246 221
     #endif
247 222
 
248
-    buttonTMCcurrentNarrow = lv_imgbtn_create(scr, NULL);
249
-    lv_obj_set_pos(buttonTMCcurrentNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, TERN(USE_SENSORLESS, PARA_UI_POS_Y * 3, PARA_UI_POS_Y * 2) + PARA_UI_ARROW_V);
250
-    lv_obj_set_event_cb_mks(buttonTMCcurrentNarrow, event_handler, ID_MOTOR_TMC_CURRENT_ARROW, NULL, 0);
251
-    lv_imgbtn_set_src(buttonTMCcurrentNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
252
-    lv_imgbtn_set_src(buttonTMCcurrentNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
253
-    lv_imgbtn_set_style(buttonTMCcurrentNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
254
-    lv_imgbtn_set_style(buttonTMCcurrentNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
255
-    lv_btn_set_layout(buttonTMCcurrentNarrow, LV_LAYOUT_OFF);
223
+    buttonTMCcurrentNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, TERN(USE_SENSORLESS, PARA_UI_POS_Y * 3, PARA_UI_POS_Y * 2) + PARA_UI_ARROW_V, event_handler, ID_MOTOR_TMC_CURRENT_ARROW);
224
+
256 225
     #if USE_SENSORLESS
257 226
       line3 = lv_line_create(scr, NULL);
258 227
       lv_ex_line(line3, line_points[2]);
@@ -262,27 +231,14 @@ void lv_draw_motor_settings(void) {
262 231
     #endif
263 232
 
264 233
     #if HAS_STEALTHCHOP
265
-      buttonStepMode = lv_btn_create(scr, NULL);                                /*Add a button the current screen*/
266
-      lv_obj_set_pos(buttonStepMode, PARA_UI_POS_X, TERN(USE_SENSORLESS, PARA_UI_POS_Y * 4, PARA_UI_POS_Y * 3));
267
-      lv_obj_set_size(buttonStepMode, PARA_UI_SIZE_X, PARA_UI_SIZE_Y);          /*Set its size*/
268
-      lv_obj_set_event_cb_mks(buttonStepMode, event_handler, ID_MOTOR_STEP_MODE, NULL, 0);
269
-      lv_btn_set_style(buttonStepMode, LV_BTN_STYLE_REL, &tft_style_label_rel); /*Set the button's released style*/
270
-      lv_btn_set_style(buttonStepMode, LV_BTN_STYLE_PR, &tft_style_label_pre);  /*Set the button's pressed style*/
271
-      lv_btn_set_layout(buttonStepMode, LV_LAYOUT_OFF);
272
-      labelStepMode = lv_label_create(buttonStepMode, NULL);                    /*Add a label to the button*/
234
+      buttonStepMode = lv_btn_create(scr, NULL, PARA_UI_POS_X, TERN(USE_SENSORLESS, PARA_UI_POS_Y * 4, PARA_UI_POS_Y * 3), PARA_UI_SIZE_X, PARA_UI_SIZE_Y, event_handler, ID_MOTOR_STEP_MODE);
235
+      labelStepMode = lv_label_create_empty(buttonStepMode);                    /*Add a label to the button*/
273 236
 
274 237
       #if HAS_ROTARY_ENCODER
275 238
         if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonStepMode);
276 239
       #endif
277 240
 
278
-      buttonStepModeNarrow = lv_imgbtn_create(scr, NULL);
279
-      lv_obj_set_pos(buttonStepModeNarrow, PARA_UI_POS_X + PARA_UI_SIZE_X, TERN(USE_SENSORLESS, PARA_UI_POS_Y * 4, PARA_UI_POS_Y * 3) + PARA_UI_ARROW_V);
280
-      lv_obj_set_event_cb_mks(buttonStepModeNarrow, event_handler, ID_MOTOR_STEP_MODE_ARROW, NULL, 0);
281
-      lv_imgbtn_set_src(buttonStepModeNarrow, LV_BTN_STATE_REL, "F:/bmp_arrow.bin");
282
-      lv_imgbtn_set_src(buttonStepModeNarrow, LV_BTN_STATE_PR, "F:/bmp_arrow.bin");
283
-      lv_imgbtn_set_style(buttonStepModeNarrow, LV_BTN_STATE_PR, &tft_style_label_pre);
284
-      lv_imgbtn_set_style(buttonStepModeNarrow, LV_BTN_STATE_REL, &tft_style_label_rel);
285
-      lv_btn_set_layout(buttonStepModeNarrow, LV_LAYOUT_OFF);
241
+      buttonStepModeNarrow = lv_imgbtn_create(scr, "F:/bmp_arrow.bin", PARA_UI_POS_X + PARA_UI_SIZE_X, TERN(USE_SENSORLESS, PARA_UI_POS_Y * 4, PARA_UI_POS_Y * 3) + PARA_UI_ARROW_V, event_handler, ID_MOTOR_STEP_MODE_ARROW);
286 242
 
287 243
       #if USE_SENSORLESS
288 244
         line4 = lv_line_create(scr, NULL);
@@ -296,15 +252,8 @@ void lv_draw_motor_settings(void) {
296 252
 
297 253
   #endif // HAS_TRINAMIC_CONFIG
298 254
 
299
-  buttonBack = lv_imgbtn_create(scr, NULL);
300
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_MOTOR_RETURN, NULL, 0);
301
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
302
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
303
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
304
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
305
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
306
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
307
-  label_Back = lv_label_create(buttonBack, NULL);
255
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_MOTOR_RETURN);
256
+  label_Back = lv_label_create_empty(buttonBack);
308 257
 
309 258
   #if HAS_ROTARY_ENCODER
310 259
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);

+ 26
- 98
Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp Vedi File

@@ -174,100 +174,33 @@ void lv_draw_move_motor(void) {
174 174
   lv_scr_load(scr);
175 175
   lv_obj_clean(scr);
176 176
 
177
-  lv_obj_t * title = lv_label_create(scr, NULL);
178
-  lv_obj_set_style(title, &tft_style_label_rel);
179
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
180
-  lv_label_set_text(title, creat_title_text());
177
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
181 178
 
182 179
   lv_refr_now(lv_refr_get_disp_refreshing());
183 180
 
184 181
   // Create an Image button
185
-  buttonXI   = lv_imgbtn_create(scr, NULL);
186
-  buttonXD   = lv_imgbtn_create(scr, NULL);
187
-  buttonYI   = lv_imgbtn_create(scr, NULL);
188
-  buttonYD   = lv_imgbtn_create(scr, NULL);
189
-  buttonZI   = lv_imgbtn_create(scr, NULL);
190
-  buttonZD   = lv_imgbtn_create(scr, NULL);
191
-  buttonV    = lv_imgbtn_create(scr, NULL);
192
-  buttonBack = lv_imgbtn_create(scr, NULL);
193
-
194
-  lv_obj_set_event_cb_mks(buttonXI, event_handler, ID_M_X_P, NULL, 0);
195
-  lv_imgbtn_set_src(buttonXI, LV_BTN_STATE_REL, "F:/bmp_xAdd.bin");
196
-  lv_imgbtn_set_src(buttonXI, LV_BTN_STATE_PR, "F:/bmp_xAdd.bin");
197
-  lv_imgbtn_set_style(buttonXI, LV_BTN_STATE_PR, &tft_style_label_pre);
198
-  lv_imgbtn_set_style(buttonXI, LV_BTN_STATE_REL, &tft_style_label_rel);
182
+  buttonXI = lv_imgbtn_create(scr, "F:/bmp_xAdd.bin", INTERVAL_V, titleHeight, event_handler, ID_M_X_P);
199 183
   lv_obj_clear_protect(buttonXI, LV_PROTECT_FOLLOW);
184
+  buttonXD = lv_imgbtn_create(scr, "F:/bmp_xDec.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_X_N);
185
+  buttonYI = lv_imgbtn_create(scr, "F:/bmp_yAdd.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_M_Y_P);
186
+  buttonYD = lv_imgbtn_create(scr, "F:/bmp_yDec.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_Y_N);
187
+  buttonZI = lv_imgbtn_create(scr, "F:/bmp_zAdd.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_M_Z_P);
188
+  buttonZD = lv_imgbtn_create(scr, "F:/bmp_zDec.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_Z_N);
200 189
 
201
-  #if 1
202
-    lv_obj_set_event_cb_mks(buttonXD, event_handler, ID_M_X_N, NULL, 0);
203
-    lv_imgbtn_set_src(buttonXD, LV_BTN_STATE_REL, "F:/bmp_xDec.bin");
204
-    lv_imgbtn_set_src(buttonXD, LV_BTN_STATE_PR, "F:/bmp_xDec.bin");
205
-    lv_imgbtn_set_style(buttonXD, LV_BTN_STATE_PR, &tft_style_label_pre);
206
-    lv_imgbtn_set_style(buttonXD, LV_BTN_STATE_REL, &tft_style_label_rel);
207
-
208
-    lv_obj_set_event_cb_mks(buttonYI, event_handler, ID_M_Y_P, NULL, 0);
209
-    lv_imgbtn_set_src(buttonYI, LV_BTN_STATE_REL, "F:/bmp_yAdd.bin");
210
-    lv_imgbtn_set_src(buttonYI, LV_BTN_STATE_PR, "F:/bmp_yAdd.bin");
211
-    lv_imgbtn_set_style(buttonYI, LV_BTN_STATE_PR, &tft_style_label_pre);
212
-    lv_imgbtn_set_style(buttonYI, LV_BTN_STATE_REL, &tft_style_label_rel);
213
-
214
-    lv_obj_set_event_cb_mks(buttonYD, event_handler, ID_M_Y_N, NULL, 0);
215
-    lv_imgbtn_set_src(buttonYD, LV_BTN_STATE_REL, "F:/bmp_yDec.bin");
216
-    lv_imgbtn_set_src(buttonYD, LV_BTN_STATE_PR, "F:/bmp_yDec.bin");
217
-    lv_imgbtn_set_style(buttonYD, LV_BTN_STATE_PR, &tft_style_label_pre);
218
-    lv_imgbtn_set_style(buttonYD, LV_BTN_STATE_REL, &tft_style_label_rel);
219
-
220
-    lv_obj_set_event_cb_mks(buttonZI, event_handler, ID_M_Z_P, NULL, 0);
221
-    lv_imgbtn_set_src(buttonZI, LV_BTN_STATE_REL, "F:/bmp_zAdd.bin");
222
-    lv_imgbtn_set_src(buttonZI, LV_BTN_STATE_PR, "F:/bmp_zAdd.bin");
223
-    lv_imgbtn_set_style(buttonZI, LV_BTN_STATE_PR, &tft_style_label_pre);
224
-    lv_imgbtn_set_style(buttonZI, LV_BTN_STATE_REL, &tft_style_label_rel);
225
-
226
-    lv_obj_set_event_cb_mks(buttonZD, event_handler, ID_M_Z_N, NULL, 0);
227
-    lv_imgbtn_set_src(buttonZD, LV_BTN_STATE_REL, "F:/bmp_zDec.bin");
228
-    lv_imgbtn_set_src(buttonZD, LV_BTN_STATE_PR, "F:/bmp_zDec.bin");
229
-    lv_imgbtn_set_style(buttonZD, LV_BTN_STATE_PR, &tft_style_label_pre);
230
-    lv_imgbtn_set_style(buttonZD, LV_BTN_STATE_REL, &tft_style_label_rel);
231
-
232
-    //lv_obj_set_event_cb_mks(buttonV, event_handler,ID_T_MORE,"bmp_More.bin",0);
233
-    lv_obj_set_event_cb_mks(buttonV, event_handler, ID_M_STEP, NULL, 0);
234
-    lv_imgbtn_set_style(buttonV, LV_BTN_STATE_PR, &tft_style_label_pre);
235
-    lv_imgbtn_set_style(buttonV, LV_BTN_STATE_REL, &tft_style_label_rel);
236
-
237
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_M_RETURN, NULL, 0);
238
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
239
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
240
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
241
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
242
-  #endif // if 1
243
-
244
-  lv_obj_set_pos(buttonXI, INTERVAL_V, titleHeight);
245
-  lv_obj_set_pos(buttonYI, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
246
-  lv_obj_set_pos(buttonZI, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
247
-  lv_obj_set_pos(buttonV, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
248
-  lv_obj_set_pos(buttonXD, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
249
-  lv_obj_set_pos(buttonYD, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
250
-  lv_obj_set_pos(buttonZD, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
251
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
190
+  buttonV = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_STEP);
191
+  //lv_obj_set_event_cb_mks(buttonV, event_handler,ID_T_MORE,"bmp_More.bin",0);
192
+
193
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
252 194
 
253 195
   // Create labels on the image buttons
254
-  lv_btn_set_layout(buttonXI, LV_LAYOUT_OFF);
255
-  lv_btn_set_layout(buttonXD, LV_LAYOUT_OFF);
256
-  lv_btn_set_layout(buttonYI, LV_LAYOUT_OFF);
257
-  lv_btn_set_layout(buttonYD, LV_LAYOUT_OFF);
258
-  lv_btn_set_layout(buttonZI, LV_LAYOUT_OFF);
259
-  lv_btn_set_layout(buttonZD, LV_LAYOUT_OFF);
260
-  lv_btn_set_layout(buttonV, LV_LAYOUT_OFF);
261
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
262
-
263
-  lv_obj_t *labelXI = lv_label_create(buttonXI, NULL);
264
-  lv_obj_t *labelXD = lv_label_create(buttonXD, NULL);
265
-  lv_obj_t *labelYI = lv_label_create(buttonYI, NULL);
266
-  lv_obj_t *labelYD = lv_label_create(buttonYD, NULL);
267
-  lv_obj_t *labelZI = lv_label_create(buttonZI, NULL);
268
-  lv_obj_t *labelZD = lv_label_create(buttonZD, NULL);
269
-  labelV = lv_label_create(buttonV, NULL);
270
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
196
+  lv_obj_t *labelXI = lv_label_create_empty(buttonXI);
197
+  lv_obj_t *labelXD = lv_label_create_empty(buttonXD);
198
+  lv_obj_t *labelYI = lv_label_create_empty(buttonYI);
199
+  lv_obj_t *labelYD = lv_label_create_empty(buttonYD);
200
+  lv_obj_t *labelZI = lv_label_create_empty(buttonZI);
201
+  lv_obj_t *labelZD = lv_label_create_empty(buttonZD);
202
+  labelV = lv_label_create_empty(buttonV);
203
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
271 204
 
272 205
   if (gCfgItems.multiple_language) {
273 206
     lv_label_set_text(labelXI, move_menu.x_add);
@@ -310,18 +243,13 @@ void lv_draw_move_motor(void) {
310 243
 void disp_move_dist() {
311 244
   // char buf[30] = {0};
312 245
 
313
-  if ((int)(10 * uiCfg.move_dist) == 1) {
314
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_REL, "F:/bmp_step_move0_1.bin");
315
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_PR, "F:/bmp_step_move0_1.bin");
316
-  }
317
-  else if ((int)(10 * uiCfg.move_dist) == 10) {
318
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_REL, "F:/bmp_step_move1.bin");
319
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_PR, "F:/bmp_step_move1.bin");
320
-  }
321
-  else if ((int)(10 * uiCfg.move_dist) == 100) {
322
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_REL, "F:/bmp_step_move10.bin");
323
-    lv_imgbtn_set_src(buttonV, LV_BTN_STATE_PR, "F:/bmp_step_move10.bin");
324
-  }
246
+  if ((int)(10 * uiCfg.move_dist) == 1)
247
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_step_move0_1.bin");
248
+  else if ((int)(10 * uiCfg.move_dist) == 10)
249
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_step_move1.bin");
250
+  else if ((int)(10 * uiCfg.move_dist) == 100)
251
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_step_move10.bin");
252
+
325 253
   if (gCfgItems.multiple_language) {
326 254
     if ((int)(10 * uiCfg.move_dist) == 1) {
327 255
       lv_label_set_text(labelV, move_menu.step_01mm);

+ 17
- 20
Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp Vedi File

@@ -765,10 +765,7 @@ void lv_draw_number_key(void) {
765 765
   lv_scr_load(scr);
766 766
   lv_obj_clean(scr);
767 767
 
768
-  //lv_obj_t * title = lv_label_create(scr, NULL);
769
-  //lv_obj_set_style(title, &tft_style_label_rel);
770
-  //lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS);
771
-  //lv_label_set_text(title, creat_title_text());
768
+  //(void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
772 769
 
773 770
   lv_refr_now(lv_refr_get_disp_refreshing());
774 771
 
@@ -779,7 +776,7 @@ void lv_draw_number_key(void) {
779 776
   lv_btn_set_style(buttonValue, LV_BTN_STYLE_REL, &style_num_text);     /*Set the button's released style*/
780 777
   lv_btn_set_style(buttonValue, LV_BTN_STYLE_PR, &style_num_text);      /*Set the button's pressed style*/
781 778
   //lv_btn_set_layout(buttonValue, LV_LAYOUT_OFF);
782
-  labelValue = lv_label_create(buttonValue, NULL);                      /*Add a label to the button*/
779
+  labelValue = lv_label_create_empty(buttonValue);                      /*Add a label to the button*/
783 780
 
784 781
   NumberKey_1 = lv_btn_create(scr, NULL);                               /*Add a button the current screen*/
785 782
   lv_obj_set_pos(NumberKey_1, 92, 90);                                  /*Set its position*/
@@ -788,7 +785,7 @@ void lv_draw_number_key(void) {
788 785
   lv_btn_set_style(NumberKey_1, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
789 786
   lv_btn_set_style(NumberKey_1, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
790 787
   //lv_btn_set_layout(NumberKey_1, LV_LAYOUT_OFF);
791
-  labelKey_1 = lv_label_create(NumberKey_1, NULL);                      /*Add a label to the button*/
788
+  labelKey_1 = lv_label_create_empty(NumberKey_1);                      /*Add a label to the button*/
792 789
   lv_label_set_text(labelKey_1, machine_menu.key_1);
793 790
   lv_obj_align(labelKey_1, NumberKey_1, LV_ALIGN_CENTER, 0, 0);
794 791
 
@@ -799,7 +796,7 @@ void lv_draw_number_key(void) {
799 796
   lv_btn_set_style(NumberKey_2, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
800 797
   lv_btn_set_style(NumberKey_2, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
801 798
   //lv_btn_set_layout(NumberKey_2, LV_LAYOUT_OFF);
802
-  labelKey_2 = lv_label_create(NumberKey_2, NULL);                      /*Add a label to the button*/
799
+  labelKey_2 = lv_label_create_empty(NumberKey_2);                      /*Add a label to the button*/
803 800
   lv_label_set_text(labelKey_2, machine_menu.key_2);
804 801
   lv_obj_align(labelKey_2, NumberKey_2, LV_ALIGN_CENTER, 0, 0);
805 802
 
@@ -810,7 +807,7 @@ void lv_draw_number_key(void) {
810 807
   lv_btn_set_style(NumberKey_3, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
811 808
   lv_btn_set_style(NumberKey_3, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
812 809
   //lv_btn_set_layout(NumberKey_3, LV_LAYOUT_OFF);
813
-  labelKey_3 = lv_label_create(NumberKey_3, NULL);                      /*Add a label to the button*/
810
+  labelKey_3 = lv_label_create_empty(NumberKey_3);                      /*Add a label to the button*/
814 811
   lv_label_set_text(labelKey_3, machine_menu.key_3);
815 812
   lv_obj_align(labelKey_3, NumberKey_3, LV_ALIGN_CENTER, 0, 0);
816 813
 
@@ -821,7 +818,7 @@ void lv_draw_number_key(void) {
821 818
   lv_btn_set_style(NumberKey_4, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
822 819
   lv_btn_set_style(NumberKey_4, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
823 820
   //lv_btn_set_layout(NumberKey_4, LV_LAYOUT_OFF);
824
-  labelKey_4 = lv_label_create(NumberKey_4, NULL);                      /*Add a label to the button*/
821
+  labelKey_4 = lv_label_create_empty(NumberKey_4);                      /*Add a label to the button*/
825 822
   lv_label_set_text(labelKey_4, machine_menu.key_4);
826 823
   lv_obj_align(labelKey_4, NumberKey_4, LV_ALIGN_CENTER, 0, 0);
827 824
 
@@ -832,7 +829,7 @@ void lv_draw_number_key(void) {
832 829
   lv_btn_set_style(NumberKey_5, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
833 830
   lv_btn_set_style(NumberKey_5, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
834 831
   //lv_btn_set_layout(NumberKey_5, LV_LAYOUT_OFF);
835
-  labelKey_5 = lv_label_create(NumberKey_5, NULL);                      /*Add a label to the button*/
832
+  labelKey_5 = lv_label_create_empty(NumberKey_5);                      /*Add a label to the button*/
836 833
   lv_label_set_text(labelKey_5, machine_menu.key_5);
837 834
   lv_obj_align(labelKey_5, NumberKey_5, LV_ALIGN_CENTER, 0, 0);
838 835
 
@@ -843,7 +840,7 @@ void lv_draw_number_key(void) {
843 840
   lv_btn_set_style(NumberKey_6, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
844 841
   lv_btn_set_style(NumberKey_6, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
845 842
   //lv_btn_set_layout(NumberKey_6, LV_LAYOUT_OFF);
846
-  labelKey_6 = lv_label_create(NumberKey_6, NULL);                      /*Add a label to the button*/
843
+  labelKey_6 = lv_label_create_empty(NumberKey_6);                      /*Add a label to the button*/
847 844
   lv_label_set_text(labelKey_6, machine_menu.key_6);
848 845
   lv_obj_align(labelKey_6, NumberKey_6, LV_ALIGN_CENTER, 0, 0);
849 846
 
@@ -854,7 +851,7 @@ void lv_draw_number_key(void) {
854 851
   lv_btn_set_style(NumberKey_7, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
855 852
   lv_btn_set_style(NumberKey_7, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
856 853
   //lv_btn_set_layout(NumberKey_7, LV_LAYOUT_OFF);
857
-  labelKey_7 = lv_label_create(NumberKey_7, NULL);                      /*Add a label to the button*/
854
+  labelKey_7 = lv_label_create_empty(NumberKey_7);                      /*Add a label to the button*/
858 855
   lv_label_set_text(labelKey_7, machine_menu.key_7);
859 856
   lv_obj_align(labelKey_7, NumberKey_7, LV_ALIGN_CENTER, 0, 0);
860 857
 
@@ -865,7 +862,7 @@ void lv_draw_number_key(void) {
865 862
   lv_btn_set_style(NumberKey_8, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
866 863
   lv_btn_set_style(NumberKey_8, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
867 864
   //lv_btn_set_layout(NumberKey_8, LV_LAYOUT_OFF);
868
-  labelKey_8 = lv_label_create(NumberKey_8, NULL);                      /*Add a label to the button*/
865
+  labelKey_8 = lv_label_create_empty(NumberKey_8);                      /*Add a label to the button*/
869 866
   lv_label_set_text(labelKey_8, machine_menu.key_8);
870 867
   lv_obj_align(labelKey_8, NumberKey_8, LV_ALIGN_CENTER, 0, 0);
871 868
 
@@ -876,7 +873,7 @@ void lv_draw_number_key(void) {
876 873
   lv_btn_set_style(NumberKey_9, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
877 874
   lv_btn_set_style(NumberKey_9, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
878 875
   //lv_btn_set_layout(NumberKey_9, LV_LAYOUT_OFF);
879
-  labelKey_9 = lv_label_create(NumberKey_9, NULL);                      /*Add a label to the button*/
876
+  labelKey_9 = lv_label_create_empty(NumberKey_9);                      /*Add a label to the button*/
880 877
   lv_label_set_text(labelKey_9, machine_menu.key_9);
881 878
   lv_obj_align(labelKey_9, NumberKey_9, LV_ALIGN_CENTER, 0, 0);
882 879
 
@@ -887,7 +884,7 @@ void lv_draw_number_key(void) {
887 884
   lv_btn_set_style(NumberKey_0, LV_BTN_STYLE_REL, &style_num_key_pre);  /*Set the button's released style*/
888 885
   lv_btn_set_style(NumberKey_0, LV_BTN_STYLE_PR, &style_num_key_rel);   /*Set the button's pressed style*/
889 886
   //lv_btn_set_layout(NumberKey_0, LV_LAYOUT_OFF);
890
-  labelKey_0 = lv_label_create(NumberKey_0, NULL);                      /*Add a label to the button*/
887
+  labelKey_0 = lv_label_create_empty(NumberKey_0);                      /*Add a label to the button*/
891 888
   lv_label_set_text(labelKey_0, machine_menu.key_0);
892 889
   lv_obj_align(labelKey_0, NumberKey_0, LV_ALIGN_CENTER, 0, 0);
893 890
 
@@ -898,7 +895,7 @@ void lv_draw_number_key(void) {
898 895
   lv_btn_set_style(KeyBack, LV_BTN_STYLE_REL, &style_num_key_pre);      /*Set the button's released style*/
899 896
   lv_btn_set_style(KeyBack, LV_BTN_STYLE_PR, &style_num_key_rel);       /*Set the button's pressed style*/
900 897
   //lv_btn_set_layout(KeyBack, LV_LAYOUT_OFF);
901
-  labelKeyBack = lv_label_create(KeyBack, NULL);                        /*Add a label to the button*/
898
+  labelKeyBack = lv_label_create_empty(KeyBack);                        /*Add a label to the button*/
902 899
   lv_label_set_text(labelKeyBack, machine_menu.key_back);
903 900
   lv_obj_align(labelKeyBack, KeyBack, LV_ALIGN_CENTER, 0, 0);
904 901
 
@@ -909,7 +906,7 @@ void lv_draw_number_key(void) {
909 906
   lv_btn_set_style(KeyReset, LV_BTN_STYLE_REL, &style_num_key_pre);     /*Set the button's released style*/
910 907
   lv_btn_set_style(KeyReset, LV_BTN_STYLE_PR, &style_num_key_rel);      /*Set the button's pressed style*/
911 908
   //lv_btn_set_layout(KeyReset, LV_LAYOUT_OFF);
912
-  labelKeyReset = lv_label_create(KeyReset, NULL);                      /*Add a label to the button*/
909
+  labelKeyReset = lv_label_create_empty(KeyReset);                      /*Add a label to the button*/
913 910
   lv_label_set_text(labelKeyReset, machine_menu.key_reset);
914 911
   lv_obj_align(labelKeyReset, KeyReset, LV_ALIGN_CENTER, 0, 0);
915 912
 
@@ -920,7 +917,7 @@ void lv_draw_number_key(void) {
920 917
   lv_btn_set_style(KeyConfirm, LV_BTN_STYLE_REL, &style_num_key_pre);   /*Set the button's released style*/
921 918
   lv_btn_set_style(KeyConfirm, LV_BTN_STYLE_PR, &style_num_key_rel);    /*Set the button's pressed style*/
922 919
   //lv_btn_set_layout(KeyConfirm, LV_LAYOUT_OFF);
923
-  labelKeyConfirm = lv_label_create(KeyConfirm, NULL);                  /*Add a label to the button*/
920
+  labelKeyConfirm = lv_label_create_empty(KeyConfirm);                  /*Add a label to the button*/
924 921
   lv_label_set_text(labelKeyConfirm, machine_menu.key_confirm);
925 922
   lv_obj_align(labelKeyConfirm, KeyConfirm, LV_ALIGN_CENTER, 0, 0);
926 923
 
@@ -931,7 +928,7 @@ void lv_draw_number_key(void) {
931 928
   lv_btn_set_style(KeyPoint, LV_BTN_STYLE_REL, &style_num_key_pre);     /*Set the button's released style*/
932 929
   lv_btn_set_style(KeyPoint, LV_BTN_STYLE_PR, &style_num_key_rel);      /*Set the button's pressed style*/
933 930
   //lv_btn_set_layout(KeyPoint, LV_LAYOUT_OFF);
934
-  labelKeyPoint = lv_label_create(KeyPoint, NULL);                      /*Add a label to the button*/
931
+  labelKeyPoint = lv_label_create_empty(KeyPoint);                      /*Add a label to the button*/
935 932
   lv_label_set_text(labelKeyPoint, machine_menu.key_point);
936 933
   lv_obj_align(labelKeyPoint, KeyPoint, LV_ALIGN_CENTER, 0, 0);
937 934
 
@@ -942,7 +939,7 @@ void lv_draw_number_key(void) {
942 939
   lv_btn_set_style(Minus, LV_BTN_STYLE_REL, &style_num_key_pre);        /*Set the button's released style*/
943 940
   lv_btn_set_style(Minus, LV_BTN_STYLE_PR, &style_num_key_rel);         /*Set the button's pressed style*/
944 941
   //lv_btn_set_layout(Minus, LV_LAYOUT_OFF);
945
-  labelMinus = lv_label_create(Minus, NULL);                            /*Add a label to the button*/
942
+  labelMinus = lv_label_create_empty(Minus);                            /*Add a label to the button*/
946 943
   lv_label_set_text(labelMinus, machine_menu.negative);
947 944
   lv_obj_align(labelMinus, Minus, LV_ALIGN_CENTER, 0, 0);
948 945
 

+ 41
- 151
Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp Vedi File

@@ -137,14 +137,12 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
137 137
       else if (event == LV_EVENT_RELEASED) {
138 138
         if (gCfgItems.finish_power_off) {
139 139
           gCfgItems.finish_power_off = false;
140
-          lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_REL, "F:/bmp_manual_off.bin");
141
-          lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_PR, "F:/bmp_manual_off.bin");
140
+          lv_imgbtn_set_src_both(buttonPowerOff, "F:/bmp_manual_off.bin");
142 141
           lv_label_set_text(label_PowerOff, printing_more_menu.manual);
143 142
         }
144 143
         else {
145 144
           gCfgItems.finish_power_off = true;
146
-          lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_REL, "F:/bmp_auto_off.bin");
147
-          lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_PR, "F:/bmp_auto_off.bin");
145
+          lv_imgbtn_set_src_both(buttonPowerOff, "F:/bmp_auto_off.bin");
148 146
           lv_label_set_text(label_PowerOff, printing_more_menu.auto_close);
149 147
         }
150 148
         lv_obj_align(label_PowerOff, buttonPowerOff, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
@@ -185,179 +183,71 @@ void lv_draw_operation(void) {
185 183
   lv_scr_load(scr);
186 184
   lv_obj_clean(scr);
187 185
 
188
-  lv_obj_t * title = lv_label_create(scr, NULL);
189
-  lv_obj_set_style(title, &tft_style_label_rel);
190
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
191
-  lv_label_set_text(title, creat_title_text());
186
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
192 187
 
193 188
   lv_refr_now(lv_refr_get_disp_refreshing());
194 189
 
195 190
   // Create image buttons
196
-  buttonPreHeat     = lv_imgbtn_create(scr, NULL);
197
-  buttonFilament    = lv_imgbtn_create(scr, NULL);
198
-  buttonFan         = lv_imgbtn_create(scr, NULL);
199
-  buttonPowerOff    = lv_imgbtn_create(scr, NULL);
200
-  if (uiCfg.print_state != WORKING) {
201
-    buttonExtrusion = lv_imgbtn_create(scr, NULL);
202
-    buttonMove      = lv_imgbtn_create(scr, NULL);
203
-  }
204
-  else {
205
-    buttonSpeed    = lv_imgbtn_create(scr, NULL);
206
-    buttonBabyStep = lv_imgbtn_create(scr, NULL);
207
-  }
208
-  buttonBack       = lv_imgbtn_create(scr, NULL);
209
-
210
-  lv_obj_set_event_cb_mks(buttonPreHeat, event_handler, ID_O_PRE_HEAT, NULL, 0);
211
-  lv_imgbtn_set_src(buttonPreHeat, LV_BTN_STATE_REL, "F:/bmp_temp.bin");
212
-  lv_imgbtn_set_src(buttonPreHeat, LV_BTN_STATE_PR, "F:/bmp_temp.bin");
213
-  lv_imgbtn_set_style(buttonPreHeat, LV_BTN_STATE_PR, &tft_style_label_pre);
214
-  lv_imgbtn_set_style(buttonPreHeat, LV_BTN_STATE_REL, &tft_style_label_rel);
215
-
216
-  lv_obj_set_event_cb_mks(buttonFilament, event_handler, ID_O_FILAMENT, NULL, 0);
217
-  lv_imgbtn_set_src(buttonFilament, LV_BTN_STATE_REL, "F:/bmp_filamentchange.bin");
218
-  lv_imgbtn_set_src(buttonFilament, LV_BTN_STATE_PR, "F:/bmp_filamentchange.bin");
219
-  lv_imgbtn_set_style(buttonFilament, LV_BTN_STATE_PR, &tft_style_label_pre);
220
-  lv_imgbtn_set_style(buttonFilament, LV_BTN_STATE_REL, &tft_style_label_rel);
221
-
222
-  #if 1
223
-    lv_obj_set_event_cb_mks(buttonFan, event_handler, ID_O_FAN, NULL, 0);
224
-    lv_imgbtn_set_src(buttonFan, LV_BTN_STATE_REL, "F:/bmp_fan.bin");
225
-    lv_imgbtn_set_src(buttonFan, LV_BTN_STATE_PR, "F:/bmp_fan.bin");
226
-    lv_imgbtn_set_style(buttonFan, LV_BTN_STATE_PR, &tft_style_label_pre);
227
-    lv_imgbtn_set_style(buttonFan, LV_BTN_STATE_REL, &tft_style_label_rel);
191
+  buttonPreHeat  = lv_imgbtn_create(scr, "F:/bmp_temp.bin", INTERVAL_V, titleHeight, event_handler, ID_O_PRE_HEAT);
192
+  buttonFilament = lv_imgbtn_create(scr, "F:/bmp_filamentchange.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_O_FILAMENT);
193
+  buttonFan      = lv_imgbtn_create(scr, "F:/bmp_fan.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_O_FAN);
194
+  buttonPowerOff = lv_imgbtn_create(scr, gCfgItems.finish_power_off ? "F:/bmp_auto_off.bin" : "F:/bmp_manual_off.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_O_POWER_OFF);
228 195
 
229
-    if (gCfgItems.finish_power_off) {
230
-      lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_REL, "F:/bmp_auto_off.bin");
231
-      lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_PR, "F:/bmp_auto_off.bin");
232
-    }
233
-    else {
234
-      lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_REL, "F:/bmp_manual_off.bin");
235
-      lv_imgbtn_set_src(buttonPowerOff, LV_BTN_STATE_PR, "F:/bmp_manual_off.bin");
196
+  #if HAS_ROTARY_ENCODER
197
+    if (gCfgItems.encoder_enable) {
198
+      lv_group_add_obj(g, buttonPreHeat);
199
+      lv_group_add_obj(g, buttonFilament);
200
+      lv_group_add_obj(g, buttonFan);
201
+      lv_group_add_obj(g, buttonPowerOff);
236 202
     }
237
-    lv_obj_set_event_cb_mks(buttonPowerOff, event_handler, ID_O_POWER_OFF, NULL, 0);
238
-    lv_imgbtn_set_style(buttonPowerOff, LV_BTN_STATE_PR, &tft_style_label_pre);
239
-    lv_imgbtn_set_style(buttonPowerOff, LV_BTN_STATE_REL, &tft_style_label_rel);
203
+  #endif
240 204
 
205
+  if (uiCfg.print_state != WORKING) {
206
+    buttonExtrusion = lv_imgbtn_create(scr, "F:/bmp_extrude_opr.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_EXTRUCT);
207
+    buttonMove      = lv_imgbtn_create(scr, "F:/bmp_move_opr.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_MOV);
241 208
     #if HAS_ROTARY_ENCODER
242 209
       if (gCfgItems.encoder_enable) {
243
-        lv_group_add_obj(g, buttonPreHeat);
244
-        lv_group_add_obj(g, buttonFilament);
245
-        lv_group_add_obj(g, buttonFan);
246
-        lv_group_add_obj(g, buttonPowerOff);
210
+        lv_group_add_obj(g, buttonExtrusion);
211
+        lv_group_add_obj(g, buttonMove);
247 212
       }
248 213
     #endif
214
+  }
215
+  else {
216
+    buttonSpeed    = lv_imgbtn_create(scr, "F:/bmp_speed.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_SPEED);
217
+    buttonBabyStep = lv_imgbtn_create(scr, "F:/bmp_mov.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_BABY_STEP);
218
+    #if HAS_ROTARY_ENCODER
219
+      if (gCfgItems.encoder_enable) {
220
+        lv_group_add_obj(g, buttonSpeed);
221
+        lv_group_add_obj(g, buttonBabyStep);
222
+      }
223
+    #endif
224
+  }
249 225
 
250
-    if (uiCfg.print_state != WORKING) {
251
-      lv_obj_set_event_cb_mks(buttonExtrusion, event_handler, ID_O_EXTRUCT, NULL, 0);
252
-      lv_imgbtn_set_src(buttonExtrusion, LV_BTN_STATE_REL, "F:/bmp_extrude_opr.bin");
253
-      lv_imgbtn_set_src(buttonExtrusion, LV_BTN_STATE_PR, "F:/bmp_extrude_opr.bin");
254
-      lv_imgbtn_set_style(buttonExtrusion, LV_BTN_STATE_PR, &tft_style_label_pre);
255
-      lv_imgbtn_set_style(buttonExtrusion, LV_BTN_STATE_REL, &tft_style_label_rel);
256
-
257
-      lv_obj_set_event_cb_mks(buttonMove, event_handler, ID_O_MOV, NULL, 0);
258
-      lv_imgbtn_set_src(buttonMove, LV_BTN_STATE_REL, "F:/bmp_move_opr.bin");
259
-      lv_imgbtn_set_src(buttonMove, LV_BTN_STATE_PR, "F:/bmp_move_opr.bin");
260
-      lv_imgbtn_set_style(buttonMove, LV_BTN_STATE_PR, &tft_style_label_pre);
261
-      lv_imgbtn_set_style(buttonMove, LV_BTN_STATE_REL, &tft_style_label_rel);
262
-
263
-      #if HAS_ROTARY_ENCODER
264
-        if (gCfgItems.encoder_enable) {
265
-          lv_group_add_obj(g, buttonExtrusion);
266
-          lv_group_add_obj(g, buttonMove);
267
-        }
268
-      #endif
269
-    }
270
-    else {
271
-      lv_obj_set_event_cb_mks(buttonSpeed, event_handler, ID_O_SPEED, NULL, 0);
272
-      lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_REL, "F:/bmp_speed.bin");
273
-      lv_imgbtn_set_src(buttonSpeed, LV_BTN_STATE_PR, "F:/bmp_speed.bin");
274
-      lv_imgbtn_set_style(buttonSpeed, LV_BTN_STATE_PR, &tft_style_label_pre);
275
-      lv_imgbtn_set_style(buttonSpeed, LV_BTN_STATE_REL, &tft_style_label_rel);
276
-
277
-      lv_obj_set_event_cb_mks(buttonBabyStep, event_handler, ID_O_BABY_STEP, NULL, 0);
278
-      lv_imgbtn_set_src(buttonBabyStep, LV_BTN_STATE_REL, "F:/bmp_mov.bin");
279
-      lv_imgbtn_set_src(buttonBabyStep, LV_BTN_STATE_PR, "F:/bmp_mov.bin");
280
-      lv_imgbtn_set_style(buttonBabyStep, LV_BTN_STATE_PR, &tft_style_label_pre);
281
-      lv_imgbtn_set_style(buttonBabyStep, LV_BTN_STATE_REL, &tft_style_label_rel);
282
-
283
-      #if HAS_ROTARY_ENCODER
284
-        if (gCfgItems.encoder_enable) {
285
-          lv_group_add_obj(g, buttonSpeed);
286
-          lv_group_add_obj(g, buttonBabyStep);
287
-        }
288
-      #endif
289
-    }
290
-
291
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_O_RETURN, NULL, 0);
292
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
293
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
294
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
295
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
296
-  #endif // if 1
226
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_RETURN);
297 227
 
298 228
   #if HAS_ROTARY_ENCODER
299 229
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
300 230
   #endif
301 231
 
302
-  lv_obj_set_pos(buttonPreHeat, INTERVAL_V, titleHeight);
303
-  lv_obj_set_pos(buttonFilament, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
304
-  lv_obj_set_pos(buttonFan, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
305
-  lv_obj_set_pos(buttonPowerOff, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
306
-
307
-  if (uiCfg.print_state != WORKING) {
308
-    /*
309
-      lv_obj_set_pos(buttonFilament,INTERVAL_V,BTN_Y_PIXEL+INTERVAL_H+titleHeight);
310
-    } else {
311
-    */
312
-    lv_obj_set_pos(buttonExtrusion, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
313
-    lv_obj_set_pos(buttonMove, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
314
-  }
315
-  else {
316
-    lv_obj_set_pos(buttonSpeed, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
317
-    lv_obj_set_pos(buttonBabyStep, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
318
-  }
319
-
320
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
321
-
322 232
   // Create labels on the image buttons
323
-  lv_btn_set_layout(buttonPreHeat, LV_LAYOUT_OFF);
324
-  lv_btn_set_layout(buttonFilament, LV_LAYOUT_OFF);
325
-  lv_btn_set_layout(buttonFan, LV_LAYOUT_OFF);
326
-  lv_btn_set_layout(buttonPowerOff, LV_LAYOUT_OFF);
327
-
328
-  if (uiCfg.print_state != WORKING) {
329
-    /*
330
-      lv_btn_set_layout(buttonFilament, LV_LAYOUT_OFF);
331
-    } else {
332
-    */
333
-    lv_btn_set_layout(buttonExtrusion, LV_LAYOUT_OFF);
334
-    lv_btn_set_layout(buttonMove, LV_LAYOUT_OFF);
335
-  }
336
-  else {
337
-    lv_btn_set_layout(buttonSpeed, LV_LAYOUT_OFF);
338
-    lv_btn_set_layout(buttonBabyStep, LV_LAYOUT_OFF);
339
-  }
340
-
341
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
342
-
343
-  labelPreHeat   = lv_label_create(buttonPreHeat, NULL);
344
-  label_Filament = lv_label_create(buttonFilament, NULL);
345
-  label_Fan   = lv_label_create(buttonFan, NULL);
346
-  label_PowerOff = lv_label_create(buttonPowerOff, NULL);
233
+  labelPreHeat   = lv_label_create_empty(buttonPreHeat);
234
+  label_Filament = lv_label_create_empty(buttonFilament);
235
+  label_Fan      = lv_label_create_empty(buttonFan);
236
+  label_PowerOff = lv_label_create_empty(buttonPowerOff);
347 237
 
348 238
   if (uiCfg.print_state != WORKING) {
349 239
     /*
350
-      label_Filament = lv_label_create(buttonFilament, NULL);
240
+      label_Filament = lv_label_create_empty(buttonFilament);
351 241
     } else {
352 242
     */
353
-    labelExtrusion = lv_label_create(buttonExtrusion, NULL);
354
-    label_Move = lv_label_create(buttonMove, NULL);
243
+    labelExtrusion = lv_label_create_empty(buttonExtrusion);
244
+    label_Move = lv_label_create_empty(buttonMove);
355 245
   }
356 246
   else {
357
-    label_Speed = lv_label_create(buttonSpeed, NULL);
358
-    label_BabyStep = lv_label_create(buttonBabyStep, NULL);
247
+    label_Speed = lv_label_create_empty(buttonSpeed);
248
+    label_BabyStep = lv_label_create_empty(buttonBabyStep);
359 249
   }
360
-  label_Back = lv_label_create(buttonBack, NULL);
250
+  label_Back = lv_label_create_empty(buttonBack);
361 251
 
362 252
   if (gCfgItems.multiple_language) {
363 253
     lv_label_set_text(labelPreHeat, operation_menu.temp);

+ 15
- 50
Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp Vedi File

@@ -83,9 +83,9 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
83 83
 
84 84
 void lv_draw_pause_position(void) {
85 85
   lv_obj_t *buttonBack = NULL, *label_Back = NULL;
86
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
87
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
88
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
86
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
87
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
88
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
89 89
 
90 90
   lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL;
91 91
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != PAUSE_POS_UI) {
@@ -100,81 +100,46 @@ void lv_draw_pause_position(void) {
100 100
   lv_scr_load(scr);
101 101
   lv_obj_clean(scr);
102 102
 
103
-  lv_obj_t * title = lv_label_create(scr, NULL);
104
-  lv_obj_set_style(title, &tft_style_label_rel);
105
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
106
-  lv_label_set_text(title, machine_menu.PausePosText);
103
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.PausePosText);
107 104
 
108 105
   lv_refr_now(lv_refr_get_disp_refreshing());
109 106
 
110
-  labelXText = lv_label_create(scr, NULL);
111
-  lv_obj_set_style(labelXText, &tft_style_label_rel);
112
-  lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
113
-  lv_label_set_text(labelXText, machine_menu.xPos);
107
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.xPos);
114 108
 
115
-  buttonXValue = lv_btn_create(scr, NULL);
116
-  lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
117
-  lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
118
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
119
-  lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
120
-  lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_PAUSE_X, NULL, 0);
121
-  labelXValue = lv_label_create(buttonXValue, NULL);
109
+  buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_PAUSE_X);
110
+  labelXValue = lv_label_create_empty(buttonXValue);
122 111
 
123 112
   line1 = lv_line_create(scr, NULL);
124 113
   lv_ex_line(line1, line_points[0]);
125 114
 
126
-  labelYText = lv_label_create(scr, NULL);
127
-  lv_obj_set_style(labelYText, &tft_style_label_rel);
128
-  lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
129
-  lv_label_set_text(labelYText, machine_menu.yPos);
115
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.yPos);
130 116
 
131
-  buttonYValue = lv_btn_create(scr, NULL);
132
-  lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
133
-  lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
134
-  lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_PAUSE_Y, NULL, 0);
135
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
136
-  lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
137
-  labelYValue = lv_label_create(buttonYValue, NULL);
117
+  buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_PAUSE_Y);
118
+  labelYValue = lv_label_create_empty(buttonYValue);
138 119
 
139 120
   line2 = lv_line_create(scr, NULL);
140 121
   lv_ex_line(line2, line_points[1]);
141 122
 
142
-  labelZText = lv_label_create(scr, NULL);
143
-  lv_obj_set_style(labelZText, &tft_style_label_rel);
144
-  lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
145
-  lv_label_set_text(labelZText, machine_menu.zPos);
123
+  (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.zPos);
146 124
 
147
-  buttonZValue = lv_btn_create(scr, NULL);
148
-  lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
149
-  lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
150
-  lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_PAUSE_Z, NULL, 0);
151
-  lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
152
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
153
-  labelZValue = lv_label_create(buttonZValue, NULL);
125
+  buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_PAUSE_Z);
126
+  labelZValue = lv_label_create_empty(buttonZValue);
154 127
 
155 128
   line3 = lv_line_create(scr, NULL);
156 129
   lv_ex_line(line3, line_points[2]);
157 130
 
158
-  buttonBack = lv_btn_create(scr, NULL);
159
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
160
-  lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
161
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_PAUSE_RETURN, NULL, 0);
162
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
163
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
164
-  label_Back = lv_label_create(buttonBack, NULL);
131
+  buttonBack = lv_btn_create_back(scr, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE, event_handler, ID_PAUSE_RETURN);
132
+  label_Back = lv_label_create_empty(buttonBack);
165 133
 
166 134
   if (gCfgItems.multiple_language) {
167
-    ZERO(public_buf_l);
168 135
     sprintf_P(public_buf_l, PSTR("%.1f"), gCfgItems.pausePosX);
169 136
     lv_label_set_text(labelXValue, public_buf_l);
170 137
     lv_obj_align(labelXValue, buttonXValue, LV_ALIGN_CENTER, 0, 0);
171 138
 
172
-    ZERO(public_buf_l);
173 139
     sprintf_P(public_buf_l, PSTR("%.1f"), gCfgItems.pausePosY);
174 140
     lv_label_set_text(labelYValue, public_buf_l);
175 141
     lv_obj_align(labelYValue, buttonYValue, LV_ALIGN_CENTER, 0, 0);
176 142
 
177
-    ZERO(public_buf_l);
178 143
     sprintf_P(public_buf_l, PSTR("%.1f"), gCfgItems.pausePosZ);
179 144
     lv_label_set_text(labelZValue, public_buf_l);
180 145
     lv_obj_align(labelZValue, buttonZValue, LV_ALIGN_CENTER, 0, 0);

+ 25
- 82
Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp Vedi File

@@ -35,7 +35,7 @@
35 35
 
36 36
 static lv_obj_t * scr;
37 37
 extern lv_group_t*  g;
38
-static lv_obj_t *buttoType, *buttonStep;
38
+static lv_obj_t *buttonType, *buttonStep;
39 39
 static lv_obj_t *labelType;
40 40
 static lv_obj_t *labelStep;
41 41
 static lv_obj_t * tempText1;
@@ -203,77 +203,26 @@ void lv_draw_preHeat(void) {
203 203
   lv_scr_load(scr);
204 204
   lv_obj_clean(scr);
205 205
 
206
-  lv_obj_t * title = lv_label_create(scr, NULL);
207
-  lv_obj_set_style(title, &tft_style_label_rel);
208
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
209
-  lv_label_set_text(title, creat_title_text());
206
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
210 207
 
211 208
   lv_refr_now(lv_refr_get_disp_refreshing());
212 209
 
213 210
   // Create image buttons
214
-  buttonAdd  = lv_imgbtn_create(scr, NULL);
215
-  buttonDec  = lv_imgbtn_create(scr, NULL);
216
-  buttoType  = lv_imgbtn_create(scr, NULL);
217
-  buttonStep = lv_imgbtn_create(scr, NULL);
218
-  buttonOff  = lv_imgbtn_create(scr, NULL);
219
-  buttonBack = lv_imgbtn_create(scr, NULL);
220
-
221
-  lv_obj_set_event_cb_mks(buttonAdd, event_handler, ID_P_ADD, NULL, 0);
222
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_REL, "F:/bmp_Add.bin");
223
-  lv_imgbtn_set_src(buttonAdd, LV_BTN_STATE_PR, "F:/bmp_Add.bin");
224
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_PR, &tft_style_label_pre);
225
-  lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_REL, &tft_style_label_rel);
211
+  buttonAdd = lv_imgbtn_create(scr, "F:/bmp_Add.bin", INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
226 212
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
227
-
228
-  #if 1
229
-    lv_obj_set_event_cb_mks(buttonDec, event_handler, ID_P_DEC, NULL, 0);
230
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_REL, "F:/bmp_Dec.bin");
231
-    lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_PR, "F:/bmp_Dec.bin");
232
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_PR, &tft_style_label_pre);
233
-    lv_imgbtn_set_style(buttonDec, LV_BTN_STATE_REL, &tft_style_label_rel);
234
-
235
-    lv_obj_set_event_cb_mks(buttoType, event_handler, ID_P_TYPE, NULL, 0);
236
-    lv_imgbtn_set_style(buttoType, LV_BTN_STATE_PR, &tft_style_label_pre);
237
-    lv_imgbtn_set_style(buttoType, LV_BTN_STATE_REL, &tft_style_label_rel);
238
-
239
-    lv_obj_set_event_cb_mks(buttonStep, event_handler, ID_P_STEP, NULL, 0);
240
-    lv_imgbtn_set_style(buttonStep, LV_BTN_STATE_PR, &tft_style_label_pre);
241
-    lv_imgbtn_set_style(buttonStep, LV_BTN_STATE_REL, &tft_style_label_rel);
242
-
243
-    lv_obj_set_event_cb_mks(buttonOff, event_handler, ID_P_OFF, NULL, 0);
244
-    lv_imgbtn_set_src(buttonOff, LV_BTN_STATE_REL, "F:/bmp_speed0.bin");
245
-    lv_imgbtn_set_src(buttonOff, LV_BTN_STATE_PR, "F:/bmp_speed0.bin");
246
-    lv_imgbtn_set_style(buttonOff, LV_BTN_STATE_PR, &tft_style_label_pre);
247
-    lv_imgbtn_set_style(buttonOff, LV_BTN_STATE_REL, &tft_style_label_rel);
248
-
249
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_P_RETURN, NULL, 0);
250
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
251
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
252
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
253
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
254
-  #endif
255
-
256
-  lv_obj_set_pos(buttonAdd, INTERVAL_V, titleHeight);
257
-  lv_obj_set_pos(buttonDec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
258
-  lv_obj_set_pos(buttoType, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
259
-  lv_obj_set_pos(buttonStep, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
260
-  lv_obj_set_pos(buttonOff, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
261
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
213
+  buttonDec = lv_imgbtn_create(scr, "F:/bmp_Dec.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
214
+  buttonType = lv_imgbtn_create(scr, NULL, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
215
+  buttonStep = lv_imgbtn_create(scr, NULL, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
216
+  buttonOff = lv_imgbtn_create(scr, "F:/bmp_speed0.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_OFF);
217
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_RETURN);
262 218
 
263 219
   // Create labels on the image buttons
264
-  lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
265
-  lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
266
-  lv_btn_set_layout(buttoType, LV_LAYOUT_OFF);
267
-  lv_btn_set_layout(buttonStep, LV_LAYOUT_OFF);
268
-  lv_btn_set_layout(buttonOff, LV_LAYOUT_OFF);
269
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
270
-
271
-  lv_obj_t *labelAdd = lv_label_create(buttonAdd, NULL);
272
-  lv_obj_t *labelDec = lv_label_create(buttonDec, NULL);
273
-  labelType = lv_label_create(buttoType, NULL);
274
-  labelStep = lv_label_create(buttonStep, NULL);
275
-  lv_obj_t *labelOff   = lv_label_create(buttonOff, NULL);
276
-  lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
220
+  lv_obj_t *labelAdd = lv_label_create_empty(buttonAdd);
221
+  lv_obj_t *labelDec = lv_label_create_empty(buttonDec);
222
+  labelType = lv_label_create_empty(buttonType);
223
+  labelStep = lv_label_create_empty(buttonStep);
224
+  lv_obj_t *labelOff   = lv_label_create_empty(buttonOff);
225
+  lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
277 226
 
278 227
   if (gCfgItems.multiple_language) {
279 228
     lv_label_set_text(labelAdd, preheat_menu.add);
@@ -292,7 +241,7 @@ void lv_draw_preHeat(void) {
292 241
     if (gCfgItems.encoder_enable) {
293 242
       lv_group_add_obj(g, buttonAdd);
294 243
       lv_group_add_obj(g, buttonDec);
295
-      lv_group_add_obj(g, buttoType);
244
+      lv_group_add_obj(g, buttonType);
296 245
       lv_group_add_obj(g, buttonStep);
297 246
       lv_group_add_obj(g, buttonOff);
298 247
       lv_group_add_obj(g, buttonBack);
@@ -302,7 +251,7 @@ void lv_draw_preHeat(void) {
302 251
   disp_temp_type();
303 252
   disp_step_heat();
304 253
 
305
-  tempText1 = lv_label_create(scr, NULL);
254
+  tempText1 = lv_label_create_empty(scr);
306 255
   lv_obj_set_style(tempText1, &tft_style_label_rel);
307 256
   disp_desire_temp();
308 257
 }
@@ -310,29 +259,26 @@ void lv_draw_preHeat(void) {
310 259
 void disp_temp_type() {
311 260
   if (uiCfg.curTempType == 0) {
312 261
     if (uiCfg.curSprayerChoose == 1) {
313
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_extru2.bin");
314
-      lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_extru2.bin");
262
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
315 263
       if (gCfgItems.multiple_language) {
316 264
         lv_label_set_text(labelType, preheat_menu.ext2);
317
-        lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
265
+        lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
318 266
       }
319 267
     }
320 268
     else {
321
-    lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_extru1.bin");
322
-      lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_extru1.bin");
269
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
323 270
       if (gCfgItems.multiple_language) {
324 271
         lv_label_set_text(labelType, preheat_menu.ext1);
325
-        lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
272
+        lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
326 273
       }
327 274
     }
328 275
 
329 276
   }
330 277
   else {
331
-  lv_imgbtn_set_src(buttoType, LV_BTN_STATE_REL, "F:/bmp_bed.bin");
332
-      lv_imgbtn_set_src(buttoType, LV_BTN_STATE_PR, "F:/bmp_bed.bin");
278
+  lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
333 279
     if (gCfgItems.multiple_language) {
334 280
       lv_label_set_text(labelType, preheat_menu.hotbed);
335
-      lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
281
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
336 282
     }
337 283
   }
338 284
 }
@@ -363,16 +309,13 @@ void disp_desire_temp() {
363 309
 
364 310
 void disp_step_heat() {
365 311
   if (uiCfg.stepHeat == 1) {
366
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step1_degree.bin");
367
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step1_degree.bin");
312
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_degree.bin");
368 313
   }
369 314
   else if (uiCfg.stepHeat == 5) {
370
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step5_degree.bin");
371
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step5_degree.bin");
315
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_degree.bin");
372 316
   }
373 317
   else if (uiCfg.stepHeat == 10) {
374
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_REL, "F:/bmp_step10_degree.bin");
375
-    lv_imgbtn_set_src(buttonStep, LV_BTN_STATE_PR, "F:/bmp_step10_degree.bin");
318
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_degree.bin");
376 319
   }
377 320
 
378 321
   if (gCfgItems.multiple_language) {

+ 18
- 65
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp Vedi File

@@ -266,9 +266,9 @@ void lv_draw_print_file(void) {
266 266
   #endif
267 267
   disp_gcode_icon(file_count);
268 268
 
269
-  //lv_obj_t *labelPageUp = lv_label_create(buttonPageUp, NULL);
270
-  //lv_obj_t *labelPageDown = lv_label_create(buttonPageDown, NULL);
271
-  //lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
269
+  //lv_obj_t *labelPageUp = lv_label_create_empty(buttonPageUp);
270
+  //lv_obj_t *labelPageDown = lv_label_create_empty(buttonPageDown);
271
+  //lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
272 272
 
273 273
   /*
274 274
   if (gCfgItems.multiple_language) {
@@ -295,47 +295,16 @@ void disp_gcode_icon(uint8_t file_num) {
295 295
   lv_scr_load(scr);
296 296
   lv_obj_clean(scr);
297 297
 
298
-  lv_obj_t * title = lv_label_create(scr, NULL);
299
-  lv_obj_set_style(title, &tft_style_label_rel);
300
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
301
-  lv_label_set_text(title, creat_title_text());
298
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
302 299
 
303 300
   lv_refr_now(lv_refr_get_disp_refreshing());
304 301
 
305 302
   // Create image buttons
306
-  buttonPageUp   = lv_imgbtn_create(scr, NULL);
307
-  buttonPageDown = lv_imgbtn_create(scr, NULL);
308
-  buttonBack     = lv_imgbtn_create(scr, NULL);
309
-
310
-  lv_obj_set_event_cb_mks(buttonPageUp, event_handler, ID_P_UP, NULL, 0);
311
-  lv_imgbtn_set_src(buttonPageUp, LV_BTN_STATE_REL, "F:/bmp_pageUp.bin");
312
-  lv_imgbtn_set_src(buttonPageUp, LV_BTN_STATE_PR, "F:/bmp_pageUp.bin");
313
-  lv_imgbtn_set_style(buttonPageUp, LV_BTN_STATE_PR, &tft_style_label_pre);
314
-  lv_imgbtn_set_style(buttonPageUp, LV_BTN_STATE_REL, &tft_style_label_rel);
315
-
316
-  #if 1
317
-    lv_obj_set_event_cb_mks(buttonPageDown, event_handler, ID_P_DOWN, NULL, 0);
318
-    lv_imgbtn_set_src(buttonPageDown, LV_BTN_STATE_REL, "F:/bmp_pageDown.bin");
319
-    lv_imgbtn_set_src(buttonPageDown, LV_BTN_STATE_PR, "F:/bmp_pageDown.bin");
320
-    lv_imgbtn_set_style(buttonPageDown, LV_BTN_STATE_PR, &tft_style_label_pre);
321
-    lv_imgbtn_set_style(buttonPageDown, LV_BTN_STATE_REL, &tft_style_label_rel);
322
-
323
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_P_RETURN, NULL, 0);
324
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back.bin");
325
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back.bin");
326
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
327
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
328
-  #endif
329
-
330
-  lv_obj_set_pos(buttonPageUp, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight);
331
-  lv_obj_set_pos(buttonPageDown, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H);
332
-  lv_obj_set_pos(buttonBack, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL * 2 + INTERVAL_H * 2);
303
+  buttonPageUp   = lv_imgbtn_create(scr, "F:/bmp_pageUp.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_UP);
304
+  buttonPageDown = lv_imgbtn_create(scr, "F:/bmp_pageDown.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H, event_handler, ID_P_DOWN);
305
+  buttonBack     = lv_imgbtn_create(scr, "F:/bmp_back.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL * 2 + INTERVAL_H * 2, event_handler, ID_P_RETURN);
333 306
 
334 307
   // Create labels on the image buttons
335
-  lv_btn_set_layout(buttonPageUp, LV_LAYOUT_OFF);
336
-  lv_btn_set_layout(buttonPageDown, LV_LAYOUT_OFF);
337
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
338
-
339 308
   for (i = 0; i < FILE_BTN_CNT; i++) {
340 309
     /*
341 310
     if (seq) {
@@ -352,8 +321,7 @@ void disp_gcode_icon(uint8_t file_num) {
352 321
     #ifdef TFT35
353 322
       buttonGcode[i] = lv_imgbtn_create(scr, NULL);
354 323
 
355
-      lv_imgbtn_set_style(buttonGcode[i], LV_BTN_STATE_PR, &tft_style_label_pre);
356
-      lv_imgbtn_set_style(buttonGcode[i], LV_BTN_STATE_REL, &tft_style_label_rel);
324
+      lv_imgbtn_use_label_style(buttonGcode[i]);
357 325
       lv_obj_clear_protect(buttonGcode[i], LV_PROTECT_FOLLOW);
358 326
       lv_btn_set_layout(buttonGcode[i], LV_LAYOUT_OFF);
359 327
 
@@ -362,16 +330,13 @@ void disp_gcode_icon(uint8_t file_num) {
362 330
 
363 331
       if (list_file.IsFolder[i] == 1) {
364 332
         lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), NULL, 0);
365
-        lv_imgbtn_set_src(buttonGcode[i], LV_BTN_STATE_REL, "F:/bmp_dir.bin");
366
-        lv_imgbtn_set_src(buttonGcode[i], LV_BTN_STATE_PR, "F:/bmp_dir.bin");
333
+        lv_imgbtn_set_src_both(buttonGcode[i], "F:/bmp_dir.bin");
367 334
         if (i < 3)
368 335
           lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1), titleHeight);
369 336
         else
370 337
           lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1), BTN_Y_PIXEL + INTERVAL_H + titleHeight);
371 338
 
372
-        labelPageUp[i] = lv_label_create(buttonGcode[i], NULL);
373
-        lv_obj_set_style(labelPageUp[i], &tft_style_label_rel);
374
-        lv_label_set_text(labelPageUp[i], public_buf_m);
339
+        labelPageUp[i] = lv_label_create(buttonGcode[i], public_buf_m);
375 340
         lv_obj_align(labelPageUp[i], buttonGcode[i], LV_ALIGN_IN_BOTTOM_MID, 0, -5);
376 341
       }
377 342
       else {
@@ -385,20 +350,16 @@ void disp_gcode_icon(uint8_t file_num) {
385 350
           char *temp = strstr(test_public_buf_l,".GCO");
386 351
           if (temp) { strcpy(temp,".bin"); }
387 352
           lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), NULL, 0);
388
-          lv_imgbtn_set_src(buttonGcode[i], LV_BTN_STATE_REL, test_public_buf_l);
389
-          lv_imgbtn_set_src(buttonGcode[i], LV_BTN_STATE_PR, test_public_buf_l);
353
+          lv_imgbtn_set_src_both(buttonGcode[i], test_public_buf_l);
390 354
           if (i < 3) {
391 355
             lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET);
392 356
             buttonText[i] = lv_btn_create(scr, NULL);
393 357
             //lv_obj_set_event_cb(buttonText[i], event_handler);
394 358
 
395
-            lv_btn_set_style(buttonText[i], LV_BTN_STATE_PR, &tft_style_label_pre);
396
-            lv_btn_set_style(buttonText[i], LV_BTN_STATE_REL, &tft_style_label_rel);
397
-            //lv_obj_set_style(buttonText[i], &tft_style_label_pre);
398
-            //lv_obj_set_style(buttonText[i], &tft_style_label_rel);
359
+            lv_btn_use_label_style(buttonText[i]);
399 360
             lv_obj_clear_protect(buttonText[i], LV_PROTECT_FOLLOW);
400 361
             lv_btn_set_layout(buttonText[i], LV_LAYOUT_OFF);
401
-            //lv_obj_set_event_cb_mks(buttonText[i], event_handler,(i+10),NULL,0);
362
+            //lv_obj_set_event_cb_mks(buttonText[i], event_handler,(i+10),NULL, 0);
402 363
             lv_obj_set_pos(buttonText[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET + 100);
403 364
             lv_obj_set_size(buttonText[i], 100, 40);
404 365
           }
@@ -407,33 +368,25 @@ void disp_gcode_icon(uint8_t file_num) {
407 368
             buttonText[i] = lv_btn_create(scr, NULL);
408 369
             //lv_obj_set_event_cb(buttonText[i], event_handler);
409 370
 
410
-            lv_btn_set_style(buttonText[i], LV_BTN_STATE_PR, &tft_style_label_pre);
411
-            lv_btn_set_style(buttonText[i], LV_BTN_STATE_REL, &tft_style_label_rel);
412
-
413
-            //lv_imgbtn_set_style(buttonText[i], LV_BTN_STATE_REL, &tft_style_label_rel);
371
+            lv_btn_use_label_style(buttonText[i]);
414 372
             lv_obj_clear_protect(buttonText[i], LV_PROTECT_FOLLOW);
415 373
             lv_btn_set_layout(buttonText[i], LV_LAYOUT_OFF);
416
-            //lv_obj_set_event_cb_mks(buttonText[i], event_handler,(i+10),NULL,0);
374
+            //lv_obj_set_event_cb_mks(buttonText[i], event_handler,(i+10),NULL, 0);
417 375
             lv_obj_set_pos(buttonText[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1) + FILE_PRE_PIC_X_OFFSET, BTN_Y_PIXEL + INTERVAL_H + titleHeight + FILE_PRE_PIC_Y_OFFSET + 100);
418 376
             lv_obj_set_size(buttonText[i], 100, 40);
419 377
           }
420
-          labelPageUp[i] = lv_label_create(buttonText[i], NULL);
421
-          lv_obj_set_style(labelPageUp[i], &tft_style_label_rel);
422
-          lv_label_set_text(labelPageUp[i], public_buf_m);
378
+          labelPageUp[i] = lv_label_create(buttonText[i], public_buf_m);
423 379
           lv_obj_align(labelPageUp[i], buttonText[i], LV_ALIGN_IN_BOTTOM_MID, 0, 0);
424 380
         }
425 381
         else {
426 382
           lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), NULL, 0);
427
-          lv_imgbtn_set_src(buttonGcode[i], LV_BTN_STATE_REL, "F:/bmp_file.bin");
428
-          lv_imgbtn_set_src(buttonGcode[i], LV_BTN_STATE_PR, "F:/bmp_file.bin");
383
+          lv_imgbtn_set_src_both(buttonGcode[i], "F:/bmp_file.bin");
429 384
           if (i < 3)
430 385
             lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1), titleHeight);
431 386
           else
432 387
             lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1), BTN_Y_PIXEL + INTERVAL_H + titleHeight);
433 388
 
434
-          labelPageUp[i] = lv_label_create(buttonGcode[i], NULL);
435
-          lv_obj_set_style(labelPageUp[i], &tft_style_label_rel);
436
-          lv_label_set_text(labelPageUp[i], public_buf_m);
389
+          labelPageUp[i] = lv_label_create(buttonGcode[i], public_buf_m);
437 390
           lv_obj_align(labelPageUp[i], buttonGcode[i], LV_ALIGN_IN_BOTTOM_MID, 0, -5);
438 391
         }
439 392
       }

+ 44
- 107
Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp Vedi File

@@ -46,13 +46,14 @@
46 46
   #include "../../../marlinui.h"
47 47
 #endif
48 48
 
49
-extern lv_group_t * g;
50
-static lv_obj_t * scr;
51
-static lv_obj_t *labelExt1, * labelFan, * labelZpos, * labelTime;
52
-TERN_(HAS_MULTI_EXTRUDER, static lv_obj_t *labelExt2;)
53
-static lv_obj_t *labelPause, * labelStop, * labelOperat;
54
-static lv_obj_t * bar1, *bar1ValueText;
55
-static lv_obj_t * buttonPause, *buttonOperat, *buttonStop;
49
+extern lv_group_t *g;
50
+static lv_obj_t *scr;
51
+static lv_obj_t *labelExt1, *labelFan, *labelZpos, *labelTime;
52
+static lv_obj_t *labelPause, *labelStop, *labelOperat;
53
+static lv_obj_t *bar1, *bar1ValueText;
54
+static lv_obj_t *buttonPause, *buttonOperat, *buttonStop;
55
+
56
+TERN_(HAS_MULTI_EXTRUDER, static lv_obj_t *labelExt2);
56 57
 
57 58
 #if HAS_HEATED_BED
58 59
   static lv_obj_t* labelBed;
@@ -83,23 +84,20 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
83 84
               stop_print_time();
84 85
               uiCfg.print_state = PAUSING;
85 86
             #endif
86
-            lv_imgbtn_set_src(buttonPause, LV_BTN_STATE_REL, "F:/bmp_resume.bin");
87
-            lv_imgbtn_set_src(buttonPause, LV_BTN_STATE_PR, "F:/bmp_resume.bin");
87
+            lv_imgbtn_set_src_both(buttonPause, "F:/bmp_resume.bin");
88 88
             lv_label_set_text(labelPause, printing_menu.resume);
89 89
             lv_obj_align(labelPause, buttonPause, LV_ALIGN_CENTER, 30, 0);
90 90
           }
91 91
           else if (uiCfg.print_state == PAUSED) {
92 92
             uiCfg.print_state = RESUMING;
93
-            lv_imgbtn_set_src(obj, LV_BTN_STATE_REL, "F:/bmp_pause.bin");
94
-            lv_imgbtn_set_src(obj, LV_BTN_STATE_PR, "F:/bmp_pause.bin");
93
+            lv_imgbtn_set_src_both(obj, "F:/bmp_pause.bin");
95 94
             lv_label_set_text(labelPause, printing_menu.pause);
96 95
             lv_obj_align(labelPause, buttonPause, LV_ALIGN_CENTER, 30, 0);
97 96
           }
98 97
           #if ENABLED(POWER_LOSS_RECOVERY)
99 98
             else if (uiCfg.print_state == REPRINTING) {
100 99
               uiCfg.print_state = REPRINTED;
101
-              lv_imgbtn_set_src(obj, LV_BTN_STATE_REL, "F:/bmp_pause.bin");
102
-              lv_imgbtn_set_src(obj, LV_BTN_STATE_PR, "F:/bmp_pause.bin");
100
+              lv_imgbtn_set_src_both(obj, "F:/bmp_pause.bin");
103 101
               lv_label_set_text(labelPause, printing_menu.pause);
104 102
               lv_obj_align(labelPause, buttonPause, LV_ALIGN_CENTER, 30, 0);
105 103
               // recovery.resume();
@@ -152,69 +150,42 @@ void lv_draw_printing(void) {
152 150
   lv_scr_load(scr);
153 151
   lv_obj_clean(scr);
154 152
 
155
-  lv_obj_t * title = lv_label_create(scr, NULL);
156
-  lv_obj_set_style(title, &tft_style_label_rel);
157
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
158
-  lv_label_set_text(title, creat_title_text());
153
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
159 154
 
160 155
   lv_refr_now(lv_refr_get_disp_refreshing());
161 156
 
162 157
   // Create image buttons
163 158
   lv_obj_t *buttonExt1 = lv_img_create(scr, NULL);
159
+  lv_img_set_src(buttonExt1, "F:/bmp_ext1_state.bin");
160
+  lv_obj_set_pos(buttonExt1, 205, 136);
161
+
164 162
   #if HAS_MULTI_EXTRUDER
165 163
     lv_obj_t *buttonExt2 = lv_img_create(scr, NULL);
164
+    lv_img_set_src(buttonExt2, "F:/bmp_ext2_state.bin");
165
+    lv_obj_set_pos(buttonExt2, 350, 136);
166 166
   #endif
167
+
167 168
   #if HAS_HEATED_BED
168 169
     lv_obj_t *buttonBedstate = lv_img_create(scr, NULL);
170
+    lv_img_set_src(buttonBedstate, "F:/bmp_bed_state.bin");
171
+    lv_obj_set_pos(buttonBedstate, 205, 186);
169 172
   #endif
170
-  lv_obj_t *buttonFanstate = lv_img_create(scr, NULL);
171
-  lv_obj_t *buttonTime     = lv_img_create(scr, NULL);
172
-  lv_obj_t *buttonZpos     = lv_img_create(scr, NULL);
173
-  buttonPause    = lv_imgbtn_create(scr, NULL);
174
-  buttonStop     = lv_imgbtn_create(scr, NULL);
175
-  buttonOperat   = lv_imgbtn_create(scr, NULL);
176 173
 
177
-  lv_img_set_src(buttonExt1, "F:/bmp_ext1_state.bin");
178
-  #if 1
179
-    #if HAS_MULTI_EXTRUDER
180
-      lv_img_set_src(buttonExt2, "F:/bmp_ext2_state.bin");
181
-    #endif
182
-    #if HAS_HEATED_BED
183
-      lv_img_set_src(buttonBedstate, "F:/bmp_bed_state.bin");
184
-    #endif
185
-
186
-    lv_img_set_src(buttonFanstate, "F:/bmp_fan_state.bin");
187
-
188
-    lv_img_set_src(buttonTime, "F:/bmp_time_state.bin");
189
-
190
-    lv_img_set_src(buttonZpos, "F:/bmp_zpos_state.bin");
191
-
192
-    if (uiCfg.print_state == WORKING) {
193
-      lv_imgbtn_set_src(buttonPause, LV_BTN_STATE_REL, "F:/bmp_pause.bin");
194
-      lv_imgbtn_set_src(buttonPause, LV_BTN_STATE_PR, "F:/bmp_pause.bin");
195
-    }
196
-    else {
197
-      lv_imgbtn_set_src(buttonPause, LV_BTN_STATE_REL, "F:/bmp_resume.bin");
198
-      lv_imgbtn_set_src(buttonPause, LV_BTN_STATE_PR, "F:/bmp_resume.bin");
199
-    }
200
-
201
-    lv_obj_set_event_cb_mks(buttonPause, event_handler, ID_PAUSE, NULL, 0);
202
-    lv_imgbtn_set_style(buttonPause, LV_BTN_STATE_PR, &tft_style_label_pre);
203
-    lv_imgbtn_set_style(buttonPause, LV_BTN_STATE_REL, &tft_style_label_rel);
174
+  lv_obj_t *buttonFanstate = lv_img_create(scr, NULL);
175
+  lv_img_set_src(buttonFanstate, "F:/bmp_fan_state.bin");
176
+  lv_obj_set_pos(buttonFanstate, 350, 186);
204 177
 
205
-    lv_obj_set_event_cb_mks(buttonStop, event_handler, ID_STOP, NULL, 0);
206
-    lv_imgbtn_set_src(buttonStop, LV_BTN_STATE_REL, "F:/bmp_stop.bin");
207
-    lv_imgbtn_set_src(buttonStop, LV_BTN_STATE_PR, "F:/bmp_stop.bin");
208
-    lv_imgbtn_set_style(buttonStop, LV_BTN_STATE_PR, &tft_style_label_pre);
209
-    lv_imgbtn_set_style(buttonStop, LV_BTN_STATE_REL, &tft_style_label_rel);
178
+  lv_obj_t *buttonTime = lv_img_create(scr, NULL);
179
+  lv_img_set_src(buttonTime, "F:/bmp_time_state.bin");
180
+  lv_obj_set_pos(buttonTime, 205, 86);
210 181
 
211
-    lv_obj_set_event_cb_mks(buttonOperat, event_handler, ID_OPTION, NULL, 0);
212
-    lv_imgbtn_set_src(buttonOperat, LV_BTN_STATE_REL, "F:/bmp_operate.bin");
213
-    lv_imgbtn_set_src(buttonOperat, LV_BTN_STATE_PR, "F:/bmp_operate.bin");
214
-    lv_imgbtn_set_style(buttonOperat, LV_BTN_STATE_PR, &tft_style_label_pre);
215
-    lv_imgbtn_set_style(buttonOperat, LV_BTN_STATE_REL, &tft_style_label_rel);
182
+  lv_obj_t *buttonZpos = lv_img_create(scr, NULL);
183
+  lv_img_set_src(buttonZpos, "F:/bmp_zpos_state.bin");
184
+  lv_obj_set_pos(buttonZpos, 350, 86);
216 185
 
217
-  #endif // if 1
186
+  buttonPause = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
187
+  buttonStop = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
188
+  buttonOperat = lv_imgbtn_create(scr, "F:/bmp_operate.bin", 325, 240, event_handler, ID_OPTION);
218 189
 
219 190
   #if HAS_ROTARY_ENCODER
220 191
     if (gCfgItems.encoder_enable) {
@@ -224,71 +195,37 @@ void lv_draw_printing(void) {
224 195
     }
225 196
   #endif
226 197
 
227
-  lv_obj_set_pos(buttonExt1, 205, 136);
228
-
229
-  #if HAS_MULTI_EXTRUDER
230
-    lv_obj_set_pos(buttonExt2, 350, 136);
231
-  #endif
232
-
233
-  #if HAS_HEATED_BED
234
-    lv_obj_set_pos(buttonBedstate, 205, 186);
235
-  #endif
236
-
237
-  lv_obj_set_pos(buttonFanstate, 350, 186);
238
-  lv_obj_set_pos(buttonTime, 205, 86);
239
-  lv_obj_set_pos(buttonZpos, 350, 86);
240
-  lv_obj_set_pos(buttonPause, 5, 240);
241
-  lv_obj_set_pos(buttonStop, 165, 240);
242
-  lv_obj_set_pos(buttonOperat, 325, 240);
243
-
244 198
   // Create labels on the image buttons
245 199
   //lv_btn_set_layout(buttonExt1, LV_LAYOUT_OFF);
246 200
   //#if HAS_MULTI_EXTRUDER
247
-    //lv_btn_set_layout(buttonExt2, LV_LAYOUT_OFF);
201
+  //  lv_btn_set_layout(buttonExt2, LV_LAYOUT_OFF);
248 202
   //#endif
249 203
 
250 204
   //#if HAS_HEATED_BED
251
-    //lv_btn_set_layout(buttonBedstate, LV_LAYOUT_OFF);
205
+  //  lv_btn_set_layout(buttonBedstate, LV_LAYOUT_OFF);
252 206
   //#endif
253 207
 
254 208
   //lv_btn_set_layout(buttonFanstate, LV_LAYOUT_OFF);
255 209
   //lv_btn_set_layout(buttonTime, LV_LAYOUT_OFF);
256 210
   //lv_btn_set_layout(buttonZpos, LV_LAYOUT_OFF);
257
-  lv_btn_set_layout(buttonPause, LV_LAYOUT_OFF);
258
-  lv_btn_set_layout(buttonStop, LV_LAYOUT_OFF);
259
-  lv_btn_set_layout(buttonOperat, LV_LAYOUT_OFF);
260 211
 
261
-  labelExt1 = lv_label_create(scr, NULL);
262
-  lv_obj_set_style(labelExt1, &tft_style_label_rel);
263
-  lv_obj_set_pos(labelExt1, 250, 146);
212
+  labelExt1 = lv_label_create(scr, 250, 146, NULL);
264 213
 
265 214
   #if HAS_MULTI_EXTRUDER
266
-    labelExt2 = lv_label_create(scr, NULL);
267
-    lv_obj_set_style(labelExt2, &tft_style_label_rel);
268
-    lv_obj_set_pos(labelExt2, 395, 146);
215
+    labelExt2 = lv_label_create(scr, 395, 146, NULL);
269 216
   #endif
270 217
 
271 218
   #if HAS_HEATED_BED
272
-    labelBed = lv_label_create(scr, NULL);
273
-    lv_obj_set_style(labelBed, &tft_style_label_rel);
274
-    lv_obj_set_pos(labelBed, 250, 196);
219
+    labelBed = lv_label_create(scr, 250, 196, NULL);
275 220
   #endif
276 221
 
277
-  labelFan = lv_label_create(scr, NULL);
278
-  lv_obj_set_style(labelFan, &tft_style_label_rel);
279
-  lv_obj_set_pos(labelFan, 395, 196);
280
-
281
-  labelTime = lv_label_create(scr, NULL);
282
-  lv_obj_set_style(labelTime, &tft_style_label_rel);
283
-  lv_obj_set_pos(labelTime, 250, 96);
284
-
285
-  labelZpos = lv_label_create(scr, NULL);
286
-  lv_obj_set_style(labelZpos, &tft_style_label_rel);
287
-  lv_obj_set_pos(labelZpos, 395, 96);
222
+  labelFan = lv_label_create(scr, 395, 196, NULL);
223
+  labelTime = lv_label_create(scr, 250, 96, NULL);
224
+  labelZpos = lv_label_create(scr, 395, 96, NULL);
288 225
 
289
-  labelPause  = lv_label_create(buttonPause, NULL);
290
-  labelStop   = lv_label_create(buttonStop, NULL);
291
-  labelOperat = lv_label_create(buttonOperat, NULL);
226
+  labelPause  = lv_label_create_empty(buttonPause);
227
+  labelStop   = lv_label_create_empty(buttonStop);
228
+  labelOperat = lv_label_create_empty(buttonOperat);
292 229
 
293 230
   if (gCfgItems.multiple_language) {
294 231
     lv_label_set_text(labelPause, uiCfg.print_state == WORKING ? printing_menu.pause : printing_menu.resume);
@@ -307,7 +244,7 @@ void lv_draw_printing(void) {
307 244
   lv_bar_set_style(bar1, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
308 245
   lv_bar_set_anim_time(bar1, 1000);
309 246
   lv_bar_set_value(bar1, 0, LV_ANIM_ON);
310
-  bar1ValueText  = lv_label_create(bar1, NULL);
247
+  bar1ValueText  = lv_label_create_empty(bar1);
311 248
   lv_label_set_text(bar1ValueText,"0%");
312 249
   lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
313 250
 

+ 35
- 67
Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp Vedi File

@@ -41,7 +41,7 @@
41 41
 
42 42
 #include <stdio.h>
43 43
 
44
-//static lv_obj_t *buttonPrint,*buttonTool,*buttonSet;
44
+//static lv_obj_t *buttonPrint, *buttonTool, *buttonSet;
45 45
 extern lv_group_t*  g;
46 46
 static lv_obj_t * scr;
47 47
 #if ENABLED(MKS_TEST)
@@ -112,8 +112,8 @@ void disp_det_error() {
112 112
 lv_obj_t *e1, *e2, *e3, *bed;
113 113
 void mks_disp_test() {
114 114
   char buf[30] = {0};
115
-  //lv_obj_t *label_tool2 = lv_label_create(scr, NULL);
116
-  //lv_obj_set_pos(label_tool,20,50);
115
+  //lv_obj_t *label_tool2 = lv_label_create_empty(scr);
116
+  //lv_obj_set_pos(label_tool, 20, 50);
117 117
   ZERO(buf);
118 118
   sprintf_P(buf, PSTR("e1:%d"), (int)thermalManager.temp_hotend[0].celsius);
119 119
   lv_label_set_text(e1, buf);
@@ -148,82 +148,71 @@ void lv_draw_ready_print(void) {
148 148
   lv_obj_set_style(scr, &tft_style_scr);
149 149
   lv_scr_load(scr);
150 150
   lv_obj_clean(scr);
151
-  //lv_obj_set_hidden(scr,true);
151
+  //lv_obj_set_hidden(scr, true);
152 152
   lv_refr_now(lv_refr_get_disp_refreshing());
153 153
 
154 154
   if (mks_test_flag == 0x1E) {
155
-    //lv_obj_t * title = lv_label_create(scr, NULL);
156
-    //lv_obj_set_style(title, &tft_style_label_rel);
157
-    //lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS);
158
-    //lv_label_set_text(title, creat_title_text());
155
+    //(void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
159 156
 
160 157
     // Create image buttons
161 158
     //buttonPrint = lv_imgbtn_create(scr, NULL);
162
-    buttonTool = lv_imgbtn_create(scr, NULL);
163
-    //buttonSet = lv_imgbtn_create(scr, NULL);
164
-
165
-    #if 1
166
-      lv_obj_set_event_cb_mks(buttonTool, event_handler, ID_TOOL, NULL, 0);
167
-      lv_imgbtn_set_src(buttonTool, LV_BTN_STATE_REL, "F:/bmp_tool.bin");
168
-      lv_imgbtn_set_src(buttonTool, LV_BTN_STATE_PR, "F:/bmp_tool.bin");
169
-      lv_imgbtn_set_style(buttonTool, LV_BTN_STATE_PR, &tft_style_label_pre);
170
-      lv_imgbtn_set_style(buttonTool, LV_BTN_STATE_REL, &tft_style_label_rel);
171
-    #endif
159
+    buttonTool = lv_imgbtn_create(scr, "F:/bmp_tool.bin", event_handler, ID_TOOL);
172 160
 
173 161
     lv_obj_set_pos(buttonTool, 360, 180);
174
-    //lv_obj_set_pos(buttonSet,180,90);
175
-    //lv_obj_set_pos(buttonPrint,340,90);
176 162
 
177
-    //lv_obj_set_pos(buttonTool,SIMPLE_FIRST_PAGE_GRAP+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
178
-    //lv_obj_set_pos(buttonSet,BTN_X_PIXEL+SIMPLE_FIRST_PAGE_GRAP*2+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
179
-    //lv_obj_set_pos(buttonPrint,BTN_X_PIXEL*2+SIMPLE_FIRST_PAGE_GRAP*3+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
163
+    //buttonSet = lv_imgbtn_create(scr, NULL);
164
+    //lv_obj_set_pos(buttonSet, 180, 90);
165
+    //lv_obj_set_pos(buttonPrint, 340, 90);
166
+
167
+    //lv_obj_set_pos(buttonTool, SIMPLE_FIRST_PAGE_GRAP+1, (TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
168
+    //lv_obj_set_pos(buttonSet, BTN_X_PIXEL+SIMPLE_FIRST_PAGE_GRAP*2+1, (TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
169
+    //lv_obj_set_pos(buttonPrint, BTN_X_PIXEL*2+SIMPLE_FIRST_PAGE_GRAP*3+1, (TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
180 170
 
181 171
     // Create labels on the image buttons
182 172
     //lv_btn_set_layout(buttonPrint, LV_LAYOUT_OFF);
183 173
     //lv_btn_set_layout(buttonSet, LV_LAYOUT_OFF);
184
-    lv_btn_set_layout(buttonTool, LV_LAYOUT_OFF);
185 174
 
186
-    //lv_obj_t *label_print = lv_label_create(buttonPrint, NULL);
187
-    //lv_obj_t *label_set = lv_label_create(buttonSet, NULL);
188
-    lv_obj_t *label_tool = lv_label_create(buttonTool, NULL);
175
+    //lv_obj_t *label_print = lv_label_create_empty(buttonPrint);
176
+    //lv_obj_t *label_set = lv_label_create_empty(buttonSet);
177
+    lv_obj_t *label_tool = lv_label_create_empty(buttonTool);
189 178
     if (gCfgItems.multiple_language) {
190 179
       //lv_label_set_text(label_print, main_menu.print);
191
-      //lv_obj_align(label_print, buttonPrint, LV_ALIGN_IN_BOTTOM_MID,0, BUTTON_TEXT_Y_OFFSET);
180
+      //lv_obj_align(label_print, buttonPrint, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
192 181
 
193 182
       //lv_label_set_text(label_set, main_menu.set);
194
-      //lv_obj_align(label_set, buttonSet, LV_ALIGN_IN_BOTTOM_MID,0, BUTTON_TEXT_Y_OFFSET);
183
+      //lv_obj_align(label_set, buttonSet, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
195 184
 
196
-      //lv_label_set_style(label_tool,LV_BTN_STATE_PR,&tft_style_label_pre);
197
-      //lv_label_set_style(label_tool,LV_BTN_STATE_REL,&tft_style_label_rel);
185
+      //lv_label_set_style(label_tool, LV_BTN_STATE_PR, &tft_style_label_pre);
186
+      //lv_label_set_style(label_tool, LV_BTN_STATE_REL, &tft_style_label_rel);
198 187
       lv_label_set_text(label_tool, main_menu.tool);
199 188
       lv_obj_align(label_tool, buttonTool, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
200 189
     }
201 190
 
202 191
     #if 1
203
-      e1 = lv_label_create(scr, NULL);
192
+      e1 = lv_label_create_empty(scr);
204 193
       lv_obj_set_pos(e1, 20, 20);
205 194
       sprintf_P(buf, PSTR("e1:  %d"), (int)thermalManager.temp_hotend[0].celsius);
206 195
       lv_label_set_text(e1, buf);
207 196
       #if HAS_MULTI_HOTEND
208
-        e2 = lv_label_create(scr, NULL);
197
+        e2 = lv_label_create_empty(scr);
209 198
         lv_obj_set_pos(e2, 20, 45);
210 199
         sprintf_P(buf, PSTR("e1:  %d"), (int)thermalManager.temp_hotend[1].celsius);
211 200
         lv_label_set_text(e2, buf);
212 201
       #endif
213 202
 
214
-      //e3 = lv_label_create(scr, NULL);
215
-      //lv_obj_set_pos(e3,20,70);
203
+      //e3 = lv_label_create_empty(scr);
204
+      //lv_obj_set_pos(e3, 20, 70);
216 205
       //sprintf_P(buf, PSTR("e1:  %d"), (int)thermalManager.temp_hotend[2].celsius);
217 206
       //lv_label_set_text(e3, buf);
218 207
 
219 208
       #if HAS_HEATED_BED
220
-        bed = lv_label_create(scr, NULL);
209
+        bed = lv_label_create_empty(scr);
221 210
         lv_obj_set_pos(bed, 20, 95);
222 211
         sprintf_P(buf, PSTR("bed:  %d"), (int)thermalManager.temp_bed.celsius);
223 212
         lv_label_set_text(bed, buf);
224 213
       #endif
225 214
 
226
-      limit_info = lv_label_create(scr, NULL);
215
+      limit_info = lv_label_create_empty(scr);
227 216
 
228 217
       lv_style_copy(&limit_style, &lv_style_scr);
229 218
       limit_style.body.main_color.full = 0X0000;
@@ -234,7 +223,7 @@ void lv_draw_ready_print(void) {
234 223
       lv_obj_set_pos(limit_info, 20, 120);
235 224
       lv_label_set_text(limit_info, " ");
236 225
 
237
-      det_info = lv_label_create(scr, NULL);
226
+      det_info = lv_label_create_empty(scr);
238 227
 
239 228
       lv_style_copy(&det_style, &lv_style_scr);
240 229
       det_style.body.main_color.full = 0X0000;
@@ -249,35 +238,14 @@ void lv_draw_ready_print(void) {
249 238
   }
250 239
   else {
251 240
     // Create an Image button
252
-    buttonTool = lv_imgbtn_create(scr, NULL);
253
-    lv_obj_set_pos(buttonTool, 20, 90);
254
-    lv_obj_set_event_cb_mks(buttonTool, event_handler, ID_TOOL, NULL, 0);
255
-    lv_imgbtn_set_src(buttonTool, LV_BTN_STATE_REL, "F:/bmp_tool.bin");
256
-    lv_imgbtn_set_src(buttonTool, LV_BTN_STATE_PR, "F:/bmp_tool.bin");
257
-    lv_imgbtn_set_style(buttonTool, LV_BTN_STATE_PR, &tft_style_label_pre);
258
-    lv_imgbtn_set_style(buttonTool, LV_BTN_STATE_REL, &tft_style_label_rel);
259
-    lv_obj_t *label_tool  = lv_label_create(buttonTool, NULL);
260
-    lv_btn_set_layout(buttonTool, LV_LAYOUT_OFF);
261
-
262
-    buttonSet = lv_imgbtn_create(scr, NULL);
263
-    lv_obj_set_pos(buttonSet, 180, 90);
264
-    lv_obj_set_event_cb_mks(buttonSet, event_handler, ID_SET, NULL, 0);
265
-    lv_imgbtn_set_src(buttonSet, LV_BTN_STATE_REL, "F:/bmp_set.bin");
266
-    lv_imgbtn_set_src(buttonSet, LV_BTN_STATE_PR, "F:/bmp_set.bin");
267
-    lv_imgbtn_set_style(buttonSet, LV_BTN_STATE_PR, &tft_style_label_pre);
268
-    lv_imgbtn_set_style(buttonSet, LV_BTN_STATE_REL, &tft_style_label_rel);
269
-    lv_obj_t *label_set   = lv_label_create(buttonSet, NULL);
270
-    lv_btn_set_layout(buttonSet, LV_LAYOUT_OFF);
271
-
272
-    buttonPrint = lv_imgbtn_create(scr, NULL);
273
-    lv_obj_set_pos(buttonPrint, 340, 90);
274
-    lv_obj_set_event_cb_mks(buttonPrint, event_handler, ID_PRINT, NULL, 0);
275
-    lv_imgbtn_set_src(buttonPrint, LV_BTN_STATE_REL, "F:/bmp_printing.bin");
276
-    lv_imgbtn_set_src(buttonPrint, LV_BTN_STATE_PR, "F:/bmp_printing.bin");
277
-    lv_imgbtn_set_style(buttonPrint, LV_BTN_STATE_PR, &tft_style_label_pre);
278
-    lv_imgbtn_set_style(buttonPrint, LV_BTN_STATE_REL, &tft_style_label_rel);
279
-    lv_obj_t *label_print = lv_label_create(buttonPrint, NULL);
280
-    lv_btn_set_layout(buttonPrint, LV_LAYOUT_OFF);
241
+    buttonTool = lv_imgbtn_create(scr, "F:/bmp_tool.bin", 20, 90, event_handler, ID_TOOL);
242
+    lv_obj_t *label_tool = lv_label_create_empty(buttonTool);
243
+
244
+    buttonSet = lv_imgbtn_create(scr, "F:/bmp_set.bin", 180, 90, event_handler, ID_SET);
245
+    lv_obj_t *label_set = lv_label_create_empty(buttonSet);
246
+
247
+    buttonPrint = lv_imgbtn_create(scr, "F:/bmp_printing.bin", 340, 90, event_handler, ID_PRINT);
248
+    lv_obj_t *label_print = lv_label_create_empty(buttonPrint);
281 249
 
282 250
     if (gCfgItems.multiple_language) {
283 251
       lv_label_set_text(label_print, main_menu.print);

+ 21
- 113
Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp Vedi File

@@ -194,89 +194,25 @@ void lv_draw_set(void) {
194 194
   lv_scr_load(scr);
195 195
   lv_obj_clean(scr);
196 196
 
197
-  lv_obj_t * title = lv_label_create(scr, NULL);
198
-  lv_obj_set_style(title, &tft_style_label_rel);
199
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
200
-  lv_label_set_text(title, creat_title_text());
197
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
201 198
 
202 199
   lv_refr_now(lv_refr_get_disp_refreshing());
203 200
 
204 201
   // Create image buttons
205
-  buttonEepromSet   = lv_imgbtn_create(scr, NULL);
206
-  //buttonWifi      = lv_imgbtn_create(scr, NULL);
207
-  buttonFan         = lv_imgbtn_create(scr, NULL);
208
-  buttonAbout       = lv_imgbtn_create(scr, NULL);
209
-  //buttonContinue  = lv_imgbtn_create(scr, NULL);
210
-  buMotorOff        = lv_imgbtn_create(scr, NULL);
211
-  buttonMachinePara = lv_imgbtn_create(scr, NULL);
202
+  buttonEepromSet = lv_imgbtn_create(scr, "F:/bmp_eeprom_settings.bin", INTERVAL_V, titleHeight, event_handler, ID_S_EEPROM_SET);
203
+  //buttonWifi = lv_imgbtn_create(scr, NULL);
204
+  buttonFan = lv_imgbtn_create(scr, "F:/bmp_fan.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_S_FAN);
205
+  buttonAbout = lv_imgbtn_create(scr, "F:/bmp_about.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_S_ABOUT);
206
+  //buttonContinue = lv_imgbtn_create(scr, NULL);
207
+  buMotorOff = lv_imgbtn_create(scr, ENABLED(HAS_SUICIDE) ? "F:/bmp_manual_off.bin" : "F:/bmp_function1.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_S_MOTOR_OFF);
208
+  buttonMachinePara = lv_imgbtn_create(scr, "F:/bmp_machine_para.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_MACHINE_PARA);
212 209
   #if HAS_LANG_SELECT_SCREEN
213
-    buttonLanguage  = lv_imgbtn_create(scr, NULL);
210
+    buttonLanguage = lv_imgbtn_create(scr, "F:/bmp_language.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_LANGUAGE);
214 211
   #endif
215 212
   #if ENABLED(USE_WIFI_FUNCTION)
216
-  buttonWifi        = lv_imgbtn_create(scr, NULL);
213
+    buttonWifi = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_WIFI);
217 214
   #endif
218
-  buttonBack        = lv_imgbtn_create(scr, NULL);
219
-
220
-  lv_obj_set_event_cb_mks(buttonEepromSet, event_handler, ID_S_EEPROM_SET, NULL, 0);
221
-  lv_imgbtn_set_src(buttonEepromSet, LV_BTN_STATE_REL, "F:/bmp_eeprom_settings.bin");
222
-  lv_imgbtn_set_src(buttonEepromSet, LV_BTN_STATE_PR, "F:/bmp_eeprom_settings.bin");
223
-  lv_imgbtn_set_style(buttonEepromSet, LV_BTN_STATE_PR, &tft_style_label_pre);
224
-  lv_imgbtn_set_style(buttonEepromSet, LV_BTN_STATE_REL, &tft_style_label_rel);
225
-
226
-  #if 1
227
-    lv_obj_set_event_cb_mks(buttonFan, event_handler, ID_S_FAN, NULL, 0);
228
-    lv_imgbtn_set_src(buttonFan, LV_BTN_STATE_REL, "F:/bmp_fan.bin");
229
-    lv_imgbtn_set_src(buttonFan, LV_BTN_STATE_PR, "F:/bmp_fan.bin");
230
-    lv_imgbtn_set_style(buttonFan, LV_BTN_STATE_PR, &tft_style_label_pre);
231
-    lv_imgbtn_set_style(buttonFan, LV_BTN_STATE_REL, &tft_style_label_rel);
232
-
233
-    lv_obj_set_event_cb_mks(buttonAbout, event_handler, ID_S_ABOUT, NULL, 0);
234
-    lv_imgbtn_set_src(buttonAbout, LV_BTN_STATE_REL, "F:/bmp_about.bin");
235
-    lv_imgbtn_set_src(buttonAbout, LV_BTN_STATE_PR, "F:/bmp_about.bin");
236
-    lv_imgbtn_set_style(buttonAbout, LV_BTN_STATE_PR, &tft_style_label_pre);
237
-    lv_imgbtn_set_style(buttonAbout, LV_BTN_STATE_REL, &tft_style_label_rel);
238
-
239
-    lv_obj_set_event_cb_mks(buMotorOff, event_handler, ID_S_MOTOR_OFF, NULL, 0);
240
-
241
-    #if HAS_SUICIDE
242
-      lv_imgbtn_set_src(buMotorOff, LV_BTN_STATE_REL, "F:/bmp_manual_off.bin");
243
-      lv_imgbtn_set_src(buMotorOff, LV_BTN_STATE_PR, "F:/bmp_manual_off.bin");
244
-    #else
245
-      lv_imgbtn_set_src(buMotorOff, LV_BTN_STATE_REL, "F:/bmp_function1.bin");
246
-      lv_imgbtn_set_src(buMotorOff, LV_BTN_STATE_PR, "F:/bmp_function1.bin");
247
-    #endif
248
-    lv_imgbtn_set_style(buMotorOff, LV_BTN_STATE_PR, &tft_style_label_pre);
249
-    lv_imgbtn_set_style(buMotorOff, LV_BTN_STATE_REL, &tft_style_label_rel);
250
-
251
-    lv_obj_set_event_cb_mks(buttonMachinePara, event_handler, ID_S_MACHINE_PARA, NULL, 0);
252
-    lv_imgbtn_set_src(buttonMachinePara, LV_BTN_STATE_REL, "F:/bmp_machine_para.bin");
253
-    lv_imgbtn_set_src(buttonMachinePara, LV_BTN_STATE_PR, "F:/bmp_machine_para.bin");
254
-    lv_imgbtn_set_style(buttonMachinePara, LV_BTN_STATE_PR, &tft_style_label_pre);
255
-    lv_imgbtn_set_style(buttonMachinePara, LV_BTN_STATE_REL, &tft_style_label_rel);
256
-
257
-    #if HAS_LANG_SELECT_SCREEN
258
-      lv_obj_set_event_cb_mks(buttonLanguage, event_handler, ID_S_LANGUAGE, NULL, 0);
259
-      lv_imgbtn_set_src(buttonLanguage, LV_BTN_STATE_REL, "F:/bmp_language.bin");
260
-      lv_imgbtn_set_src(buttonLanguage, LV_BTN_STATE_PR, "F:/bmp_language.bin");
261
-      lv_imgbtn_set_style(buttonLanguage, LV_BTN_STATE_PR, &tft_style_label_pre);
262
-      lv_imgbtn_set_style(buttonLanguage, LV_BTN_STATE_REL, &tft_style_label_rel);
263
-    #endif
264
-
265
-    #if ENABLED(USE_WIFI_FUNCTION)
266
-      lv_obj_set_event_cb_mks(buttonWifi, event_handler,ID_S_WIFI,NULL,0);
267
-      lv_imgbtn_set_src(buttonWifi, LV_BTN_STATE_REL, "F:/bmp_wifi.bin");
268
-      lv_imgbtn_set_src(buttonWifi, LV_BTN_STATE_PR, "F:/bmp_wifi.bin");
269
-      lv_imgbtn_set_style(buttonWifi, LV_BTN_STATE_PR, &tft_style_label_pre);
270
-      lv_imgbtn_set_style(buttonWifi, LV_BTN_STATE_REL, &tft_style_label_rel);
271
-    #endif
272
-
273
-    lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_S_RETURN,NULL , 0);
274
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
275
-    lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
276
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
277
-    lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
278
-
279
-  #endif // if 1
215
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_RETURN);
280 216
 
281 217
   /*lv_obj_set_pos(buttonWifi,INTERVAL_V,titleHeight);
282 218
   lv_obj_set_pos(buttonFan,BTN_X_PIXEL+INTERVAL_V*2,titleHeight);
@@ -287,51 +223,23 @@ void lv_draw_set(void) {
287 223
   lv_obj_set_pos(buttonBack,BTN_X_PIXEL*3+INTERVAL_V*4, BTN_Y_PIXEL+INTERVAL_H+titleHeight);*/
288 224
 
289 225
   //lv_obj_set_pos(buttonWifi,INTERVAL_V,titleHeight);
290
-  lv_obj_set_pos(buttonEepromSet, INTERVAL_V, titleHeight);
291
-  lv_obj_set_pos(buttonFan, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
292
-  lv_obj_set_pos(buttonAbout, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
293 226
   //lv_obj_set_pos(buttonContinue,BTN_X_PIXEL*3+INTERVAL_V*4,titleHeight);
294
-  lv_obj_set_pos(buMotorOff, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
295
-
296
-  lv_obj_set_pos(buttonMachinePara, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
297
-  #if HAS_LANG_SELECT_SCREEN
298
-    lv_obj_set_pos(buttonLanguage, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
299
-  #endif
300
-  #if ENABLED(USE_WIFI_FUNCTION)
301
-    lv_obj_set_pos(buttonWifi,BTN_X_PIXEL*2+INTERVAL_V*3,BTN_Y_PIXEL+INTERVAL_H+titleHeight);
302
-  #endif
303
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
304 227
 
305 228
   /// Create labels on the buttons
306
-  //lv_btn_set_layout(buttonWifi, LV_LAYOUT_OFF);
307
-  lv_btn_set_layout(buttonEepromSet, LV_LAYOUT_OFF);
308
-  lv_btn_set_layout(buttonFan, LV_LAYOUT_OFF);
309
-  lv_btn_set_layout(buttonAbout, LV_LAYOUT_OFF);
310
-  //lv_btn_set_layout(buttonContinue, LV_LAYOUT_OFF);
311
-  lv_btn_set_layout(buMotorOff, LV_LAYOUT_OFF);
312
-  lv_btn_set_layout(buttonMachinePara, LV_LAYOUT_OFF);
313
-  #if HAS_LANG_SELECT_SCREEN
314
-    lv_btn_set_layout(buttonLanguage, LV_LAYOUT_OFF);
315
-  #endif
316
-  #if ENABLED(USE_WIFI_FUNCTION)
317
-    lv_btn_set_layout(buttonWifi, LV_LAYOUT_OFF);
318
-  #endif
319
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
320
-
321
-  //lv_obj_t *labelWifi= lv_label_create(buttonWifi, NULL);
322
-  lv_obj_t *label_EepromSet   = lv_label_create(buttonEepromSet, NULL);
323
-  lv_obj_t *labelFan          = lv_label_create(buttonFan, NULL);
324
-  lv_obj_t *label_About       = lv_label_create(buttonAbout, NULL);
325
-  //lv_obj_t *label_Continue  = lv_label_create(buttonContinue, NULL);
326
-  lv_obj_t *label_MotorOff    = lv_label_create(buMotorOff, NULL);
327
-  lv_obj_t *label_MachinePara = lv_label_create(buttonMachinePara, NULL);
229
+  //lv_obj_t *labelWifi= lv_label_create_empty(buttonWifi);
230
+  lv_obj_t *label_EepromSet   = lv_label_create_empty(buttonEepromSet);
231
+  lv_obj_t *labelFan          = lv_label_create_empty(buttonFan);
232
+  lv_obj_t *label_About       = lv_label_create_empty(buttonAbout);
233
+  //lv_obj_t *label_Continue  = lv_label_create_empty(buttonContinue);
234
+  lv_obj_t *label_MotorOff    = lv_label_create_empty(buMotorOff);
235
+  lv_obj_t *label_MachinePara = lv_label_create_empty(buttonMachinePara);
328 236
   #if HAS_LANG_SELECT_SCREEN
329
-    lv_obj_t *label_Language  = lv_label_create(buttonLanguage, NULL);
237
+    lv_obj_t *label_Language  = lv_label_create_empty(buttonLanguage);
330 238
   #endif
331 239
   #if ENABLED(USE_WIFI_FUNCTION)
332
-    lv_obj_t *label_Wifi      = lv_label_create(buttonWifi, NULL);
240
+    lv_obj_t *label_Wifi      = lv_label_create_empty(buttonWifi);
333 241
   #endif
334
-  lv_obj_t *label_Back        = lv_label_create(buttonBack, NULL);
242
+  lv_obj_t *label_Back        = lv_label_create_empty(buttonBack);
335 243
 
336 244
   if (gCfgItems.multiple_language) {
337 245
 

+ 29
- 79
Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp Vedi File

@@ -128,12 +128,12 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
128 128
 
129 129
 void lv_draw_step_settings(void) {
130 130
   lv_obj_t *buttonBack = NULL, *label_Back = NULL, *buttonTurnPage = NULL, *labelTurnPage = NULL;
131
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
132
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
133
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
134
-  lv_obj_t *labelE0Text = NULL, *buttonE0Value = NULL, *labelE0Value = NULL;
135
-  lv_obj_t *labelE1Text = NULL, *buttonE1Value = NULL, *labelE1Value = NULL;
136
-  lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
131
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
132
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
133
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
134
+  lv_obj_t *buttonE0Value = NULL, *labelE0Value = NULL;
135
+  lv_obj_t *buttonE1Value = NULL, *labelE1Value = NULL;
136
+  lv_obj_t *line1 = NULL, *line2 = NULL, *line3 = NULL, *line4 = NULL;
137 137
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != STEPS_UI) {
138 138
     disp_state_stack._disp_index++;
139 139
     disp_state_stack._disp_state[disp_state_stack._disp_index] = STEPS_UI;
@@ -146,82 +146,44 @@ void lv_draw_step_settings(void) {
146 146
   lv_scr_load(scr);
147 147
   lv_obj_clean(scr);
148 148
 
149
-  lv_obj_t * title = lv_label_create(scr, NULL);
150
-  lv_obj_set_style(title, &tft_style_label_rel);
151
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
152
-  lv_label_set_text(title, machine_menu.StepsConfTitle);
149
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.StepsConfTitle);
153 150
 
154 151
   lv_refr_now(lv_refr_get_disp_refreshing());
155 152
 
156 153
   if (uiCfg.para_ui_page != 1) {
157
-    labelXText = lv_label_create(scr, NULL);
158
-    lv_obj_set_style(labelXText, &tft_style_label_rel);
159
-    lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
160
-    lv_label_set_text(labelXText, machine_menu.X_Steps);
161
-
162
-    buttonXValue = lv_btn_create(scr, NULL);
163
-    lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
164
-    lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
165
-    lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_STEP_X, NULL, 0);
166
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
167
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
168
-    labelXValue = lv_label_create(buttonXValue, NULL);
154
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.X_Steps);
155
+
156
+    buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_STEP_X);
157
+    labelXValue = lv_label_create_empty(buttonXValue);
169 158
 
170 159
     line1 = lv_line_create(scr, NULL);
171 160
     lv_ex_line(line1, line_points[0]);
172 161
 
173
-    labelYText = lv_label_create(scr, NULL);
174
-    lv_obj_set_style(labelYText, &tft_style_label_rel);
175
-    lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
176
-    lv_label_set_text(labelYText, machine_menu.Y_Steps);
162
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.Y_Steps);
177 163
 
178
-    buttonYValue = lv_btn_create(scr, NULL);
179
-    lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
180
-    lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
181
-    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_STEP_Y, NULL, 0);
182
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
183
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
184
-    labelYValue = lv_label_create(buttonYValue, NULL);
164
+    buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_STEP_Y);
165
+    labelYValue = lv_label_create_empty(buttonYValue);
185 166
 
186 167
     line2 = lv_line_create(scr, NULL);
187 168
     lv_ex_line(line2, line_points[1]);
188 169
 
189
-    labelZText = lv_label_create(scr, NULL);
190
-    lv_obj_set_style(labelZText, &tft_style_label_rel);
191
-    lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
192
-    lv_label_set_text(labelZText, machine_menu.Z_Steps);
170
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.Z_Steps);
193 171
 
194
-    buttonZValue = lv_btn_create(scr, NULL);
195
-    lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
196
-    lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
197
-    lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_STEP_Z, NULL, 0);
198
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
199
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
200
-    labelZValue = lv_label_create(buttonZValue, NULL);
172
+    buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_STEP_Z);
173
+    labelZValue = lv_label_create_empty(buttonZValue);
201 174
 
202 175
     line3 = lv_line_create(scr, NULL);
203 176
     lv_ex_line(line3, line_points[2]);
204 177
 
205
-    labelE0Text = lv_label_create(scr, NULL);
206
-    lv_obj_set_style(labelE0Text, &tft_style_label_rel);
207
-    lv_obj_set_pos(labelE0Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
208
-    lv_label_set_text(labelE0Text, machine_menu.E0_Steps);
178
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.E0_Steps);
209 179
 
210
-    buttonE0Value = lv_btn_create(scr, NULL);
211
-    lv_obj_set_pos(buttonE0Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V);
212
-    lv_obj_set_size(buttonE0Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
213
-    lv_obj_set_event_cb_mks(buttonE0Value, event_handler, ID_STEP_E0, NULL, 0);
214
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_REL, &style_para_value);
215
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_PR, &style_para_value);
216
-    labelE0Value = lv_label_create(buttonE0Value, NULL);
180
+    buttonE0Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_STEP_E0);
181
+    labelE0Value = lv_label_create_empty(buttonE0Value);
217 182
 
218 183
     line4 = lv_line_create(scr, NULL);
219 184
     lv_ex_line(line4, line_points[3]);
220 185
 
221
-    buttonTurnPage = lv_btn_create(scr, NULL);
222
-    lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_STEP_DOWN, NULL, 0);
223
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
224
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
186
+    buttonTurnPage = lv_btn_create(scr, event_handler, ID_STEP_DOWN);
225 187
 
226 188
     #if HAS_ROTARY_ENCODER
227 189
       if (gCfgItems.encoder_enable) {
@@ -234,26 +196,15 @@ void lv_draw_step_settings(void) {
234 196
     #endif
235 197
   }
236 198
   else {
237
-    labelE1Text = lv_label_create(scr, NULL);
238
-    lv_obj_set_style(labelE1Text, &tft_style_label_rel);
239
-    lv_obj_set_pos(labelE1Text, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
240
-    lv_label_set_text(labelE1Text, machine_menu.E1_Steps);
241
-
242
-    buttonE1Value = lv_btn_create(scr, NULL);
243
-    lv_obj_set_pos(buttonE1Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
244
-    lv_obj_set_size(buttonE1Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
245
-    lv_obj_set_event_cb_mks(buttonE1Value, event_handler, ID_STEP_E1, NULL, 0);
246
-    lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_REL, &style_para_value);
247
-    lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_PR, &style_para_value);
248
-    labelE1Value = lv_label_create(buttonE1Value, NULL);
199
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.E1_Steps);
200
+
201
+    buttonE1Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_STEP_E1);
202
+    labelE1Value = lv_label_create_empty(buttonE1Value);
249 203
 
250 204
     line1 = lv_line_create(scr, NULL);
251 205
     lv_ex_line(line1, line_points[0]);
252 206
 
253
-    buttonTurnPage = lv_btn_create(scr, NULL);
254
-    lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_STEP_UP, NULL, 0);
255
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
256
-    lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
207
+    buttonTurnPage = lv_btn_create(scr, event_handler, ID_STEP_UP);
257 208
 
258 209
     #if HAS_ROTARY_ENCODER
259 210
       if (gCfgItems.encoder_enable) {
@@ -265,15 +216,14 @@ void lv_draw_step_settings(void) {
265 216
 
266 217
   lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
267 218
   lv_obj_set_size(buttonTurnPage, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
268
-  labelTurnPage = lv_label_create(buttonTurnPage, NULL);
219
+  labelTurnPage = lv_label_create_empty(buttonTurnPage);
269 220
 
270 221
   buttonBack = lv_btn_create(scr, NULL);
271
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
272
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
222
+  lv_btn_set_style_both(buttonBack, &style_para_back);
273 223
   lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
274 224
   lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
275 225
   lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_STEP_RETURN, NULL, 0);
276
-  label_Back = lv_label_create(buttonBack, NULL);
226
+  label_Back = lv_label_create_empty(buttonBack);
277 227
   #if HAS_ROTARY_ENCODER
278 228
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
279 229
   #endif

+ 27
- 73
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp Vedi File

@@ -143,10 +143,10 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
143 143
 
144 144
 void lv_draw_tmc_current_settings(void) {
145 145
   lv_obj_t *buttonBack = NULL, *label_Back = NULL;
146
-  lv_obj_t *labelXText = NULL, *buttonXValue = NULL, *labelXValue = NULL;
147
-  lv_obj_t *labelYText = NULL, *buttonYValue = NULL, *labelYValue = NULL;
148
-  lv_obj_t *labelZText = NULL, *buttonZValue = NULL, *labelZValue = NULL;
149
-  lv_obj_t *labelE0Text = NULL, *buttonE0Value = NULL, *labelE0Value = NULL;
146
+  lv_obj_t *buttonXValue = NULL, *labelXValue = NULL;
147
+  lv_obj_t *buttonYValue = NULL, *labelYValue = NULL;
148
+  lv_obj_t *buttonZValue = NULL, *labelZValue = NULL;
149
+  lv_obj_t *buttonE0Value = NULL, *labelE0Value = NULL;
150 150
 
151 151
   lv_obj_t * line1 = NULL, * line2 = NULL, * line3 = NULL, * line4 = NULL;
152 152
   //#if AXIS_IS_TMC(E1)
@@ -167,74 +167,39 @@ void lv_draw_tmc_current_settings(void) {
167 167
   lv_scr_load(scr);
168 168
   lv_obj_clean(scr);
169 169
 
170
-  lv_obj_t * title = lv_label_create(scr, NULL);
171
-  lv_obj_set_style(title, &tft_style_label_rel);
172
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
173
-  lv_label_set_text(title, machine_menu.TmcCurrentConfTitle);
170
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.TmcCurrentConfTitle);
174 171
 
175 172
   lv_refr_now(lv_refr_get_disp_refreshing());
176 173
 
177 174
   if (uiCfg.para_ui_page != 1) {
178
-    labelXText = lv_label_create(scr, NULL);
179
-    lv_obj_set_style(labelXText, &tft_style_label_rel);
180
-    lv_obj_set_pos(labelXText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
181
-    lv_label_set_text(labelXText, machine_menu.X_Current);
182
-
183
-    buttonXValue = lv_btn_create(scr, NULL);
184
-    lv_obj_set_pos(buttonXValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
185
-    lv_obj_set_size(buttonXValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
186
-    lv_obj_set_event_cb_mks(buttonXValue, event_handler, ID_TMC_CURRENT_X, NULL, 0);
187
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_REL, &style_para_value);
188
-    lv_btn_set_style(buttonXValue, LV_BTN_STYLE_PR, &style_para_value);
189
-    labelXValue = lv_label_create(buttonXValue, NULL);
175
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.X_Current);
176
+
177
+    buttonXValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_TMC_CURRENT_X);
178
+    labelXValue = lv_label_create_empty(buttonXValue);
190 179
 
191 180
     line1 = lv_line_create(scr, NULL);
192 181
     lv_ex_line(line1, line_points[0]);
193 182
 
194
-    labelYText = lv_label_create(scr, NULL);
195
-    lv_obj_set_style(labelYText, &tft_style_label_rel);
196
-    lv_obj_set_pos(labelYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
197
-    lv_label_set_text(labelYText, machine_menu.Y_Current);
183
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, machine_menu.Y_Current);
198 184
 
199
-    buttonYValue = lv_btn_create(scr, NULL);
200
-    lv_obj_set_pos(buttonYValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V);
201
-    lv_obj_set_size(buttonYValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
202
-    lv_obj_set_event_cb_mks(buttonYValue, event_handler, ID_TMC_CURRENT_Y, NULL, 0);
203
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_REL, &style_para_value);
204
-    lv_btn_set_style(buttonYValue, LV_BTN_STYLE_PR, &style_para_value);
205
-    labelYValue = lv_label_create(buttonYValue, NULL);
185
+    buttonYValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_TMC_CURRENT_Y);
186
+    labelYValue = lv_label_create_empty(buttonYValue);
206 187
 
207 188
     line2 = lv_line_create(scr, NULL);
208 189
     lv_ex_line(line2, line_points[1]);
209 190
 
210
-    labelZText = lv_label_create(scr, NULL);
211
-    lv_obj_set_style(labelZText, &tft_style_label_rel);
212
-    lv_obj_set_pos(labelZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
213
-    lv_label_set_text(labelZText, machine_menu.Z_Current);
191
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, machine_menu.Z_Current);
214 192
 
215
-    buttonZValue = lv_btn_create(scr, NULL);
216
-    lv_obj_set_pos(buttonZValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V);
217
-    lv_obj_set_size(buttonZValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
218
-    lv_obj_set_event_cb_mks(buttonZValue, event_handler, ID_TMC_CURRENT_Z, NULL, 0);
219
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_REL, &style_para_value);
220
-    lv_btn_set_style(buttonZValue, LV_BTN_STYLE_PR, &style_para_value);
221
-    labelZValue = lv_label_create(buttonZValue, NULL);
193
+    buttonZValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_TMC_CURRENT_Z);
194
+    labelZValue = lv_label_create_empty(buttonZValue);
222 195
 
223 196
     line3 = lv_line_create(scr, NULL);
224 197
     lv_ex_line(line3, line_points[2]);
225 198
 
226
-    labelE0Text = lv_label_create(scr, NULL);
227
-    lv_obj_set_style(labelE0Text, &tft_style_label_rel);
228
-    lv_obj_set_pos(labelE0Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
229
-    lv_label_set_text(labelE0Text, machine_menu.E0_Current);
199
+    (void)lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.E0_Current);
230 200
 
231
-    buttonE0Value = lv_btn_create(scr, NULL);
232
-    lv_obj_set_pos(buttonE0Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V);
233
-    lv_obj_set_size(buttonE0Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
234
-    lv_obj_set_event_cb_mks(buttonE0Value, event_handler, ID_TMC_CURRENT_E0, NULL, 0);
235
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_REL, &style_para_value);
236
-    lv_btn_set_style(buttonE0Value, LV_BTN_STYLE_PR, &style_para_value);
237
-    labelE0Value = lv_label_create(buttonE0Value, NULL);
201
+    buttonE0Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_TMC_CURRENT_E0);
202
+    labelE0Value = lv_label_create_empty(buttonE0Value);
238 203
 
239 204
     #if HAS_ROTARY_ENCODER
240 205
       if (gCfgItems.encoder_enable) {
@@ -251,8 +216,7 @@ void lv_draw_tmc_current_settings(void) {
251 216
     //#if AXIS_IS_TMC(E1)
252 217
       buttonTurnPage = lv_btn_create(scr, NULL);
253 218
       lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_TMC_CURRENT_DOWN, NULL, 0);
254
-      lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
255
-      lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
219
+      lv_btn_set_style_both(buttonTurnPage, &style_para_back);
256 220
 
257 221
       #if HAS_ROTARY_ENCODER
258 222
         if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonTurnPage);
@@ -261,26 +225,17 @@ void lv_draw_tmc_current_settings(void) {
261 225
   }
262 226
   else {
263 227
     //#if AXIS_IS_TMC(E1)
264
-      labelE1Text = lv_label_create(scr, NULL);
265
-      lv_obj_set_style(labelE1Text, &tft_style_label_rel);
266
-      lv_obj_set_pos(labelE1Text, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
267
-      lv_label_set_text(labelE1Text, machine_menu.E1_Current);
268
-
269
-      buttonE1Value = lv_btn_create(scr, NULL);
270
-      lv_obj_set_pos(buttonE1Value, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
271
-      lv_obj_set_size(buttonE1Value, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
272
-      lv_obj_set_event_cb_mks(buttonE1Value, event_handler, ID_TMC_CURRENT_E1, NULL, 0);
273
-      lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_REL, &style_para_value);
274
-      lv_btn_set_style(buttonE1Value, LV_BTN_STYLE_PR, &style_para_value);
275
-      labelE1Value = lv_label_create(buttonE1Value, NULL);
228
+      labelE1Text = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.E1_Current);
229
+
230
+      buttonE1Value = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_TMC_CURRENT_E1);
231
+      labelE1Value = lv_label_create_empty(buttonE1Value);
276 232
 
277 233
       line1 = lv_line_create(scr, NULL);
278 234
       lv_ex_line(line1, line_points[0]);
279 235
 
280 236
       buttonTurnPage = lv_btn_create(scr, NULL);
281 237
       lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_TMC_CURRENT_UP, NULL, 0);
282
-      lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_REL, &style_para_back);
283
-      lv_btn_set_style(buttonTurnPage, LV_BTN_STYLE_PR, &style_para_back);
238
+      lv_btn_set_style_both(buttonTurnPage, &style_para_back);
284 239
 
285 240
       #if HAS_ROTARY_ENCODER
286 241
         if (gCfgItems.encoder_enable) {
@@ -293,13 +248,12 @@ void lv_draw_tmc_current_settings(void) {
293 248
   //#if AXIS_IS_TMC(E1)
294 249
     lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
295 250
     lv_obj_set_size(buttonTurnPage, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
296
-    labelTurnPage = lv_label_create(buttonTurnPage, NULL);
251
+    labelTurnPage = lv_label_create_empty(buttonTurnPage);
297 252
   //#endif
298 253
 
299 254
   buttonBack = lv_btn_create(scr, NULL);
300 255
   lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_TMC_CURRENT_RETURN, NULL, 0);
301
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
302
-  lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
256
+  lv_btn_set_style_both(buttonBack, &style_para_back);
303 257
 
304 258
   #if HAS_ROTARY_ENCODER
305 259
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
@@ -307,7 +261,7 @@ void lv_draw_tmc_current_settings(void) {
307 261
 
308 262
   lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
309 263
   lv_obj_set_size(buttonBack, PARA_UI_BACK_BTN_X_SIZE, PARA_UI_BACK_BTN_Y_SIZE);
310
-  label_Back = lv_label_create(buttonBack, NULL);
264
+  label_Back = lv_label_create_empty(buttonBack);
311 265
 
312 266
   if (gCfgItems.multiple_language) {
313 267
     if (uiCfg.para_ui_page != 1) {

+ 89
- 282
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp Vedi File

@@ -28,9 +28,12 @@
28 28
 
29 29
 #include "../../../../module/stepper/indirection.h"
30 30
 #include "../../../../feature/tmc_util.h"
31
-#include "../../../../gcode/gcode.h"
32 31
 #include "../../../../inc/MarlinConfig.h"
33 32
 
33
+#if ENABLED(EEPROM_SETTINGS)
34
+  #include "../../../../module/settings.h"
35
+#endif
36
+
34 37
 extern lv_group_t * g;
35 38
 static lv_obj_t * scr;
36 39
 
@@ -69,24 +72,16 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
69 72
 
70 73
         }
71 74
         else if (event == LV_EVENT_RELEASED) {
72
-          if (stepperX.stored.stealthChop_enabled) {
73
-            stepperX.stored.stealthChop_enabled = false;
74
-            stepperX.refresh_stepping_mode();
75
-            lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
76
-            lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
77
-            lv_label_set_text(labelXState, machine_menu.disable);
78
-            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
79
-            // gcode.process_subcommands_now_P(PSTR("M500"));
75
+          if (stepperX.toggle_stepping_mode()) {
76
+            lv_imgbtn_set_src_both(buttonXState, "F:/bmp_enable.bin");
77
+            lv_label_set_text(labelXState, machine_menu.enable);
80 78
           }
81 79
           else {
82
-            stepperX.stored.stealthChop_enabled = true;
83
-            stepperX.refresh_stepping_mode();
84
-            lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
85
-            lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
86
-            lv_label_set_text(labelXState, machine_menu.enable);
87
-            // gcode.process_subcommands_now_P(PSTR("M500"));
80
+            lv_imgbtn_set_src_both(buttonXState, "F:/bmp_disable.bin");
81
+            lv_label_set_text(labelXState, machine_menu.disable);
82
+            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
88 83
           }
89
-          gcode.process_subcommands_now_P(PSTR("M500"));
84
+          TERN_(EEPROM_SETTINGS, (void)settings.save());
90 85
         }
91 86
         break;
92 87
     #endif // if AXIS_HAS_STEALTHCHOP(X)
@@ -97,22 +92,16 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
97 92
 
98 93
         }
99 94
         else if (event == LV_EVENT_RELEASED) {
100
-          if (stepperY.stored.stealthChop_enabled) {
101
-            stepperY.stored.stealthChop_enabled = false;
102
-            stepperY.refresh_stepping_mode();
103
-            lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
104
-            lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
105
-            lv_label_set_text(labelYState, machine_menu.disable);
106
-            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
95
+          if (stepperY.toggle_stepping_mode()) {
96
+            lv_imgbtn_set_src_both(buttonYState, "F:/bmp_enable.bin");
97
+            lv_label_set_text(labelYState, machine_menu.enable);
107 98
           }
108 99
           else {
109
-            stepperY.stored.stealthChop_enabled = true;
110
-            stepperY.refresh_stepping_mode();
111
-            lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
112
-            lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
113
-            lv_label_set_text(labelYState, machine_menu.enable);
100
+            lv_imgbtn_set_src_both(buttonYState, "F:/bmp_disable.bin");
101
+            lv_label_set_text(labelYState, machine_menu.disable);
102
+            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
114 103
           }
115
-          gcode.process_subcommands_now_P(PSTR("M500"));
104
+          TERN_(EEPROM_SETTINGS, (void)settings.save());
116 105
         }
117 106
         break;
118 107
     #endif // if AXIS_HAS_STEALTHCHOP(Y)
@@ -123,22 +112,16 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
123 112
 
124 113
         }
125 114
         else if (event == LV_EVENT_RELEASED) {
126
-          if (stepperZ.stored.stealthChop_enabled) {
127
-            stepperZ.stored.stealthChop_enabled = false;
128
-            stepperZ.refresh_stepping_mode();
129
-            lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
130
-            lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
131
-            lv_label_set_text(labelZState, machine_menu.disable);
132
-            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
115
+          if (stepperZ.toggle_stepping_mode()) {
116
+            lv_imgbtn_set_src_both(buttonZState, "F:/bmp_enable.bin");
117
+            lv_label_set_text(labelZState, machine_menu.enable);
133 118
           }
134 119
           else {
135
-            stepperZ.stored.stealthChop_enabled = true;
136
-            stepperZ.refresh_stepping_mode();
137
-            lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
138
-            lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
139
-            lv_label_set_text(labelZState, machine_menu.enable);
120
+            lv_imgbtn_set_src_both(buttonZState, "F:/bmp_disable.bin");
121
+            lv_label_set_text(labelZState, machine_menu.disable);
122
+            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
140 123
           }
141
-          gcode.process_subcommands_now_P(PSTR("M500"));
124
+          TERN_(EEPROM_SETTINGS, (void)settings.save());
142 125
         }
143 126
         break;
144 127
     #endif // if AXIS_HAS_STEALTHCHOP(Z)
@@ -149,22 +132,16 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
149 132
 
150 133
         }
151 134
         else if (event == LV_EVENT_RELEASED) {
152
-          if (stepperE0.stored.stealthChop_enabled) {
153
-            stepperE0.stored.stealthChop_enabled = false;
154
-            stepperE0.refresh_stepping_mode();
155
-            lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
156
-            lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
157
-            lv_label_set_text(labelE0State, machine_menu.disable);
158
-            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
135
+          if (stepperE0.toggle_stepping_mode()) {
136
+            lv_imgbtn_set_src_both(buttonE0State, "F:/bmp_enable.bin");
137
+            lv_label_set_text(labelE0State, machine_menu.enable);
159 138
           }
160 139
           else {
161
-            stepperE0.stored.stealthChop_enabled = true;
162
-            stepperE0.refresh_stepping_mode();
163
-            lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
164
-            lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
165
-            lv_label_set_text(labelE0State, machine_menu.enable);
140
+            lv_imgbtn_set_src_both(buttonE0State, "F:/bmp_disable.bin");
141
+            lv_label_set_text(labelE0State, machine_menu.disable);
142
+            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
166 143
           }
167
-          gcode.process_subcommands_now_P(PSTR("M500"));
144
+          TERN_(EEPROM_SETTINGS, (void)settings.save());
168 145
         }
169 146
         break;
170 147
     #endif // if AXIS_HAS_STEALTHCHOP(E0)
@@ -175,22 +152,16 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
175 152
 
176 153
         }
177 154
         else if (event == LV_EVENT_RELEASED) {
178
-          if (stepperE1.stored.stealthChop_enabled) {
179
-            stepperE1.stored.stealthChop_enabled = false;
180
-            stepperE1.refresh_stepping_mode();
181
-            lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
182
-            lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
183
-            lv_label_set_text(labelE1State, machine_menu.disable);
184
-            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
155
+          if (stepperE1.toggle_stepping_mode()) {
156
+            lv_imgbtn_set_src_both(buttonE1State, "F:/bmp_enable.bin");
157
+            lv_label_set_text(labelE1State, machine_menu.enable);
185 158
           }
186 159
           else {
187
-            stepperE1.stored.stealthChop_enabled = true;
188
-            stepperE1.refresh_stepping_mode();
189
-            lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
190
-            lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
191
-            lv_label_set_text(labelE1State, machine_menu.enable);
160
+            lv_imgbtn_set_src_both(buttonE1State, "F:/bmp_disable.bin");
161
+            lv_label_set_text(labelE1State, machine_menu.disable);
162
+            //lv_obj_align(labelXState, buttonE1State, LV_ALIGN_IN_LEFT_MID,0, 0);
192 163
           }
193
-          gcode.process_subcommands_now_P(PSTR("M500"));
164
+          TERN_(EEPROM_SETTINGS, (void)settings.save());
194 165
         }
195 166
         break;
196 167
     #endif // if AXIS_HAS_STEALTHCHOP(E1)
@@ -255,44 +226,33 @@ void lv_draw_tmc_step_mode_settings(void) {
255 226
   lv_scr_load(scr);
256 227
   lv_obj_clean(scr);
257 228
 
258
-  lv_obj_t * title = lv_label_create(scr, NULL);
259
-  lv_obj_set_style(title, &tft_style_label_rel);
260
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
261
-  lv_label_set_text(title, machine_menu.TmcStepModeConfTitle);
229
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.TmcStepModeConfTitle);
262 230
 
263 231
   lv_refr_now(lv_refr_get_disp_refreshing());
264 232
 
233
+  bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
234
+  #if AXIS_HAS_STEALTHCHOP(X)
235
+    stealth_X = stepperX.get_stealthChop_status();
236
+  #endif
237
+  #if AXIS_HAS_STEALTHCHOP(Y)
238
+    stealth_Y = stepperY.get_stealthChop_status();
239
+  #endif
240
+  #if AXIS_HAS_STEALTHCHOP(Z)
241
+    stealth_Z = stepperZ.get_stealthChop_status();
242
+  #endif
243
+  #if AXIS_HAS_STEALTHCHOP(E0)
244
+    stealth_E0 = stepperE0.get_stealthChop_status();
245
+  #endif
246
+  #if AXIS_HAS_STEALTHCHOP(E1)
247
+    stealth_E1 = stepperE1.get_stealthChop_status();
248
+  #endif
249
+
265 250
   if (uiCfg.para_ui_page != 1) {
266
-    buttonXText = lv_btn_create(scr, NULL);                                 /*Add a button the current screen*/
267
-    lv_obj_set_pos(buttonXText, PARA_UI_POS_X, PARA_UI_POS_Y);              /*Set its position*/
268
-    lv_obj_set_size(buttonXText, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y);     /*Set its size*/
269
-    lv_obj_set_event_cb(buttonXText, event_handler);
270
-    lv_btn_set_style(buttonXText, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
271
-    lv_btn_set_style(buttonXText, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
272
-    lv_btn_set_layout(buttonXText, LV_LAYOUT_OFF);
273
-    labelXText = lv_label_create(buttonXText, NULL);                        /*Add a label to the button*/
274
-
275
-    buttonXState = lv_imgbtn_create(scr, NULL);
276
-    lv_obj_set_pos(buttonXState, PARA_UI_STATE_POS_X, PARA_UI_POS_Y + PARA_UI_STATE_V);
277
-    #if AXIS_HAS_STEALTHCHOP(X)
278
-    if (stepperX.get_stealthChop_status()) {
279
-      lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
280
-      lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
281
-    }
282
-    else {
283
-      lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
284
-      lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
285
-    }
286
-    #else
287
-      lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
288
-      lv_imgbtn_set_src(buttonXState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
289
-    #endif
290
-    lv_obj_set_event_cb_mks(buttonXState, event_handler, ID_TMC_MODE_X, NULL, 0);
251
+    buttonXText = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y, event_handler, 0);
252
+    labelXText = lv_label_create_empty(buttonXText);                        /*Add a label to the button*/
291 253
 
292
-    lv_imgbtn_set_style(buttonXState, LV_BTN_STATE_PR, &tft_style_label_pre);
293
-    lv_imgbtn_set_style(buttonXState, LV_BTN_STATE_REL, &tft_style_label_rel);
294
-    lv_btn_set_layout(buttonXState, LV_LAYOUT_OFF);
295
-    labelXState = lv_label_create(buttonXState, NULL);
254
+    buttonXState = lv_imgbtn_create(scr, stealth_X ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y + PARA_UI_STATE_V, event_handler, ID_TMC_MODE_X);
255
+    labelXState = lv_label_create_empty(buttonXState);
296 256
     #if HAS_ROTARY_ENCODER
297 257
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonXState);
298 258
     #endif
@@ -300,36 +260,11 @@ void lv_draw_tmc_step_mode_settings(void) {
300 260
     line1 = lv_line_create(scr, NULL);
301 261
     lv_ex_line(line1, line_points[0]);
302 262
 
303
-    buttonYText = lv_btn_create(scr, NULL);                                 /*Add a button the current screen*/
304
-    lv_obj_set_pos(buttonYText, PARA_UI_POS_X, PARA_UI_POS_Y * 2);          /*Set its position*/
305
-    lv_obj_set_size(buttonYText, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y);     /*Set its size*/
306
-    lv_obj_set_event_cb(buttonYText, event_handler);
307
-    lv_btn_set_style(buttonYText, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
308
-    lv_btn_set_style(buttonYText, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
309
-    lv_btn_set_layout(buttonYText, LV_LAYOUT_OFF);
310
-    labelYText = lv_label_create(buttonYText, NULL);                        /*Add a label to the button*/
311
-
312
-    buttonYState = lv_imgbtn_create(scr, NULL);
313
-    lv_obj_set_pos(buttonYState, PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_STATE_V);
314
-    #if AXIS_HAS_STEALTHCHOP(Y)
315
-      if (stepperY.get_stealthChop_status()) {
316
-        lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
317
-        lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
318
-      }
319
-      else {
320
-        lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
321
-        lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
322
-      }
323
-    #else
324
-      lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
325
-      lv_imgbtn_set_src(buttonYState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
326
-    #endif
327
-    lv_obj_set_event_cb_mks(buttonYState, event_handler, ID_TMC_MODE_Y, NULL, 0);
263
+    buttonYText = lv_btn_create(scr, NULL, PARA_UI_POS_X, PARA_UI_POS_Y * 2, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y, event_handler, 0);
264
+    labelYText = lv_label_create_empty(buttonYText);                        /*Add a label to the button*/
328 265
 
329
-    lv_imgbtn_set_style(buttonYState, LV_BTN_STATE_PR, &tft_style_label_pre);
330
-    lv_imgbtn_set_style(buttonYState, LV_BTN_STATE_REL, &tft_style_label_rel);
331
-    lv_btn_set_layout(buttonYState, LV_LAYOUT_OFF);
332
-    labelYState = lv_label_create(buttonYState, NULL);
266
+    buttonYState = lv_imgbtn_create(scr, stealth_Y ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_STATE_V, event_handler, ID_TMC_MODE_Y);
267
+    labelYState = lv_label_create_empty(buttonYState);
333 268
     #if HAS_ROTARY_ENCODER
334 269
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonYState);
335 270
     #endif
@@ -337,35 +272,11 @@ void lv_draw_tmc_step_mode_settings(void) {
337 272
     line2 = lv_line_create(scr, NULL);
338 273
     lv_ex_line(line2, line_points[1]);
339 274
 
340
-    buttonZText = lv_btn_create(scr, NULL);                                 /*Add a button the current screen*/
341
-    lv_obj_set_pos(buttonZText, PARA_UI_POS_X, PARA_UI_POS_Y * 3);          /*Set its position*/
342
-    lv_obj_set_size(buttonZText, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y);     /*Set its size*/
343
-    lv_obj_set_event_cb(buttonZText, event_handler);
344
-    lv_btn_set_style(buttonZText, LV_BTN_STYLE_REL, &tft_style_label_rel);  /*Set the button's released style*/
345
-    lv_btn_set_style(buttonZText, LV_BTN_STYLE_PR, &tft_style_label_pre);   /*Set the button's pressed style*/
346
-    lv_btn_set_layout(buttonZText, LV_LAYOUT_OFF);
347
-    labelZText = lv_label_create(buttonZText, NULL);                        /*Add a label to the button*/
348
-
349
-    buttonZState = lv_imgbtn_create(scr, NULL);
350
-    lv_obj_set_pos(buttonZState, PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_STATE_V);
351
-    #if AXIS_HAS_STEALTHCHOP(Z)
352
-      if (stepperZ.get_stealthChop_status()) {
353
-        lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
354
-        lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
355
-      }
356
-      else {
357
-        lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
358
-        lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
359
-      }
360
-    #else
361
-      lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
362
-      lv_imgbtn_set_src(buttonZState, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
363
-    #endif
364
-    lv_obj_set_event_cb_mks(buttonZState, event_handler, ID_TMC_MODE_Z, NULL, 0);
365
-    lv_imgbtn_set_style(buttonZState, LV_BTN_STATE_PR, &tft_style_label_pre);
366
-    lv_imgbtn_set_style(buttonZState, LV_BTN_STATE_REL, &tft_style_label_rel);
367
-    lv_btn_set_layout(buttonZState, LV_LAYOUT_OFF);
368
-    labelZState = lv_label_create(buttonZState, NULL);
275
+    buttonZText = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y, event_handler, 0);
276
+    labelZText = lv_label_create_empty(buttonZText);                        /*Add a label to the button*/
277
+
278
+    buttonZState = lv_imgbtn_create(scr, stealth_Z ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_STATE_V, event_handler, ID_TMC_MODE_Z);
279
+    labelZState = lv_label_create_empty(buttonZState);
369 280
     #if HAS_ROTARY_ENCODER
370 281
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonZState);
371 282
     #endif
@@ -373,52 +284,20 @@ void lv_draw_tmc_step_mode_settings(void) {
373 284
     line3 = lv_line_create(scr, NULL);
374 285
     lv_ex_line(line3, line_points[2]);
375 286
 
376
-    buttonE0Text = lv_btn_create(scr, NULL);                                /*Add a button the current screen*/
377
-    lv_obj_set_pos(buttonE0Text, PARA_UI_POS_X, PARA_UI_POS_Y * 4);         /*Set its position*/
378
-    lv_obj_set_size(buttonE0Text, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y);    /*Set its size*/
379
-    lv_obj_set_event_cb(buttonE0Text, event_handler);
380
-    lv_btn_set_style(buttonE0Text, LV_BTN_STYLE_REL, &tft_style_label_rel); /*Set the button's released style*/
381
-    lv_btn_set_style(buttonE0Text, LV_BTN_STYLE_PR, &tft_style_label_pre);  /*Set the button's pressed style*/
382
-    lv_btn_set_layout(buttonE0Text, LV_LAYOUT_OFF);
383
-    labelE0Text = lv_label_create(buttonE0Text, NULL);                      /*Add a label to the button*/
384
-
385
-    buttonE0State = lv_imgbtn_create(scr, NULL);
386
-    lv_obj_set_pos(buttonE0State, PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_STATE_V);
387
-    #if AXIS_HAS_STEALTHCHOP(E0)
388
-      if (stepperE0.get_stealthChop_status()) {
389
-        lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
390
-        lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
391
-      }
392
-      else {
393
-        lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
394
-        lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
395
-      }
396
-    #else
397
-      lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
398
-      lv_imgbtn_set_src(buttonE0State, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
399
-    #endif
400
-
401
-    lv_obj_set_event_cb_mks(buttonE0State, event_handler, ID_TMC_MODE_E0, NULL, 0);
287
+    buttonE0Text = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y, event_handler, 0);
288
+    labelE0Text = lv_label_create_empty(buttonE0Text);                      /*Add a label to the button*/
402 289
 
403
-    lv_imgbtn_set_style(buttonE0State, LV_BTN_STATE_PR, &tft_style_label_pre);
404
-    lv_imgbtn_set_style(buttonE0State, LV_BTN_STATE_REL, &tft_style_label_rel);
405
-    lv_btn_set_layout(buttonE0State, LV_LAYOUT_OFF);
406
-    labelE0State = lv_label_create(buttonE0State, NULL);
290
+    buttonE0State = lv_imgbtn_create(scr, stealth_E0 ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_STATE_V, event_handler, ID_TMC_MODE_E0);
291
+    labelE0State = lv_label_create_empty(buttonE0State);
407 292
     #if HAS_ROTARY_ENCODER
408 293
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonE0State);
409 294
     #endif
410 295
 
411
-
412 296
     line4 = lv_line_create(scr, NULL);
413 297
     lv_ex_line(line4, line_points[3]);
414 298
 
415 299
     //#if AXIS_HAS_STEALTHCHOP(E1)
416
-      buttonTurnPage = lv_imgbtn_create(scr, NULL);
417
-      lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_TMC_MODE_DOWN, NULL, 0);
418
-      lv_imgbtn_set_src(buttonTurnPage, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
419
-      lv_imgbtn_set_src(buttonTurnPage, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
420
-      lv_imgbtn_set_style(buttonTurnPage, LV_BTN_STATE_PR, &tft_style_label_pre);
421
-      lv_imgbtn_set_style(buttonTurnPage, LV_BTN_STATE_REL, &tft_style_label_rel);
300
+      buttonTurnPage = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", event_handler, ID_TMC_MODE_DOWN);
422 301
       #if HAS_ROTARY_ENCODER
423 302
         if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonTurnPage);
424 303
       #endif
@@ -426,35 +305,11 @@ void lv_draw_tmc_step_mode_settings(void) {
426 305
   }
427 306
   else {
428 307
     //#if AXIS_HAS_STEALTHCHOP(E1)
429
-      buttonE1Text = lv_btn_create(scr, NULL);                                /*Add a button the current screen*/
430
-      lv_obj_set_pos(buttonE1Text, PARA_UI_POS_X, PARA_UI_POS_Y);             /*Set its position*/
431
-      lv_obj_set_size(buttonE1Text, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y);    /*Set its size*/
432
-      lv_obj_set_event_cb(buttonE1Text, event_handler);
433
-      lv_btn_set_style(buttonE1Text, LV_BTN_STYLE_REL, &tft_style_label_rel); /*Set the button's released style*/
434
-      lv_btn_set_style(buttonE1Text, LV_BTN_STYLE_PR, &tft_style_label_pre);  /*Set the button's pressed style*/
435
-      lv_btn_set_layout(buttonE1Text, LV_LAYOUT_OFF);
436
-      labelE1Text = lv_label_create(buttonE1Text, NULL);                      /*Add a label to the button*/
437
-
438
-      buttonE1State = lv_imgbtn_create(scr, NULL);
439
-      lv_obj_set_pos(buttonE1State, PARA_UI_STATE_POS_X, PARA_UI_POS_Y + PARA_UI_STATE_V);
440
-      #if AXIS_HAS_STEALTHCHOP(E1)
441
-        if (stepperE1.get_stealthChop_status()) {
442
-          lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
443
-          lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
444
-          }
445
-        else {
446
-          lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
447
-          lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
448
-        }
449
-      #else
450
-        lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
451
-        lv_imgbtn_set_src(buttonE1State, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
452
-      #endif
453
-      lv_obj_set_event_cb_mks(buttonE1State, event_handler, ID_TMC_MODE_E1, NULL, 0);
454
-      lv_imgbtn_set_style(buttonE1State, LV_BTN_STATE_PR, &tft_style_label_pre);
455
-      lv_imgbtn_set_style(buttonE1State, LV_BTN_STATE_REL, &tft_style_label_rel);
456
-      lv_btn_set_layout(buttonE1State, LV_LAYOUT_OFF);
457
-      labelE1State = lv_label_create(buttonE1State, NULL);
308
+      buttonE1Text = lv_btn_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y, PARA_UI_VALUE_SIZE_X, PARA_UI_SIZE_Y, event_handler, 0);
309
+      labelE1Text = lv_label_create_empty(buttonE1Text);                      /*Add a label to the button*/
310
+
311
+      buttonE1State = lv_imgbtn_create(scr, stealth_E1 ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y + PARA_UI_STATE_V, event_handler, ID_TMC_MODE_E1);
312
+      labelE1State = lv_label_create_empty(buttonE1State);
458 313
       #if HAS_ROTARY_ENCODER
459 314
         if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonE1State);
460 315
       #endif
@@ -462,33 +317,20 @@ void lv_draw_tmc_step_mode_settings(void) {
462 317
       line1 = lv_line_create(scr, NULL);
463 318
       lv_ex_line(line1, line_points[0]);
464 319
 
465
-      buttonTurnPage = lv_imgbtn_create(scr, NULL);
466
-      lv_obj_set_event_cb_mks(buttonTurnPage, event_handler, ID_TMC_MODE_UP, NULL, 0);
467
-      lv_imgbtn_set_src(buttonTurnPage, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
468
-      lv_imgbtn_set_src(buttonTurnPage, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
469
-      lv_imgbtn_set_style(buttonTurnPage, LV_BTN_STATE_PR, &tft_style_label_pre);
470
-      lv_imgbtn_set_style(buttonTurnPage, LV_BTN_STATE_REL, &tft_style_label_rel);
320
+      buttonTurnPage = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", event_handler, ID_TMC_MODE_UP);
471 321
     //#endif
472 322
   }
473 323
   //#if AXIS_HAS_STEALTHCHOP(E1)
474 324
     lv_obj_set_pos(buttonTurnPage, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
475 325
     lv_btn_set_layout(buttonTurnPage, LV_LAYOUT_OFF);
476
-    labelTurnPage = lv_label_create(buttonTurnPage, NULL);
326
+    labelTurnPage = lv_label_create_empty(buttonTurnPage);
477 327
   //#endif
478 328
 
479
-  buttonBack = lv_imgbtn_create(scr, NULL);
480
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_TMC_MODE_RETURN, NULL, 0);
481
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
482
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
483
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
484
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
329
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_TMC_MODE_RETURN);
485 330
   #if HAS_ROTARY_ENCODER
486 331
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
487 332
   #endif
488
-
489
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
490
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
491
-  label_Back = lv_label_create(buttonBack, NULL);
333
+  label_Back = lv_label_create_empty(buttonBack);
492 334
 
493 335
   if (gCfgItems.multiple_language) {
494 336
     if (uiCfg.para_ui_page != 1) {
@@ -504,44 +346,16 @@ void lv_draw_tmc_step_mode_settings(void) {
504 346
       lv_label_set_text(labelE0Text, machine_menu.E0_StepMode);
505 347
       lv_obj_align(labelE0Text, buttonE0Text, LV_ALIGN_IN_LEFT_MID, 0, 0);
506 348
 
507
-      #if AXIS_HAS_STEALTHCHOP(X)
508
-      if (stepperX.get_stealthChop_status())
509
-        lv_label_set_text(labelXState, machine_menu.enable);
510
-      else
511
-        lv_label_set_text(labelXState, machine_menu.disable);
512
-      #else
513
-        lv_label_set_text(labelXState, machine_menu.disable);
514
-      #endif
349
+      lv_label_set_text(labelXState, stealth_X ? machine_menu.enable : machine_menu.disable);
515 350
       lv_obj_align(labelXState, buttonXState, LV_ALIGN_CENTER, 0, 0);
516 351
 
517
-      #if AXIS_HAS_STEALTHCHOP(Y)
518
-      if (stepperY.get_stealthChop_status())
519
-        lv_label_set_text(labelYState, machine_menu.enable);
520
-      else
521
-        lv_label_set_text(labelYState, machine_menu.disable);
522
-      #else
523
-        lv_label_set_text(labelYState, machine_menu.disable);
524
-      #endif
352
+      lv_label_set_text(labelYState, stealth_Y ? machine_menu.enable : machine_menu.disable);
525 353
       lv_obj_align(labelYState, buttonYState, LV_ALIGN_CENTER, 0, 0);
526 354
 
527
-      #if AXIS_HAS_STEALTHCHOP(Z)
528
-      if (stepperZ.get_stealthChop_status())
529
-        lv_label_set_text(labelZState, machine_menu.enable);
530
-      else
531
-        lv_label_set_text(labelZState, machine_menu.disable);
532
-      #else
533
-        lv_label_set_text(labelZState, machine_menu.disable);
534
-      #endif
355
+      lv_label_set_text(labelZState, stealth_Z ? machine_menu.enable : machine_menu.disable);
535 356
       lv_obj_align(labelZState, buttonZState, LV_ALIGN_CENTER, 0, 0);
536 357
 
537
-      #if AXIS_HAS_STEALTHCHOP(E0)
538
-      if (stepperE0.get_stealthChop_status())
539
-        lv_label_set_text(labelE0State, machine_menu.enable);
540
-      else
541
-        lv_label_set_text(labelE0State, machine_menu.disable);
542
-      #else
543
-        lv_label_set_text(labelE0State, machine_menu.disable);
544
-      #endif
358
+      lv_label_set_text(labelE0State, stealth_E0 ? machine_menu.enable : machine_menu.disable);
545 359
       lv_obj_align(labelE0State, buttonE0State, LV_ALIGN_CENTER, 0, 0);
546 360
 
547 361
       //#if AXIS_HAS_STEALTHCHOP(E1)
@@ -553,14 +367,7 @@ void lv_draw_tmc_step_mode_settings(void) {
553 367
       //#if AXIS_HAS_STEALTHCHOP(E1)
554 368
         lv_label_set_text(labelE1Text, machine_menu.E1_StepMode);
555 369
         lv_obj_align(labelE1Text, buttonE1Text, LV_ALIGN_IN_LEFT_MID, 0, 0);
556
-        #if AXIS_HAS_STEALTHCHOP(E1)
557
-        if (stepperE1.get_stealthChop_status())
558
-          lv_label_set_text(labelE1State, machine_menu.enable);
559
-        else
560
-          lv_label_set_text(labelE1State, machine_menu.disable);
561
-        #else
562
-          lv_label_set_text(labelE1State, machine_menu.disable);
563
-        #endif
370
+        lv_label_set_text(labelE1State, stealth_E1 ? machine_menu.enable : machine_menu.disable);
564 371
         lv_obj_align(labelE1State, buttonE1State, LV_ALIGN_CENTER, 0, 0);
565 372
 
566 373
         lv_label_set_text(labelTurnPage, machine_menu.previous);

+ 17
- 79
Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp Vedi File

@@ -149,92 +149,30 @@ void lv_draw_tool(void) {
149 149
   lv_scr_load(scr);
150 150
   lv_obj_clean(scr);
151 151
 
152
-  lv_obj_t * title = lv_label_create(scr, NULL);
153
-  lv_obj_set_style(title, &tft_style_label_rel);
154
-  lv_obj_set_pos(title, TITLE_XPOS, TITLE_YPOS);
155
-  lv_label_set_text(title, creat_title_text());
152
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
156 153
 
157 154
   lv_refr_now(lv_refr_get_disp_refreshing());
158 155
 
159 156
   // Create image buttons
160
-  buttonPreHeat   = lv_imgbtn_create(scr, NULL);
161
-  buttonExtrusion = lv_imgbtn_create(scr, NULL);
162
-  buttonMove      = lv_imgbtn_create(scr, NULL);
163
-  buttonHome      = lv_imgbtn_create(scr, NULL);
164
-  buttonLevel     = lv_imgbtn_create(scr, NULL);
165
-  buttonFilament  = lv_imgbtn_create(scr, NULL);
166
-  //buttonMore    = lv_imgbtn_create(scr, NULL);
167
-  buttonBack      = lv_imgbtn_create(scr, NULL);
168
-
169
-  lv_obj_set_event_cb_mks(buttonPreHeat, event_handler, ID_T_PRE_HEAT, NULL, 0);
170
-  lv_imgbtn_set_src(buttonPreHeat, LV_BTN_STATE_REL, "F:/bmp_preHeat.bin");
171
-  lv_imgbtn_set_src(buttonPreHeat, LV_BTN_STATE_PR, "F:/bmp_preHeat.bin");
172
-  lv_imgbtn_set_style(buttonPreHeat, LV_BTN_STATE_PR, &tft_style_label_pre);
173
-  lv_imgbtn_set_style(buttonPreHeat, LV_BTN_STATE_REL, &tft_style_label_rel);
174
-
175
-  lv_obj_set_event_cb_mks(buttonExtrusion, event_handler, ID_T_EXTRUCT, NULL, 0);
176
-  lv_imgbtn_set_src(buttonExtrusion, LV_BTN_STATE_REL, "F:/bmp_extruct.bin");
177
-  lv_imgbtn_set_src(buttonExtrusion, LV_BTN_STATE_PR, "F:/bmp_extruct.bin");
178
-  lv_imgbtn_set_style(buttonExtrusion, LV_BTN_STATE_PR, &tft_style_label_pre);
179
-  lv_imgbtn_set_style(buttonExtrusion, LV_BTN_STATE_REL, &tft_style_label_rel);
180
-
181
-  lv_obj_set_event_cb_mks(buttonMove, event_handler, ID_T_MOV, NULL, 0);
182
-  lv_imgbtn_set_src(buttonMove, LV_BTN_STATE_REL, "F:/bmp_mov.bin");
183
-  lv_imgbtn_set_src(buttonMove, LV_BTN_STATE_PR, "F:/bmp_mov.bin");
184
-  lv_imgbtn_set_style(buttonMove, LV_BTN_STATE_PR, &tft_style_label_pre);
185
-  lv_imgbtn_set_style(buttonMove, LV_BTN_STATE_REL, &tft_style_label_rel);
186
-
187
-  lv_obj_set_event_cb_mks(buttonHome, event_handler, ID_T_HOME, NULL, 0);
188
-  lv_imgbtn_set_src(buttonHome, LV_BTN_STATE_REL, "F:/bmp_zero.bin");
189
-  lv_imgbtn_set_src(buttonHome, LV_BTN_STATE_PR, "F:/bmp_zero.bin");
190
-  lv_imgbtn_set_style(buttonHome, LV_BTN_STATE_PR, &tft_style_label_pre);
191
-  lv_imgbtn_set_style(buttonHome, LV_BTN_STATE_REL, &tft_style_label_rel);
192
-
193
-  lv_obj_set_event_cb_mks(buttonLevel, event_handler, ID_T_LEVELING, NULL, 0);
194
-  lv_imgbtn_set_src(buttonLevel, LV_BTN_STATE_REL, "F:/bmp_leveling.bin");
195
-  lv_imgbtn_set_src(buttonLevel, LV_BTN_STATE_PR, "F:/bmp_leveling.bin");
196
-  lv_imgbtn_set_style(buttonLevel, LV_BTN_STATE_PR, &tft_style_label_pre);
197
-  lv_imgbtn_set_style(buttonLevel, LV_BTN_STATE_REL, &tft_style_label_rel);
198
-
199
-  lv_obj_set_event_cb_mks(buttonFilament, event_handler,ID_T_FILAMENT,NULL,0);
200
-  lv_imgbtn_set_src(buttonFilament, LV_BTN_STATE_REL, "F:/bmp_filamentchange.bin");
201
-  lv_imgbtn_set_src(buttonFilament, LV_BTN_STATE_PR, "F:/bmp_filamentchange.bin");
202
-  lv_imgbtn_set_style(buttonFilament, LV_BTN_STATE_PR, &tft_style_label_pre);
203
-  lv_imgbtn_set_style(buttonFilament, LV_BTN_STATE_REL, &tft_style_label_rel);
204
-
205
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_T_RETURN, NULL, 0);
206
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
207
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
208
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
209
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
210
-
211
-  lv_obj_set_pos(buttonPreHeat, INTERVAL_V, titleHeight);
212
-  lv_obj_set_pos(buttonExtrusion, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight);
213
-  lv_obj_set_pos(buttonMove, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight);
214
-  lv_obj_set_pos(buttonHome, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight);
215
-  lv_obj_set_pos(buttonLevel, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
216
-  lv_obj_set_pos(buttonFilament,BTN_X_PIXEL+INTERVAL_V*2,BTN_Y_PIXEL+INTERVAL_H+titleHeight);
157
+  buttonPreHeat   = lv_imgbtn_create(scr, "F:/bmp_preHeat.bin", INTERVAL_V, titleHeight, event_handler, ID_T_PRE_HEAT);
158
+  buttonExtrusion = lv_imgbtn_create(scr, "F:/bmp_extruct.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_EXTRUCT);
159
+  buttonMove      = lv_imgbtn_create(scr, "F:/bmp_mov.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_T_MOV);
160
+  buttonHome      = lv_imgbtn_create(scr, "F:/bmp_zero.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_T_HOME);
161
+  buttonLevel     = lv_imgbtn_create(scr, "F:/bmp_leveling.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
162
+  buttonFilament  = lv_imgbtn_create(scr, "F:/bmp_filamentchange.bin",BTN_X_PIXEL+INTERVAL_V*2,BTN_Y_PIXEL+INTERVAL_H+titleHeight, event_handler,ID_T_FILAMENT);
163
+  //buttonMore    = lv_imgbtn_createx(scr, NULL);
217 164
   //lv_obj_set_pos(buttonMore,BTN_X_PIXEL*2+INTERVAL_V*3, BTN_Y_PIXEL+INTERVAL_H+titleHeight);
218
-  lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
165
+  buttonBack      = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
219 166
 
220 167
   // Create labels on the image buttons
221
-  lv_btn_set_layout(buttonPreHeat, LV_LAYOUT_OFF);
222
-  lv_btn_set_layout(buttonExtrusion, LV_LAYOUT_OFF);
223
-  lv_btn_set_layout(buttonMove, LV_LAYOUT_OFF);
224
-  lv_btn_set_layout(buttonHome, LV_LAYOUT_OFF);
225
-  lv_btn_set_layout(buttonLevel, LV_LAYOUT_OFF);
226
-  lv_btn_set_layout(buttonFilament, LV_LAYOUT_OFF);
227
-  //lv_btn_set_layout(buttonMore, LV_LAYOUT_OFF);
228
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
229
-
230
-  lv_obj_t *labelPreHeat   = lv_label_create(buttonPreHeat, NULL);
231
-  lv_obj_t *labelExtrusion = lv_label_create(buttonExtrusion, NULL);
232
-  lv_obj_t *label_Move     = lv_label_create(buttonMove, NULL);
233
-  lv_obj_t *label_Home     = lv_label_create(buttonHome, NULL);
234
-  lv_obj_t *label_Level    = lv_label_create(buttonLevel, NULL);
235
-  lv_obj_t *label_Filament = lv_label_create(buttonFilament, NULL);
236
-  //lv_obj_t *label_More   = lv_label_create(buttonMore, NULL);
237
-  lv_obj_t *label_Back     = lv_label_create(buttonBack, NULL);
168
+  lv_obj_t *labelPreHeat   = lv_label_create_empty(buttonPreHeat);
169
+  lv_obj_t *labelExtrusion = lv_label_create_empty(buttonExtrusion);
170
+  lv_obj_t *label_Move     = lv_label_create_empty(buttonMove);
171
+  lv_obj_t *label_Home     = lv_label_create_empty(buttonHome);
172
+  lv_obj_t *label_Level    = lv_label_create_empty(buttonLevel);
173
+  lv_obj_t *label_Filament = lv_label_create_empty(buttonFilament);
174
+  //lv_obj_t *label_More   = lv_label_create_empty(buttonMore);
175
+  lv_obj_t *label_Back     = lv_label_create_empty(buttonBack);
238 176
 
239 177
   if (gCfgItems.multiple_language) {
240 178
     lv_label_set_text(labelPreHeat, tool_menu.preheat);

+ 99
- 0
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp Vedi File

@@ -1577,6 +1577,105 @@ void draw_return_ui() {
1577 1577
   }
1578 1578
 }
1579 1579
 
1580
+// Set the same image for both Released and Pressed
1581
+void lv_imgbtn_set_src_both(lv_obj_t *imgbtn, const void *src) {
1582
+  lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_REL, src);
1583
+  lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_PR,  src);
1584
+}
1585
+
1586
+// Use label style for the image button
1587
+void lv_imgbtn_use_label_style(lv_obj_t *imgbtn) {
1588
+  lv_imgbtn_set_style(imgbtn, LV_BTN_STATE_REL, &tft_style_label_rel);
1589
+  lv_imgbtn_set_style(imgbtn, LV_BTN_STATE_PR,  &tft_style_label_pre);
1590
+}
1591
+
1592
+// Use label style for the image button
1593
+void lv_btn_use_label_style(lv_obj_t *btn) {
1594
+  lv_btn_set_style(btn, LV_BTN_STYLE_REL, &tft_style_label_rel);
1595
+  lv_btn_set_style(btn, LV_BTN_STYLE_PR,  &tft_style_label_pre);
1596
+}
1597
+
1598
+// Use a single style for both Released and Pressed
1599
+void lv_btn_set_style_both(lv_obj_t *btn, lv_style_t *style) {
1600
+  lv_btn_set_style(btn, LV_BTN_STYLE_REL, style);
1601
+  lv_btn_set_style(btn, LV_BTN_STYLE_PR,  style);
1602
+}
1603
+
1604
+// Create an empty label
1605
+lv_obj_t* lv_label_create_empty(lv_obj_t *par) {
1606
+  return lv_label_create(par, (lv_obj_t*)NULL);
1607
+}
1608
+
1609
+// Create a label with style and text
1610
+lv_obj_t* lv_label_create(lv_obj_t *par, const char *text) {
1611
+  lv_obj_t *label = lv_label_create_empty(par);
1612
+  if (text) lv_label_set_text(label, text);
1613
+  return label;
1614
+}
1615
+
1616
+// Create a label with style, position, and text
1617
+lv_obj_t* lv_label_create(lv_obj_t *par, lv_coord_t x, lv_coord_t y, const char *text) {
1618
+  lv_obj_t *label = lv_label_create(par, text);
1619
+  lv_obj_set_pos(label, x, y);
1620
+  return label;
1621
+}
1622
+
1623
+// Create a button with callback, ID, and Style.
1624
+lv_obj_t* lv_btn_create(lv_obj_t *par, lv_event_cb_t cb, const int id, lv_style_t *style) {
1625
+  lv_obj_t *btn = lv_btn_create(par, NULL);
1626
+  if (id)
1627
+    lv_obj_set_event_cb_mks(btn, cb, id, NULL, 0);
1628
+  else
1629
+    lv_obj_set_event_cb(btn, cb);
1630
+  lv_btn_set_style_both(btn, style);
1631
+  return btn;
1632
+}
1633
+
1634
+// Create a button with callback and ID. Style set to style_para_value.
1635
+lv_obj_t* lv_btn_create(lv_obj_t *par, lv_event_cb_t cb, const int id) {
1636
+  return lv_btn_create(par, cb, id, &style_para_value);
1637
+}
1638
+
1639
+// Create a button with position, size, callback, and ID. Style set to style_para_value.
1640
+lv_obj_t* lv_btn_create(lv_obj_t *par, lv_coord_t x, lv_coord_t y, lv_coord_t w, lv_coord_t h, lv_event_cb_t cb, const int id) {
1641
+  lv_obj_t *btn = lv_btn_create(par, cb, id);
1642
+  lv_obj_set_pos(btn, x, y);
1643
+  lv_obj_set_size(btn, w, h);
1644
+  return btn;
1645
+}
1646
+
1647
+// Create a button with callback and ID. Style set to style_para_back.
1648
+lv_obj_t* lv_btn_create_back(lv_obj_t *par, lv_event_cb_t cb, const int id) {
1649
+  return lv_btn_create(par, cb, id, &style_para_back);
1650
+}
1651
+// Create a button with position, size, callback, and ID. Style set to style_para_back.
1652
+lv_obj_t* lv_btn_create_back(lv_obj_t *par, lv_coord_t x, lv_coord_t y, lv_coord_t w, lv_coord_t h, lv_event_cb_t cb, const int id) {
1653
+  lv_obj_t *btn = lv_btn_create_back(par, cb, id);
1654
+  lv_obj_set_pos(btn, x, y);
1655
+  lv_obj_set_size(btn, w, h);
1656
+  return btn;
1657
+}
1658
+
1659
+// Create an image button with image, callback, and ID. Use label style.
1660
+lv_obj_t* lv_imgbtn_create(lv_obj_t *par, const char *img, lv_event_cb_t cb, const int id) {
1661
+  lv_obj_t *btn = lv_imgbtn_create(par, NULL);
1662
+  if (img) lv_imgbtn_set_src_both(btn, img);
1663
+  if (id)
1664
+    lv_obj_set_event_cb_mks(btn, cb, id, NULL, 0);
1665
+  else
1666
+    lv_obj_set_event_cb(btn, cb);
1667
+  lv_imgbtn_use_label_style(btn);
1668
+  lv_btn_set_layout(btn, LV_LAYOUT_OFF);
1669
+  return btn;
1670
+}
1671
+
1672
+// Create an image button with image, position, callback, and ID. Use label style.
1673
+lv_obj_t* lv_imgbtn_create(lv_obj_t *par, const char *img, lv_coord_t x, lv_coord_t y, lv_event_cb_t cb, const int id) {
1674
+  lv_obj_t *btn = lv_imgbtn_create(par, img, cb, id);
1675
+  lv_obj_set_pos(btn, x, y);
1676
+  return btn;
1677
+}
1678
+
1580 1679
 #if ENABLED(SDSUPPORT)
1581 1680
 
1582 1681
   void sd_detection() {

+ 42
- 0
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h Vedi File

@@ -164,6 +164,48 @@
164 164
 
165 165
 #endif // ifdef TFT35
166 166
 
167
+// Set the same image for both Released and Pressed
168
+void lv_imgbtn_set_src_both(lv_obj_t *imgbtn, const void *src);
169
+
170
+// Set label styles for Released and Pressed
171
+void lv_imgbtn_use_label_style(lv_obj_t *imgbtn);
172
+
173
+// Set label styles for Released and Pressed
174
+void lv_btn_use_label_style(lv_obj_t *btn);
175
+
176
+// Set the same style for both Released and Pressed
177
+void lv_btn_set_style_both(lv_obj_t *btn, lv_style_t *style);
178
+
179
+// Create an empty label
180
+lv_obj_t* lv_label_create_empty(lv_obj_t *par);
181
+
182
+// Create a label with style and text
183
+lv_obj_t* lv_label_create(lv_obj_t *par, const char *text);
184
+
185
+// Create a label with style, position, and text
186
+lv_obj_t* lv_label_create(lv_obj_t *par, lv_coord_t x, lv_coord_t y, const char *text);
187
+
188
+// Create a button with callback, ID, and Style.
189
+lv_obj_t* lv_btn_create(lv_obj_t *par, lv_event_cb_t cb, const int id, lv_style_t *style);
190
+
191
+// Create a button with callback and ID. Style set to style_para_value.
192
+lv_obj_t* lv_btn_create(lv_obj_t *par, lv_event_cb_t cb, const int id);
193
+
194
+// Create a button with position, size, callback, and ID. Style set to style_para_value.
195
+lv_obj_t* lv_btn_create(lv_obj_t *par, lv_coord_t x, lv_coord_t y, lv_coord_t w, lv_coord_t h, lv_event_cb_t cb, const int id);
196
+
197
+// Create a button with callback and ID. Style set to style_para_back.
198
+lv_obj_t* lv_btn_create_back(lv_obj_t *par, lv_event_cb_t cb, const int id);
199
+
200
+// Create a button with position, size, callback, and ID. Style set to style_para_back.
201
+lv_obj_t* lv_btn_create_back(lv_obj_t *par, lv_coord_t x, lv_coord_t y, lv_coord_t w, lv_coord_t h, lv_event_cb_t cb, const int id);
202
+
203
+// Create an image button with image, callback, and ID. Use label style.
204
+lv_obj_t* lv_imgbtn_create(lv_obj_t *par, const char *img, lv_event_cb_t cb, const int id);
205
+
206
+// Create an image button with image, position, callback, and ID. Use label style.
207
+lv_obj_t* lv_imgbtn_create(lv_obj_t *par, const char *img, lv_coord_t x, lv_coord_t y, lv_event_cb_t cb, const int id);
208
+
167 209
 #ifdef __cplusplus
168 210
   extern "C" { /* C-declarations for C++ */
169 211
 #endif

+ 29
- 44
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp Vedi File

@@ -70,9 +70,9 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
70 70
 }
71 71
 
72 72
 void lv_draw_wifi(void) {
73
-  lv_obj_t *buttonBack=NULL,*label_Back=NULL;
74
-  lv_obj_t *buttonCloud=NULL,*label_Cloud=NULL;
75
-  lv_obj_t *buttonReconnect=NULL,*label_Reconnect=NULL;
73
+  lv_obj_t *buttonBack = NULL, *label_Back = NULL;
74
+  lv_obj_t *buttonCloud = NULL, *label_Cloud = NULL;
75
+  lv_obj_t *buttonReconnect = NULL, *label_Reconnect=NULL;
76 76
   if (disp_state_stack._disp_state[disp_state_stack._disp_index] != WIFI_UI) {
77 77
     disp_state_stack._disp_index++;
78 78
     disp_state_stack._disp_state[disp_state_stack._disp_index] = WIFI_UI;
@@ -85,78 +85,63 @@ void lv_draw_wifi(void) {
85 85
   lv_scr_load(scr);
86 86
   lv_obj_clean(scr);
87 87
 
88
-  lv_obj_t * title = lv_label_create(scr, NULL);
89
-  lv_obj_set_style(title, &tft_style_label_rel);
90
-  lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS);
91
-  lv_label_set_text(title, creat_title_text());
88
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
92 89
 
93 90
   lv_refr_now(lv_refr_get_disp_refreshing());
94 91
 
95 92
   // Create an Image button
96
-  buttonBack = lv_imgbtn_create(scr, NULL);
97
-  if (gCfgItems.wifi_mode_sel == STA_MODEL) {
98
-    //buttonCloud = lv_imgbtn_create(scr, NULL);
99
-    buttonReconnect = lv_imgbtn_create(scr, NULL);
100
-  }
93
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RETURN);
101 94
 
102
-  lv_obj_set_event_cb_mks(buttonBack, event_handler,ID_W_RETURN, NULL,0);
103
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_return.bin");
104
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_return.bin");
105
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
106
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
107 95
   #if HAS_ROTARY_ENCODER
108 96
     if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
109 97
   #endif
110 98
 
111
-  lv_obj_set_pos(buttonBack,BTN_X_PIXEL*3+INTERVAL_V*4,  BTN_Y_PIXEL+INTERVAL_H+titleHeight);
112
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
99
+  if (gCfgItems.wifi_mode_sel == STA_MODEL) {
100
+    //buttonCloud = lv_imgbtn_create(scr, NULL);
101
+    buttonReconnect = lv_imgbtn_create(scr, NULL);
102
+  }
113 103
 
114 104
   if (gCfgItems.wifi_mode_sel == STA_MODEL) {
115 105
 
116
-    lv_obj_set_event_cb_mks(buttonReconnect, event_handler,ID_W_RECONNECT, NULL,0);
117
-    lv_imgbtn_set_src(buttonReconnect, LV_BTN_STATE_REL, "F:/bmp_wifi.bin");
118
-    lv_imgbtn_set_src(buttonReconnect, LV_BTN_STATE_PR, "F:/bmp_wifi.bin");
119
-    lv_imgbtn_set_style(buttonReconnect, LV_BTN_STATE_PR, &tft_style_label_pre);
120
-    lv_imgbtn_set_style(buttonReconnect, LV_BTN_STATE_REL, &tft_style_label_rel);
106
+    lv_obj_set_event_cb_mks(buttonReconnect, event_handler,ID_W_RECONNECT, NULL, 0);
107
+    lv_imgbtn_set_src_both(buttonReconnect, "F:/bmp_wifi.bin");
108
+    lv_imgbtn_use_label_style(buttonReconnect);
121 109
 
122 110
     #if HAS_ROTARY_ENCODER
123 111
       if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonReconnect);
124 112
     #endif
125 113
 
126
-    lv_obj_set_pos(buttonReconnect,BTN_X_PIXEL*2+INTERVAL_V*3,  BTN_Y_PIXEL+INTERVAL_H+titleHeight);
114
+    lv_obj_set_pos(buttonReconnect, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
127 115
     lv_btn_set_layout(buttonReconnect, LV_LAYOUT_OFF);
128 116
   }
129 117
 
130
-  label_Back = lv_label_create(buttonBack, NULL);
118
+  label_Back = lv_label_create_empty(buttonBack);
131 119
 
132 120
   if (gCfgItems.wifi_mode_sel == STA_MODEL) {
133
-    //label_Cloud = lv_label_create(buttonCloud, NULL);
134
-    label_Reconnect = lv_label_create(buttonReconnect, NULL);
121
+    //label_Cloud = lv_label_create_empty(buttonCloud);
122
+    label_Reconnect = lv_label_create_empty(buttonReconnect);
135 123
   }
136 124
 
137 125
   if (gCfgItems.multiple_language) {
138 126
     lv_label_set_text(label_Back, common_menu.text_back);
139
-    lv_obj_align(label_Back, buttonBack, LV_ALIGN_IN_BOTTOM_MID,0, BUTTON_TEXT_Y_OFFSET);
127
+    lv_obj_align(label_Back, buttonBack, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
140 128
 
141 129
     if (gCfgItems.wifi_mode_sel == STA_MODEL) {
142 130
       //lv_label_set_text(label_Cloud, common_menu.text_back);
143
-      //lv_obj_align(label_Cloud, buttonCloud, LV_ALIGN_IN_BOTTOM_MID,0, BUTTON_TEXT_Y_OFFSET);
131
+      //lv_obj_align(label_Cloud, buttonCloud, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
144 132
 
145 133
       lv_label_set_text(label_Reconnect, wifi_menu.reconnect);
146
-      lv_obj_align(label_Reconnect, buttonReconnect, LV_ALIGN_IN_BOTTOM_MID,0, BUTTON_TEXT_Y_OFFSET);
134
+      lv_obj_align(label_Reconnect, buttonReconnect, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
147 135
     }
148 136
   }
149 137
 
150
-  wifi_ip_text = lv_label_create(scr, NULL);
138
+  wifi_ip_text = lv_label_create_empty(scr);
151 139
   lv_obj_set_style(wifi_ip_text, &tft_style_label_rel);
152
-
153
-  wifi_name_text = lv_label_create(scr, NULL);
140
+  wifi_name_text = lv_label_create_empty(scr);
154 141
   lv_obj_set_style(wifi_name_text, &tft_style_label_rel);
155
-
156
-  wifi_key_text = lv_label_create(scr, NULL);
142
+  wifi_key_text = lv_label_create_empty(scr);
157 143
   lv_obj_set_style(wifi_key_text, &tft_style_label_rel);
158
-
159
-  wifi_state_text = lv_label_create(scr, NULL);
144
+  wifi_state_text = lv_label_create_empty(scr);
160 145
   lv_obj_set_style(wifi_state_text, &tft_style_label_rel);
161 146
 
162 147
   disp_wifi_state();
@@ -167,20 +152,20 @@ void disp_wifi_state() {
167 152
   strcpy(public_buf_m,wifi_menu.ip);
168 153
   strcat(public_buf_m,ipPara.ip_addr);
169 154
   lv_label_set_text(wifi_ip_text, public_buf_m);
170
-  lv_obj_align(wifi_ip_text, NULL, LV_ALIGN_CENTER,0, -100);
155
+  lv_obj_align(wifi_ip_text, NULL, LV_ALIGN_CENTER, 0, -100);
171 156
 
172 157
   memset(public_buf_m, 0, sizeof(public_buf_m));
173 158
   strcpy(public_buf_m,wifi_menu.wifi);
174 159
   strcat(public_buf_m,wifiPara.ap_name);
175 160
   lv_label_set_text(wifi_name_text, public_buf_m);
176
-  lv_obj_align(wifi_name_text, NULL, LV_ALIGN_CENTER,0, -70);
161
+  lv_obj_align(wifi_name_text, NULL, LV_ALIGN_CENTER, 0, -70);
177 162
 
178 163
   if (wifiPara.mode == AP_MODEL) {
179 164
     memset(public_buf_m, 0, sizeof(public_buf_m));
180 165
     strcpy(public_buf_m,wifi_menu.key);
181 166
     strcat(public_buf_m,wifiPara.keyCode);
182 167
     lv_label_set_text(wifi_key_text, public_buf_m);
183
-    lv_obj_align(wifi_key_text, NULL, LV_ALIGN_CENTER,0, -40);
168
+    lv_obj_align(wifi_key_text, NULL, LV_ALIGN_CENTER, 0, -40);
184 169
 
185 170
     memset(public_buf_m, 0, sizeof(public_buf_m));
186 171
     strcpy(public_buf_m,wifi_menu.state_ap);
@@ -191,7 +176,7 @@ void disp_wifi_state() {
191 176
     else
192 177
       strcat(public_buf_m,wifi_menu.exception);
193 178
     lv_label_set_text(wifi_state_text, public_buf_m);
194
-    lv_obj_align(wifi_state_text, NULL, LV_ALIGN_CENTER,0, -10);
179
+    lv_obj_align(wifi_state_text, NULL, LV_ALIGN_CENTER, 0, -10);
195 180
   }
196 181
   else {
197 182
     ZERO(public_buf_m);
@@ -203,10 +188,10 @@ void disp_wifi_state() {
203 188
     else
204 189
       strcat(public_buf_m, wifi_menu.exception);
205 190
     lv_label_set_text(wifi_state_text, public_buf_m);
206
-    lv_obj_align(wifi_state_text, NULL, LV_ALIGN_CENTER,0, -40);
191
+    lv_obj_align(wifi_state_text, NULL, LV_ALIGN_CENTER, 0, -40);
207 192
 
208 193
     lv_label_set_text(wifi_key_text, "");
209
-    lv_obj_align(wifi_key_text, NULL, LV_ALIGN_CENTER,0, -10);
194
+    lv_obj_align(wifi_key_text, NULL, LV_ALIGN_CENTER, 0, -10);
210 195
   }
211 196
 }
212 197
 

+ 20
- 46
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp Vedi File

@@ -42,8 +42,8 @@ list_menu_def list_menu;
42 42
 extern lv_group_t * g;
43 43
 static lv_obj_t * scr;
44 44
 static lv_obj_t *buttonWifiN[NUMBER_OF_PAGE];
45
-static lv_obj_t *lableWifiText[NUMBER_OF_PAGE];
46
-static lv_obj_t *lablePageText;
45
+static lv_obj_t *labelWifiText[NUMBER_OF_PAGE];
46
+static lv_obj_t *labelPageText;
47 47
 
48 48
 #define ID_WL_RETURN      11
49 49
 #define ID_WL_DOWN        12
@@ -116,43 +116,21 @@ void lv_draw_wifi_list(void) {
116 116
   lv_scr_load(scr);
117 117
   lv_obj_clean(scr);
118 118
 
119
-  lv_obj_t * title = lv_label_create(scr, NULL);
120
-  lv_obj_set_style(title, &tft_style_label_rel);
121
-  lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS);
122
-  lv_label_set_text(title, creat_title_text());
119
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
123 120
 
124 121
   lv_refr_now(lv_refr_get_disp_refreshing());
125 122
 
126
-  buttonDown = lv_imgbtn_create(scr, NULL);
127
-  buttonBack = lv_imgbtn_create(scr, NULL);
128
-
129
-  lv_obj_set_event_cb_mks(buttonDown, event_handler,ID_WL_DOWN,NULL,0);
130
-  lv_imgbtn_set_src(buttonDown, LV_BTN_STATE_REL, "F:/bmp_pageDown.bin");
131
-  lv_imgbtn_set_src(buttonDown, LV_BTN_STATE_PR, "F:/bmp_pageDown.bin");
132
-  lv_imgbtn_set_style(buttonDown, LV_BTN_STATE_PR, &tft_style_label_pre);
133
-  lv_imgbtn_set_style(buttonDown, LV_BTN_STATE_REL, &tft_style_label_rel);
134
-
135
-  lv_obj_set_event_cb_mks(buttonBack, event_handler,ID_WL_RETURN,NULL,0);
136
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back.bin");
137
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back.bin");
138
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
139
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
140
-
141
-  lv_obj_set_pos(buttonDown,OTHER_BTN_XPIEL*3+INTERVAL_V*4,titleHeight+OTHER_BTN_YPIEL+INTERVAL_H);
142
-  lv_obj_set_pos(buttonBack,OTHER_BTN_XPIEL*3+INTERVAL_V*4,titleHeight+OTHER_BTN_YPIEL*2+INTERVAL_H*2);
143
-
144
-  lv_btn_set_layout(buttonDown, LV_LAYOUT_OFF);
145
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
123
+  buttonDown = lv_imgbtn_create(scr, "F:/bmp_pageDown.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H, event_handler, ID_WL_DOWN);
124
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + (OTHER_BTN_YPIEL + INTERVAL_H) * 2, event_handler, ID_WL_RETURN);
146 125
 
147 126
   for (uint8_t i = 0; i < NUMBER_OF_PAGE; i++) {
148 127
     buttonWifiN[i] = lv_btn_create(scr, NULL);     /*Add a button the current screen*/
149
-    lv_obj_set_pos(buttonWifiN[i], 0,NAME_BTN_Y*i+10+titleHeight);                            /*Set its position*/
150
-    lv_obj_set_size(buttonWifiN[i], NAME_BTN_X,NAME_BTN_Y);                          /*Set its size*/
151
-    lv_obj_set_event_cb_mks(buttonWifiN[i], event_handler,(i+1),NULL,0);
152
-    lv_btn_set_style(buttonWifiN[i], LV_BTN_STYLE_REL, &tft_style_label_rel);    /*Set the button's released style*/
153
-    lv_btn_set_style(buttonWifiN[i], LV_BTN_STYLE_PR, &tft_style_label_pre);      /*Set the button's pressed style*/
128
+    lv_obj_set_pos(buttonWifiN[i], 0, NAME_BTN_Y*i+10+titleHeight);                            /*Set its position*/
129
+    lv_obj_set_size(buttonWifiN[i], NAME_BTN_X, NAME_BTN_Y);                          /*Set its size*/
130
+    lv_obj_set_event_cb_mks(buttonWifiN[i], event_handler, (i+1), NULL, 0);
131
+    lv_btn_use_label_style(buttonWifiN[i]);
154 132
     lv_btn_set_layout(buttonWifiN[i], LV_LAYOUT_OFF);
155
-    lableWifiText[i] = lv_label_create(buttonWifiN[i], NULL);
133
+    labelWifiText[i] = lv_label_create_empty(buttonWifiN[i]);
156 134
     #if HAS_ROTARY_ENCODER
157 135
       uint8_t j = 0;
158 136
       if (gCfgItems.encoder_enable) {
@@ -162,8 +140,8 @@ void lv_draw_wifi_list(void) {
162 140
     #endif
163 141
   }
164 142
 
165
-  lablePageText = lv_label_create(scr, NULL);
166
-  lv_obj_set_style(lablePageText, &tft_style_label_rel);
143
+  labelPageText = lv_label_create_empty(scr);
144
+  lv_obj_set_style(labelPageText, &tft_style_label_rel);
167 145
 
168 146
   wifi_list.nameIndex = 0;
169 147
   wifi_list.currentWifipage = 1;
@@ -187,27 +165,23 @@ void disp_wifi_list(void) {
187 165
   uint8_t i, j;
188 166
 
189 167
   sprintf((char *)tmpStr, list_menu.file_pages, wifi_list.currentWifipage, wifi_list.getPage);
190
-  lv_label_set_text(lablePageText, (const char *)tmpStr);
191
-  lv_obj_align(lablePageText, NULL, LV_ALIGN_CENTER, 50, -100);
168
+  lv_label_set_text(labelPageText, (const char *)tmpStr);
169
+  lv_obj_align(labelPageText, NULL, LV_ALIGN_CENTER, 50, -100);
192 170
 
193 171
   for (i = 0; i < NUMBER_OF_PAGE; i++) {
194 172
     memset(tmpStr, 0, sizeof(tmpStr));
195 173
 
196 174
     j = wifi_list.nameIndex + i;
197 175
     if (j >= wifi_list.getNameNum) {
198
-      lv_label_set_text(lableWifiText[i], (const char *)tmpStr);
199
-      lv_obj_align(lableWifiText[i], buttonWifiN[i], LV_ALIGN_IN_LEFT_MID, 20, 0);
176
+      lv_label_set_text(labelWifiText[i], (const char *)tmpStr);
177
+      lv_obj_align(labelWifiText[i], buttonWifiN[i], LV_ALIGN_IN_LEFT_MID, 20, 0);
200 178
     }
201 179
     else {
202
-      lv_label_set_text(lableWifiText[i], (char const *)wifi_list.wifiName[j]);
203
-      lv_obj_align(lableWifiText[i], buttonWifiN[i], LV_ALIGN_IN_LEFT_MID, 20, 0);
180
+      lv_label_set_text(labelWifiText[i], (char const *)wifi_list.wifiName[j]);
181
+      lv_obj_align(labelWifiText[i], buttonWifiN[i], LV_ALIGN_IN_LEFT_MID, 20, 0);
204 182
 
205
-      if (wifi_link_state == WIFI_CONNECTED && strcmp((const char *)wifi_list.wifiConnectedName, (const char *)wifi_list.wifiName[j]) == 0) {
206
-        lv_btn_set_style(buttonWifiN[i], LV_BTN_STYLE_REL, &style_sel_text);
207
-      }
208
-      else {
209
-        lv_btn_set_style(buttonWifiN[i], LV_BTN_STYLE_REL, &tft_style_label_rel);
210
-      }
183
+      const bool btext = (wifi_link_state == WIFI_CONNECTED && strcmp((const char *)wifi_list.wifiConnectedName, (const char *)wifi_list.wifiName[j]) == 0);
184
+      lv_btn_set_style(buttonWifiN[i], LV_BTN_STYLE_REL, btext ? &style_sel_text : &tft_style_label_rel);
211 185
     }
212 186
   }
213 187
 }

+ 41
- 94
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp Vedi File

@@ -59,13 +59,13 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
59 59
         if (gCfgItems.wifi_mode_sel == AP_MODEL) {
60 60
           gCfgItems.wifi_mode_sel = STA_MODEL;
61 61
           lv_label_set_text(labelModelValue, WIFI_STA_TEXT);
62
-          lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER,0, 0);
62
+          lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER, 0, 0);
63 63
           update_spi_flash();
64 64
         }
65 65
         else {
66 66
           gCfgItems.wifi_mode_sel = AP_MODEL;
67 67
           lv_label_set_text(labelModelValue, WIFI_AP_TEXT);
68
-          lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER,0, 0);
68
+          lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER, 0, 0);
69 69
           update_spi_flash();
70 70
         }
71 71
       }
@@ -85,7 +85,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
85 85
 
86 86
       }
87 87
       else if (event == LV_EVENT_RELEASED) {
88
-      keyboard_value=wifiPassWord;
88
+      keyboard_value = wifiPassWord;
89 89
         lv_clear_wifi_settings();
90 90
         lv_draw_keyboard();
91 91
       }
@@ -95,19 +95,18 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
95 95
 
96 96
       }
97 97
       else if (event == LV_EVENT_RELEASED) {
98
-      if (gCfgItems.cloud_enable) {
99
-        gCfgItems.cloud_enable = false;
100
-        lv_obj_set_event_cb_mks(obj, event_handler,ID_WIFI_CLOUD,"bmp_disable.bin",0);
101
-        lv_label_set_text(labelCloudValue, machine_menu.disable);
102
-        update_spi_flash();
103
-      }
104
-      else {
105
-        gCfgItems.cloud_enable = true;
106
-        lv_obj_set_event_cb_mks(obj, event_handler,ID_WIFI_CLOUD,"bmp_enable.bin",0);
107
-        lv_label_set_text(labelCloudValue, machine_menu.enable);
98
+        if (gCfgItems.cloud_enable) {
99
+          gCfgItems.cloud_enable = false;
100
+          lv_obj_set_event_cb_mks(obj, event_handler, ID_WIFI_CLOUD, "bmp_disable.bin", 0);
101
+          lv_label_set_text(labelCloudValue, machine_menu.disable);
102
+        }
103
+        else {
104
+          gCfgItems.cloud_enable = true;
105
+          lv_obj_set_event_cb_mks(obj, event_handler, ID_WIFI_CLOUD, "bmp_enable.bin", 0);
106
+          lv_label_set_text(labelCloudValue, machine_menu.enable);
107
+        }
108 108
         update_spi_flash();
109 109
       }
110
-    }
111 110
     break;
112 111
     case ID_WIFI_CONFIG:
113 112
       if (event == LV_EVENT_CLICKED) {
@@ -140,113 +139,61 @@ void lv_draw_wifi_settings(void) {
140 139
   lv_scr_load(scr);
141 140
   lv_obj_clean(scr);
142 141
 
143
-  lv_obj_t * title = lv_label_create(scr, NULL);
144
-  lv_obj_set_style(title, &tft_style_label_rel);
145
-  lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS);
146
-  lv_label_set_text(title, machine_menu.WifiConfTitle);
142
+  (void)lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, machine_menu.WifiConfTitle);
147 143
 
148 144
   lv_refr_now(lv_refr_get_disp_refreshing());
149 145
 
150
-  labelModelText = lv_label_create(scr, NULL);
151
-  lv_obj_set_style(labelModelText, &tft_style_label_rel);
152
-  lv_obj_set_pos(labelModelText, PARA_UI_POS_X, PARA_UI_POS_Y + 10);
153
-  lv_label_set_text(labelModelText, machine_menu.wifiMode);
146
+  labelModelText = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y + 10, machine_menu.wifiMode);
154 147
 
155 148
   buttonModelValue = lv_imgbtn_create(scr, NULL);
156
-  lv_obj_set_pos(buttonModelValue,PARA_UI_VALUE_POS_X,PARA_UI_POS_Y+PARA_UI_VALUE_V);
157
-  lv_obj_set_event_cb_mks(buttonModelValue, event_handler,ID_WIFI_MODEL, NULL,0);
158
-  lv_imgbtn_set_src(buttonModelValue, LV_BTN_STATE_REL, "F:/bmp_blank_sel.bin");
159
-  lv_imgbtn_set_src(buttonModelValue, LV_BTN_STATE_PR, "F:/bmp_blank_sel.bin");
160
-  lv_imgbtn_set_style(buttonModelValue, LV_BTN_STATE_PR, &style_para_value_pre);
161
-  lv_imgbtn_set_style(buttonModelValue, LV_BTN_STATE_REL, &style_para_value_pre);
149
+  lv_imgbtn_set_src_both(buttonModelValue, "F:/bmp_blank_sel.bin");
150
+  lv_obj_set_pos(buttonModelValue, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y + PARA_UI_VALUE_V);
151
+  lv_obj_set_event_cb_mks(buttonModelValue, event_handler, ID_WIFI_MODEL, NULL, 0);
152
+  lv_btn_set_style_both(buttonModelValue, &style_para_value_pre);
162 153
   lv_btn_set_layout(buttonModelValue, LV_LAYOUT_OFF);
163
-  labelModelValue = lv_label_create(buttonModelValue, NULL);
154
+  labelModelValue = lv_label_create_empty(buttonModelValue);
164 155
 
165 156
   line1 = lv_line_create(scr, NULL);
166 157
   lv_ex_line(line1,line_points[0]);
167 158
 
168
-  labelNameText = lv_label_create(scr, NULL);
169
-  lv_obj_set_style(labelNameText, &tft_style_label_rel);
170
-  lv_obj_set_pos(labelNameText, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10);
159
+  labelNameText = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2 + 10, NULL);
171 160
 
172
-  buttonNameValue = lv_btn_create(scr, NULL);
173
-  lv_obj_set_pos(buttonNameValue,PARA_UI_VALUE_POS_X,PARA_UI_POS_Y*2+PARA_UI_VALUE_V);
174
-  lv_obj_set_size(buttonNameValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
175
-  lv_obj_set_event_cb_mks(buttonNameValue, event_handler,ID_WIFI_NAME, NULL,0);
176
-  lv_btn_set_style(buttonNameValue, LV_BTN_STYLE_REL, &style_para_value);
177
-  lv_btn_set_style(buttonNameValue, LV_BTN_STYLE_PR, &style_para_value);
178
-  labelNameValue = lv_label_create(buttonNameValue, NULL);
161
+  buttonNameValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 2 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_WIFI_NAME);
162
+  labelNameValue = lv_label_create_empty(buttonNameValue);
179 163
 
180 164
   line2 = lv_line_create(scr, NULL);
181 165
   lv_ex_line(line2,line_points[1]);
182 166
 
183
-  labelPassWordText = lv_label_create(scr, NULL);
184
-  lv_obj_set_style(labelPassWordText, &tft_style_label_rel);
185
-  lv_obj_set_pos(labelPassWordText, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10);
167
+  labelPassWordText = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3 + 10, NULL);
186 168
 
187
-  buttonPassWordValue = lv_btn_create(scr, NULL);
188
-  lv_obj_set_pos(buttonPassWordValue,PARA_UI_VALUE_POS_X,PARA_UI_POS_Y*3+PARA_UI_VALUE_V);
189
-  lv_obj_set_size(buttonPassWordValue, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE);
190
-  lv_obj_set_event_cb_mks(buttonPassWordValue, event_handler,ID_WIFI_PASSWORD, NULL,0);
191
-  lv_btn_set_style(buttonPassWordValue, LV_BTN_STYLE_REL, &style_para_value);
192
-  lv_btn_set_style(buttonPassWordValue, LV_BTN_STYLE_PR, &style_para_value);
193
-  labelPassWordValue = lv_label_create(buttonPassWordValue, NULL);
169
+  buttonPassWordValue = lv_btn_create(scr, PARA_UI_VALUE_POS_X, PARA_UI_POS_Y * 3 + PARA_UI_VALUE_V, PARA_UI_VALUE_BTN_X_SIZE, PARA_UI_VALUE_BTN_Y_SIZE, event_handler, ID_WIFI_PASSWORD);
170
+  labelPassWordValue = lv_label_create_empty(buttonPassWordValue);
194 171
 
195 172
   line3 = lv_line_create(scr, NULL);
196 173
   lv_ex_line(line3,line_points[2]);
197 174
 
198
-  labelCloudText = lv_label_create(scr, NULL);
199
-  lv_obj_set_style(labelCloudText, &tft_style_label_rel);
200
-  lv_obj_set_pos(labelCloudText, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10);
201
-  lv_label_set_text(labelCloudText, machine_menu.wifiCloud);
175
+  labelCloudText = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 4 + 10, machine_menu.wifiCloud);
202 176
 
203
-  buttonCloudValue = lv_imgbtn_create(scr, NULL);
204
-  lv_obj_set_pos(buttonCloudValue,PARA_UI_STATE_POS_X,PARA_UI_POS_Y*4+PARA_UI_STATE_V);
205
-  if (gCfgItems.cloud_enable) {
206
-    lv_imgbtn_set_src(buttonCloudValue, LV_BTN_STATE_REL, "F:/bmp_enable.bin");
207
-    lv_imgbtn_set_src(buttonCloudValue, LV_BTN_STATE_PR, "F:/bmp_enable.bin");
208
-  }
209
-  else {
210
-    lv_imgbtn_set_src(buttonCloudValue, LV_BTN_STATE_REL, "F:/bmp_disable.bin");
211
-    lv_imgbtn_set_src(buttonCloudValue, LV_BTN_STATE_PR, "F:/bmp_disable.bin");
212
-  }
213
-  lv_obj_set_event_cb_mks(buttonCloudValue, event_handler,ID_WIFI_CLOUD, NULL,0);
214
-  lv_imgbtn_set_style(buttonCloudValue, LV_BTN_STATE_PR, &tft_style_label_pre);
215
-  lv_imgbtn_set_style(buttonCloudValue, LV_BTN_STATE_REL, &tft_style_label_rel);
216
-  lv_btn_set_layout(buttonCloudValue, LV_LAYOUT_OFF);
217
-  labelCloudValue = lv_label_create(buttonCloudValue, NULL);
177
+  buttonCloudValue = lv_imgbtn_create(scr, gCfgItems.cloud_enable ? "F:/bmp_enable.bin" : "F:/bmp_disable.bin", PARA_UI_STATE_POS_X, PARA_UI_POS_Y * 4 + PARA_UI_STATE_V, event_handler, ID_WIFI_CLOUD);
178
+  labelCloudValue = lv_label_create_empty(buttonCloudValue);
218 179
 
219 180
   line4 = lv_line_create(scr, NULL);
220 181
   lv_ex_line(line4,line_points[3]);
221 182
 
222
-  buttonConfig = lv_imgbtn_create(scr, NULL);
223
-  lv_obj_set_event_cb_mks(buttonConfig, event_handler,ID_WIFI_CONFIG, NULL,0);
224
-    lv_imgbtn_set_src(buttonConfig, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
225
-  lv_imgbtn_set_src(buttonConfig, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
226
-  lv_imgbtn_set_style(buttonConfig, LV_BTN_STATE_PR, &tft_style_label_pre);
227
-  lv_imgbtn_set_style(buttonConfig, LV_BTN_STATE_REL, &tft_style_label_rel);
228
-  lv_obj_set_pos(buttonConfig, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y);
229
-  lv_btn_set_layout(buttonConfig, LV_LAYOUT_OFF);
230
-  labelConfig = lv_label_create(buttonConfig, NULL);
231
-
232
-  buttonBack = lv_imgbtn_create(scr, NULL);
233
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_WIFI_RETURN, NULL, 0);
234
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_REL, "F:/bmp_back70x40.bin");
235
-  lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, "F:/bmp_back70x40.bin");
236
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
237
-  lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
238
-  lv_obj_set_pos(buttonBack, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y);
239
-  lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
240
-  label_Back = lv_label_create(buttonBack, NULL);
183
+  buttonConfig = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_WIFI_CONFIG);
184
+  labelConfig = lv_label_create_empty(buttonConfig);
185
+
186
+  buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_WIFI_RETURN);
187
+  label_Back = lv_label_create_empty(buttonBack);
241 188
 
242 189
   if (gCfgItems.multiple_language) {
243 190
     if (gCfgItems.wifi_mode_sel == AP_MODEL) {
244 191
       lv_label_set_text(labelModelValue, WIFI_AP_TEXT);
245
-      lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER,0, 0);
192
+      lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER, 0, 0);
246 193
     }
247 194
     else {
248 195
       lv_label_set_text(labelModelValue, WIFI_STA_TEXT);
249
-      lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER,0, 0);
196
+      lv_obj_align(labelModelValue, buttonModelValue, LV_ALIGN_CENTER, 0, 0);
250 197
     }
251 198
     memset(public_buf_m,0,sizeof(public_buf_m));
252 199
     strcat(public_buf_m,machine_menu.wifiName);
@@ -254,7 +201,7 @@ void lv_draw_wifi_settings(void) {
254 201
     lv_label_set_text(labelNameText,public_buf_m);
255 202
 
256 203
     lv_label_set_text(labelNameValue,machine_menu.wifiEdit);
257
-    lv_obj_align(labelNameValue, buttonNameValue, LV_ALIGN_CENTER,0, 0);
204
+    lv_obj_align(labelNameValue, buttonNameValue, LV_ALIGN_CENTER, 0, 0);
258 205
 
259 206
     memset(public_buf_m,0,sizeof(public_buf_m));
260 207
     strcat(public_buf_m,machine_menu.wifiPassWord);
@@ -262,16 +209,16 @@ void lv_draw_wifi_settings(void) {
262 209
     lv_label_set_text(labelPassWordText,public_buf_m);
263 210
 
264 211
     lv_label_set_text(labelPassWordValue,machine_menu.wifiEdit);
265
-    lv_obj_align(labelPassWordValue, buttonPassWordValue, LV_ALIGN_CENTER,0, 0);
212
+    lv_obj_align(labelPassWordValue, buttonPassWordValue, LV_ALIGN_CENTER, 0, 0);
266 213
 
267 214
     lv_label_set_text(labelCloudValue, gCfgItems.cloud_enable ? machine_menu.enable : machine_menu.disable);
268
-    lv_obj_align(labelCloudValue, buttonCloudValue, LV_ALIGN_CENTER,0, 0);
215
+    lv_obj_align(labelCloudValue, buttonCloudValue, LV_ALIGN_CENTER, 0, 0);
269 216
 
270 217
     lv_label_set_text(labelConfig,machine_menu.wifiConfig);
271
-    lv_obj_align(labelConfig, buttonConfig, LV_ALIGN_CENTER,0, 0);
218
+    lv_obj_align(labelConfig, buttonConfig, LV_ALIGN_CENTER, 0, 0);
272 219
 
273 220
     lv_label_set_text(label_Back, common_menu.text_back);
274
-    lv_obj_align(label_Back, buttonBack, LV_ALIGN_CENTER,0, 0);
221
+    lv_obj_align(label_Back, buttonBack, LV_ALIGN_CENTER, 0, 0);
275 222
   }
276 223
 
277 224
   #if HAS_ROTARY_ENCODER

+ 6
- 11
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp Vedi File

@@ -52,28 +52,23 @@ void lv_draw_wifi_tips(void) {
52 52
   lv_obj_clean(scr);
53 53
   lv_refr_now(lv_refr_get_disp_refreshing());
54 54
 
55
-  text_tips = lv_label_create(scr, NULL);
56
-  lv_obj_set_style(text_tips, &tft_style_label_rel);
57
-
58
-  wifi_name = lv_label_create(scr, NULL);
59
-  lv_obj_set_style(wifi_name, &tft_style_label_rel);
55
+  wifi_name = lv_label_create(scr, (const char *)wifi_list.wifiName[wifi_list.nameIndex]);
56
+  lv_obj_align(wifi_name, NULL, LV_ALIGN_CENTER, 0, -20);
60 57
 
58
+  text_tips = lv_label_create_empty(scr);
61 59
   if (wifi_tips_type == TIPS_TYPE_JOINING) {
62 60
     lv_label_set_text(text_tips, tips_menu.joining);
63
-    lv_obj_align(text_tips, NULL, LV_ALIGN_CENTER,0, -60);
61
+    lv_obj_align(text_tips, NULL, LV_ALIGN_CENTER, 0, -60);
64 62
   }
65 63
   else if (wifi_tips_type == TIPS_TYPE_TAILED_JOIN) {
66 64
     lv_label_set_text(text_tips, tips_menu.failedJoin);
67
-    lv_obj_align(text_tips, NULL, LV_ALIGN_CENTER,0, -60);
65
+    lv_obj_align(text_tips, NULL, LV_ALIGN_CENTER, 0, -60);
68 66
   }
69 67
   else if (wifi_tips_type == TIPS_TYPE_WIFI_CONECTED) {
70 68
     lv_label_set_text(text_tips, tips_menu.wifiConected);
71
-    lv_obj_align(text_tips, NULL, LV_ALIGN_CENTER,0, -60);
69
+    lv_obj_align(text_tips, NULL, LV_ALIGN_CENTER, 0, -60);
72 70
   }
73 71
 
74
-  lv_label_set_text(wifi_name, (const char *)wifi_list.wifiName[wifi_list.nameIndex]);
75
-  lv_obj_align(wifi_name, NULL, LV_ALIGN_CENTER,0, -20);
76
-
77 72
   tips_disp.timer = TIPS_TIMER_START;
78 73
   tips_disp.timer_count = 0;
79 74
 }

Loading…
Annulla
Salva