Fix sharp corners for rectangles with StrokeKind != Inside (#5675)

Oops!
emilk · Feb 4, 2025 · c90b97f · c90b97f
1 parent b8051cc
commit c90b97f
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 16 deletions.
diff --git a/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs b/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs
@@ -93,6 +93,19 @@ impl TessellationTest {
                 )
                 .with_blur_width(5.0),
             ),
+            (
+                "Additive rectangle",
+                RectShape::new(
+                    sized([24.0, 12.0]),
+                    0.0,
+                    egui::Color32::LIGHT_RED.additive().linear_multiply(0.025),
+                    (
+                        1.0,
+                        egui::Color32::LIGHT_BLUE.additive().linear_multiply(0.1),
+                    ),
+                    StrokeKind::Outside,
+                ),
+            ),
         ];
 
         for (_name, shape) in &mut shapes {

diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.00.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.00.png
diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.25.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.25.png
diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.50.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.50.png
diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.67.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.67.png
diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.75.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.75.png
diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_2.00.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_2.00.png
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Additive rectangle.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Additive rectangle.png
diff --git a/crates/epaint/src/tessellator.rs b/crates/epaint/src/tessellator.rs
@@ -1885,19 +1885,27 @@ impl Tessellator {
 
             let extra_cr_tweak = 0.4; // Otherwise is doesn't _feels_  enough.
 
-            if 0.0 < original_cr.nw {
+            if original_cr.nw == 0.0 {
+                corner_radius.nw = 0.0;
+            } else {
                 corner_radius.nw += extra_cr_tweak;
                 corner_radius.nw = corner_radius.nw.at_least(min_outside_cr);
             }
-            if 0.0 < original_cr.ne {
+            if original_cr.ne == 0.0 {
+                corner_radius.ne = 0.0;
+            } else {
                 corner_radius.ne += extra_cr_tweak;
                 corner_radius.ne = corner_radius.ne.at_least(min_outside_cr);
             }
-            if 0.0 < original_cr.sw {
+            if original_cr.sw == 0.0 {
+                corner_radius.sw = 0.0;
+            } else {
                 corner_radius.sw += extra_cr_tweak;
                 corner_radius.sw = corner_radius.sw.at_least(min_outside_cr);
             }
-            if 0.0 < original_cr.se {
+            if original_cr.se == 0.0 {
+                corner_radius.se = 0.0;
+            } else {
                 corner_radius.se += extra_cr_tweak;
                 corner_radius.se = corner_radius.se.at_least(min_outside_cr);
             }