|
@@ -597,15 +597,15 @@ void MarlinUI::draw_status_screen() {
|
597
|
597
|
// Progress bar frame
|
598
|
598
|
//
|
599
|
599
|
|
600
|
|
- if (PAGE_CONTAINS(49, 52))
|
|
600
|
+ if (PAGE_CONTAINS(PROGRESS_BAR_Y, PROGRESS_BAR_Y + 3))
|
601
|
601
|
u8g.drawFrame(PROGRESS_BAR_X, PROGRESS_BAR_Y, PROGRESS_BAR_WIDTH, 4);
|
602
|
602
|
|
603
|
603
|
//
|
604
|
604
|
// Progress bar solid part
|
605
|
605
|
//
|
606
|
606
|
|
607
|
|
- if (PAGE_CONTAINS(50, 51)) // 50-51 (or just 50)
|
608
|
|
- u8g.drawBox(PROGRESS_BAR_X + 1, 50, progress_bar_solid_width, 2);
|
|
607
|
+ if (PAGE_CONTAINS(PROGRESS_BAR_Y + 1, PROGRESS_BAR_Y + 2))
|
|
608
|
+ u8g.drawBox(PROGRESS_BAR_X + 1, PROGRESS_BAR_Y + 1, progress_bar_solid_width, 2);
|
609
|
609
|
|
610
|
610
|
if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
|
611
|
611
|
|