From b1becb12c026e446fd66e637c4a243c8e8788997 Mon Sep 17 00:00:00 2001
From: Qwerasd <qwerasd205@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:08:11 -0500
Subject: [PATCH] fix(Metal): handle non-extended padding color transparency

We were returning bg colors when we shouldn't have since when we have
background color transparency we need to return any bg color cells as
fully transparent rather than their actual color.
---
 src/renderer/shaders/cell.metal | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/renderer/shaders/cell.metal b/src/renderer/shaders/cell.metal
index a4e4837b6..d4657ec28 100644
--- a/src/renderer/shaders/cell.metal
+++ b/src/renderer/shaders/cell.metal
@@ -248,7 +248,15 @@ fragment float4 cell_bg_fragment(
 ) {
   int2 grid_pos = int2(floor((in.position.xy - uniforms.grid_padding.wx) / uniforms.cell_size));
 
-  float4 bg = in.bg_color;
+  float4 bg = float4(0.0);
+  // If we have any background transparency then we render bg-colored cells as
+  // fully transparent, since the background is handled by the layer bg color
+  // and we don't want to double up our bg color, but if our bg color is fully
+  // opaque then our layer is opaque and can't handle transparency, so we need
+  // to return the bg color directly instead.
+  if (uniforms.bg_color.a == 255) {
+    bg = in.bg_color;
+  }
 
   // Clamp x position, extends edge bg colors in to padding on sides.
   if (grid_pos.x < 0) {
@@ -285,16 +293,7 @@ fragment float4 cell_bg_fragment(
 
   // We have special case handling for when the cell color matches the bg color.
   if (all(cell_color == uniforms.bg_color)) {
-    // If we have any background transparency then we render bg-colored cells as
-    // fully transparent, since the background is handled by the layer bg color
-    // and we don't want to double up our bg color, but if our bg color is fully
-    // opaque then our layer is opaque and can't handle transparency, so we need
-    // to return the bg color directly instead.
-    if (uniforms.bg_color.a == 255) {
-      return bg;
-    } else {
-      return float4(0.0);
-    }
+    return bg;
   }
 
   // Convert the color and return it.