Skip to content

Commit c88915b

Browse files
shinmili38
authored andcommitted
Fix DrawingArea::fill (fill bottom/right edges too)
1 parent fa02783 commit c88915b

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

plotters/src/drawing/area.rs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ impl<DB: DrawingBackend, CT: CoordTranslate> DrawingArea<DB, CT> {
289289
self.backend_ops(|backend| {
290290
backend.draw_rect(
291291
(self.rect.x0, self.rect.y0),
292-
(self.rect.x1 - 1, self.rect.y1 - 1),
292+
(self.rect.x1, self.rect.y1),
293293
&color.to_backend_color(),
294294
true,
295295
)
@@ -549,7 +549,7 @@ mod drawing_area_tests {
549549
assert_eq!(c, WHITE.to_rgba());
550550
assert_eq!(f, true);
551551
assert_eq!(u, (0, 0));
552-
assert_eq!(d, (1023, 767));
552+
assert_eq!(d, (1024, 768));
553553
});
554554

555555
m.drop_check(|b| {
@@ -577,8 +577,8 @@ mod drawing_area_tests {
577577
assert_eq!(
578578
d,
579579
(
580-
300 + 300 * row as i32 + 2.min(row + 1) as i32 - 1,
581-
300 + 300 * col as i32 - 1
580+
300 + 300 * row as i32 + 2.min(row + 1) as i32,
581+
300 + 300 * col as i32
582582
)
583583
);
584584
});
@@ -606,14 +606,14 @@ mod drawing_area_tests {
606606
assert_eq!(c, RED.to_rgba());
607607
assert_eq!(f, true);
608608
assert_eq!(u, (0, 0));
609-
assert_eq!(d, (345 - 1, 768 - 1));
609+
assert_eq!(d, (345, 768));
610610
});
611611

612612
m.check_draw_rect(|c, _, f, u, d| {
613613
assert_eq!(c, BLUE.to_rgba());
614614
assert_eq!(f, true);
615615
assert_eq!(u, (345, 0));
616-
assert_eq!(d, (1024 - 1, 768 - 1));
616+
assert_eq!(d, (1024, 768));
617617
});
618618

619619
m.drop_check(|b| {
@@ -634,14 +634,14 @@ mod drawing_area_tests {
634634
assert_eq!(c, RED.to_rgba());
635635
assert_eq!(f, true);
636636
assert_eq!(u, (0, 0));
637-
assert_eq!(d, (1024 - 1, 345 - 1));
637+
assert_eq!(d, (1024, 345));
638638
});
639639

640640
m.check_draw_rect(|c, _, f, u, d| {
641641
assert_eq!(c, BLUE.to_rgba());
642642
assert_eq!(f, true);
643643
assert_eq!(u, (0, 345));
644-
assert_eq!(d, (1024 - 1, 768 - 1));
644+
assert_eq!(d, (1024, 768));
645645
});
646646

647647
m.drop_check(|b| {
@@ -678,10 +678,8 @@ mod drawing_area_tests {
678678
};
679679

680680
let expected_u = (get_bp(1024, nxb, col), get_bp(768, nyb, row));
681-
let expected_d = (
682-
get_bp(1024, nxb, col + 1) - 1,
683-
get_bp(768, nyb, row + 1) - 1,
684-
);
681+
let expected_d =
682+
(get_bp(1024, nxb, col + 1), get_bp(768, nyb, row + 1));
685683
let expected_color =
686684
colors[(row * (nxb + 1) + col) as usize % colors.len()];
687685

@@ -724,7 +722,7 @@ mod drawing_area_tests {
724722
assert_eq!(f, true);
725723
assert_eq!(u.0, 0);
726724
assert!(u.1 > 0);
727-
assert_eq!(d, (1024 - 1, 768 - 1));
725+
assert_eq!(d, (1024, 768));
728726
});
729727
m.drop_check(|b| {
730728
assert_eq!(b.num_draw_text_call, 1);
@@ -747,7 +745,7 @@ mod drawing_area_tests {
747745
assert_eq!(c, WHITE.to_rgba());
748746
assert_eq!(f, true);
749747
assert_eq!(u, (3, 1));
750-
assert_eq!(d, (1024 - 4 - 1, 768 - 2 - 1));
748+
assert_eq!(d, (1024 - 4, 768 - 2));
751749
});
752750

753751
m.drop_check(|b| {
@@ -802,22 +800,22 @@ mod drawing_area_tests {
802800
0 => {
803801
assert_eq!(c, RED.to_rgba());
804802
assert_eq!(u, (0, 0));
805-
assert_eq!(d, (300 - 1, 600 - 1));
803+
assert_eq!(d, (300, 600));
806804
}
807805
1 => {
808806
assert_eq!(c, BLUE.to_rgba());
809807
assert_eq!(u, (300, 0));
810-
assert_eq!(d, (1000 - 1, 600 - 1));
808+
assert_eq!(d, (1000, 600));
811809
}
812810
2 => {
813811
assert_eq!(c, GREEN.to_rgba());
814812
assert_eq!(u, (0, 600));
815-
assert_eq!(d, (300 - 1, 1200 - 1));
813+
assert_eq!(d, (300, 1200));
816814
}
817815
3 => {
818816
assert_eq!(c, WHITE.to_rgba());
819817
assert_eq!(u, (300, 600));
820-
assert_eq!(d, (1000 - 1, 1200 - 1));
818+
assert_eq!(d, (1000, 1200));
821819
}
822820
_ => panic!("Too many draw rect"),
823821
}
@@ -845,7 +843,7 @@ mod drawing_area_tests {
845843
let drawing_area = create_mocked_drawing_area(1000, 1200, |m| {
846844
m.check_draw_rect(move |_, _, _, u, d| {
847845
assert_eq!((100, 100), u);
848-
assert_eq!((300 - 1, 700 - 1), d);
846+
assert_eq!((300, 700), d);
849847
});
850848

851849
m.drop_check(|b| {

0 commit comments

Comments
 (0)