Fix blending of quad's border with background

Antonio Scandurra and Nathan Sobo created 4 years ago

Co-Authored-By: Nathan Sobo <[e-mail]>

Change summary

crates/gpui/src/platform/mac/shaders/shaders.metal | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

Detailed changes

crates/gpui/src/platform/mac/shaders/shaders.metal

@@ -66,21 +66,13 @@ float4 quad_sdf(QuadFragmentInput input) {
         border_width = vertical_border;
     }
 
-    float4 color;
-    if (border_width == 0.) {
-        color = input.background_color;
-    } else {
-        float4 border_color = float4(mix(float3(input.background_color), float3(input.border_color), input.border_color.a), 1.);
+    float4 color = input.background_color * float4(1., 1., 1., saturate(0.5 - distance));
+    if (border_width != 0.) {
         float inset_distance = distance + border_width;
-        color = mix(
-            border_color,
-            input.background_color,
-            saturate(0.5 - inset_distance)
-        );
+        color = mix(input.border_color, color, saturate(0.5 - inset_distance));
     }
 
-    float4 coverage = float4(1., 1., 1., saturate(0.5 - distance));
-    return coverage * color;
+    return color;
 }
 
 vertex QuadFragmentInput quad_vertex(