@@ -289,7 +289,7 @@ impl<DB: DrawingBackend, CT: CoordTranslate> DrawingArea<DB, CT> {
289
289
self . backend_ops ( |backend| {
290
290
backend. draw_rect (
291
291
( self . rect . x0 , self . rect . y0 ) ,
292
- ( self . rect . x1 - 1 , self . rect . y1 - 1 ) ,
292
+ ( self . rect . x1 , self . rect . y1 ) ,
293
293
& color. to_backend_color ( ) ,
294
294
true ,
295
295
)
@@ -549,7 +549,7 @@ mod drawing_area_tests {
549
549
assert_eq ! ( c, WHITE . to_rgba( ) ) ;
550
550
assert_eq ! ( f, true ) ;
551
551
assert_eq ! ( u, ( 0 , 0 ) ) ;
552
- assert_eq ! ( d, ( 1023 , 767 ) ) ;
552
+ assert_eq ! ( d, ( 1024 , 768 ) ) ;
553
553
} ) ;
554
554
555
555
m. drop_check ( |b| {
@@ -577,8 +577,8 @@ mod drawing_area_tests {
577
577
assert_eq ! (
578
578
d,
579
579
(
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
582
582
)
583
583
) ;
584
584
} ) ;
@@ -606,14 +606,14 @@ mod drawing_area_tests {
606
606
assert_eq ! ( c, RED . to_rgba( ) ) ;
607
607
assert_eq ! ( f, true ) ;
608
608
assert_eq ! ( u, ( 0 , 0 ) ) ;
609
- assert_eq ! ( d, ( 345 - 1 , 768 - 1 ) ) ;
609
+ assert_eq ! ( d, ( 345 , 768 ) ) ;
610
610
} ) ;
611
611
612
612
m. check_draw_rect ( |c, _, f, u, d| {
613
613
assert_eq ! ( c, BLUE . to_rgba( ) ) ;
614
614
assert_eq ! ( f, true ) ;
615
615
assert_eq ! ( u, ( 345 , 0 ) ) ;
616
- assert_eq ! ( d, ( 1024 - 1 , 768 - 1 ) ) ;
616
+ assert_eq ! ( d, ( 1024 , 768 ) ) ;
617
617
} ) ;
618
618
619
619
m. drop_check ( |b| {
@@ -634,14 +634,14 @@ mod drawing_area_tests {
634
634
assert_eq ! ( c, RED . to_rgba( ) ) ;
635
635
assert_eq ! ( f, true ) ;
636
636
assert_eq ! ( u, ( 0 , 0 ) ) ;
637
- assert_eq ! ( d, ( 1024 - 1 , 345 - 1 ) ) ;
637
+ assert_eq ! ( d, ( 1024 , 345 ) ) ;
638
638
} ) ;
639
639
640
640
m. check_draw_rect ( |c, _, f, u, d| {
641
641
assert_eq ! ( c, BLUE . to_rgba( ) ) ;
642
642
assert_eq ! ( f, true ) ;
643
643
assert_eq ! ( u, ( 0 , 345 ) ) ;
644
- assert_eq ! ( d, ( 1024 - 1 , 768 - 1 ) ) ;
644
+ assert_eq ! ( d, ( 1024 , 768 ) ) ;
645
645
} ) ;
646
646
647
647
m. drop_check ( |b| {
@@ -678,10 +678,8 @@ mod drawing_area_tests {
678
678
} ;
679
679
680
680
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 ) ) ;
685
683
let expected_color =
686
684
colors[ ( row * ( nxb + 1 ) + col) as usize % colors. len ( ) ] ;
687
685
@@ -724,7 +722,7 @@ mod drawing_area_tests {
724
722
assert_eq ! ( f, true ) ;
725
723
assert_eq ! ( u. 0 , 0 ) ;
726
724
assert ! ( u. 1 > 0 ) ;
727
- assert_eq ! ( d, ( 1024 - 1 , 768 - 1 ) ) ;
725
+ assert_eq ! ( d, ( 1024 , 768 ) ) ;
728
726
} ) ;
729
727
m. drop_check ( |b| {
730
728
assert_eq ! ( b. num_draw_text_call, 1 ) ;
@@ -747,7 +745,7 @@ mod drawing_area_tests {
747
745
assert_eq ! ( c, WHITE . to_rgba( ) ) ;
748
746
assert_eq ! ( f, true ) ;
749
747
assert_eq ! ( u, ( 3 , 1 ) ) ;
750
- assert_eq ! ( d, ( 1024 - 4 - 1 , 768 - 2 - 1 ) ) ;
748
+ assert_eq ! ( d, ( 1024 - 4 , 768 - 2 ) ) ;
751
749
} ) ;
752
750
753
751
m. drop_check ( |b| {
@@ -802,22 +800,22 @@ mod drawing_area_tests {
802
800
0 => {
803
801
assert_eq ! ( c, RED . to_rgba( ) ) ;
804
802
assert_eq ! ( u, ( 0 , 0 ) ) ;
805
- assert_eq ! ( d, ( 300 - 1 , 600 - 1 ) ) ;
803
+ assert_eq ! ( d, ( 300 , 600 ) ) ;
806
804
}
807
805
1 => {
808
806
assert_eq ! ( c, BLUE . to_rgba( ) ) ;
809
807
assert_eq ! ( u, ( 300 , 0 ) ) ;
810
- assert_eq ! ( d, ( 1000 - 1 , 600 - 1 ) ) ;
808
+ assert_eq ! ( d, ( 1000 , 600 ) ) ;
811
809
}
812
810
2 => {
813
811
assert_eq ! ( c, GREEN . to_rgba( ) ) ;
814
812
assert_eq ! ( u, ( 0 , 600 ) ) ;
815
- assert_eq ! ( d, ( 300 - 1 , 1200 - 1 ) ) ;
813
+ assert_eq ! ( d, ( 300 , 1200 ) ) ;
816
814
}
817
815
3 => {
818
816
assert_eq ! ( c, WHITE . to_rgba( ) ) ;
819
817
assert_eq ! ( u, ( 300 , 600 ) ) ;
820
- assert_eq ! ( d, ( 1000 - 1 , 1200 - 1 ) ) ;
818
+ assert_eq ! ( d, ( 1000 , 1200 ) ) ;
821
819
}
822
820
_ => panic ! ( "Too many draw rect" ) ,
823
821
}
@@ -845,7 +843,7 @@ mod drawing_area_tests {
845
843
let drawing_area = create_mocked_drawing_area ( 1000 , 1200 , |m| {
846
844
m. check_draw_rect ( move |_, _, _, u, d| {
847
845
assert_eq ! ( ( 100 , 100 ) , u) ;
848
- assert_eq ! ( ( 300 - 1 , 700 - 1 ) , d) ;
846
+ assert_eq ! ( ( 300 , 700 ) , d) ;
849
847
} ) ;
850
848
851
849
m. drop_check ( |b| {
0 commit comments