Browse Source

Finish DOGM progress bar

Fixes #17940
Scott Lahteine 5 years ago
parent
commit
7664e552f1
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp

+ 3
- 3
Marlin/src/lcd/dogm/status_screen_DOGM.cpp View File

597
     // Progress bar frame
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
       u8g.drawFrame(PROGRESS_BAR_X, PROGRESS_BAR_Y, PROGRESS_BAR_WIDTH, 4);
601
       u8g.drawFrame(PROGRESS_BAR_X, PROGRESS_BAR_Y, PROGRESS_BAR_WIDTH, 4);
602
 
602
 
603
     //
603
     //
604
     // Progress bar solid part
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
     if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
610
     if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
611
 
611
 

Loading…
Cancel
Save