Fix last line check for logger

phil-opp · phil-opp · commit 47a4c85d96e2 · 2022-09-11T12:54:52.000+02:00
diff --git a/common/src/logger.rs b/common/src/logger.rs
@@ -103,12 +103,10 @@ impl Logger {
                 if self.x_pos >= self.width() {
                     self.newline();
                 }
-                const BITMAP_LETTER_WIDTH: usize =
-                    get_bitmap_width(FontWeight::Regular, BitmapHeight::Size14);
-                if self.y_pos >= (self.height() - BITMAP_LETTER_WIDTH) {
+                let bitmap_char = get_bitmap(c, FontWeight::Regular, BitmapHeight::Size14).unwrap();
+                if self.y_pos >= (self.height() - bitmap_char.height()) {
                     self.clear();
                 }
-                let bitmap_char = get_bitmap(c, FontWeight::Regular, BitmapHeight::Size14).unwrap();
                 self.write_rendered_char(bitmap_char);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,10 @@ impl Logger {`
`103`	`103`	`if self.x_pos >= self.width() {`
`104`	`104`	`self.newline();`
`105`	`105`	`}`
`106`		`- const BITMAP_LETTER_WIDTH: usize =`
`107`		`- get_bitmap_width(FontWeight::Regular, BitmapHeight::Size14);`
`108`		`- if self.y_pos >= (self.height() - BITMAP_LETTER_WIDTH) {`
	`106`	`+ let bitmap_char = get_bitmap(c, FontWeight::Regular, BitmapHeight::Size14).unwrap();`
	`107`	`+ if self.y_pos >= (self.height() - bitmap_char.height()) {`
`109`	`108`	`self.clear();`
`110`	`109`	`}`
`111`		`- let bitmap_char = get_bitmap(c, FontWeight::Regular, BitmapHeight::Size14).unwrap();`
`112`	`110`	`self.write_rendered_char(bitmap_char);`
`113`	`111`	`}`
`114`	`112`	`}`