29
29
30
30
#include " ../ftdi_eve_lib/extras/poly_ui.h"
31
31
32
- #ifdef TOUCH_UI_PORTRAIT
32
+ #if ENABLED(TOUCH_UI_COCOA_PRESS)
33
+ #include " cocoa_press_ui.h"
34
+ #elif ENABLED(TOUCH_UI_PORTRAIT)
33
35
#include " bio_printer_ui_portrait.h"
34
36
#else
35
37
#include " bio_printer_ui_landscape.h"
@@ -100,7 +102,7 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
100
102
// heating zones, but has no bed temperature
101
103
102
104
cmd.cmd (COLOR_RGB (bg_text_enabled));
103
- cmd.font (font_medium );
105
+ cmd.font (font_xsmall );
104
106
105
107
ui.bounds (POLY (h0_label), x, y, h, v);
106
108
cmd.text (x, y, h, v, GET_TEXT_F (MSG_ZONE_1));
@@ -221,7 +223,7 @@ void StatusScreen::draw_syringe(draw_mode_t what) {
221
223
ui.color (syringe_rgb);
222
224
ui.fill (POLY (syringe_outline));
223
225
224
- ui.color (fill_rgb );
226
+ ui.color (fluid_rgb );
225
227
ui.bounds (POLY (syringe_fluid), x, y, h, v);
226
228
cmd.cmd (SAVE_CONTEXT ());
227
229
cmd.cmd (SCISSOR_XY (x,y + v * (1.0 - fill_level)));
@@ -245,23 +247,25 @@ void StatusScreen::draw_arrows(draw_mode_t what) {
245
247
ui.button_stroke (stroke_rgb, 28 );
246
248
ui.button_shadow (shadow_rgb, shadow_depth);
247
249
250
+ constexpr uint8_t style = TERN (TOUCH_UI_COCOA_PRESS, PolyUI::FILL | PolyUI::SHADOW, PolyUI::REGULAR);
251
+
248
252
if ((what & BACKGROUND) || jog_xy) {
249
- ui.button (1 , POLY (x_neg));
250
- ui.button (2 , POLY (x_pos));
251
- ui.button (3 , POLY (y_neg));
252
- ui.button (4 , POLY (y_pos));
253
+ ui.button (1 , POLY (x_neg), style );
254
+ ui.button (2 , POLY (x_pos), style );
255
+ ui.button (3 , POLY (y_neg), style );
256
+ ui.button (4 , POLY (y_pos), style );
253
257
}
254
258
255
259
if ((what & BACKGROUND) || z_homed) {
256
- ui.button (5 , POLY (z_neg));
257
- ui.button (6 , POLY (z_pos));
260
+ ui.button (5 , POLY (z_neg), style );
261
+ ui.button (6 , POLY (z_pos), style );
258
262
}
259
263
260
264
if ((what & BACKGROUND) || e_homed) {
261
265
#if DISABLED(TOUCH_UI_COCOA_PRESS)
262
- ui.button (7 , POLY (e_neg));
266
+ ui.button (7 , POLY (e_neg), style );
263
267
#endif
264
- ui.button (8 , POLY (e_pos));
268
+ ui.button (8 , POLY (e_pos), style );
265
269
}
266
270
}
267
271
@@ -300,13 +304,14 @@ void StatusScreen::draw_overlay_icons(draw_mode_t what) {
300
304
PolyUI ui (cmd, what);
301
305
302
306
if (what & FOREGROUND) {
303
- ui.button_fill (fill_rgb);
307
+ ui.button_fill (TERN (TOUCH_UI_COCOA_PRESS, stroke_rgb, fill_rgb);
304
308
ui.button_stroke (stroke_rgb, 28 );
305
309
ui.button_shadow (shadow_rgb, shadow_depth);
306
310
307
- if (!jog_xy) ui.button (12 , POLY (padlock));
308
- if (!e_homed) ui.button (13 , POLY (home_e));
309
- if (!z_homed) ui.button (14 , POLY (home_z));
311
+ constexpr uint8_t style = TERN (TOUCH_UI_COCOA_PRESS, PolyUI::FILL | PolyUI::SHADOW, PolyUI::REGULAR);
312
+ if (!jog_xy) ui.button (12 , POLY (padlock), style);
313
+ if (!e_homed) ui.button (13 , POLY (home_e), style);
314
+ if (!z_homed) ui.button (14 , POLY (home_z), style);
310
315
}
311
316
}
312
317
0 commit comments