Separate faded text and background

Author: Jay

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .engine,
-    .version = "0.2.5",
+    .version = "0.2.6",
     .fingerprint = 0xe8a81a8d0aa558d5,
     .minimum_zig_version = "0.14.1",
     .dependencies = .{

src/csv_reader.zig

@@ -164,7 +164,6 @@ test "reader" {
     try expectEqual(Token.field, i.next());
     try expectEqualStrings("b\n1", i.value);
     try expectEqual(Token.field, i.next());
-    std.log.err("remaining '{s}'", .{i.data});
     try expectEqualStrings("c1", i.value);
     try expectEqual(Token.field, i.next());
     try expectEqualStrings("d,1", i.value);

src/engine.zig

@@ -1338,7 +1338,7 @@ pub const Element = struct {
         _: ?Clip,
         scroll_offset: Vector,
     ) void {
-        const colour = element.type.rectangle.style.from(display.theme, element.background_colour);
+        const colour = element.type.rectangle.style.panel(display.theme, element.background_colour);
         _ = sdl.SDL_SetRenderDrawColor(
             display.renderer,
             colour.r,
@@ -2094,14 +2094,15 @@ inline fn draw_text_elements(
                 }
             }
 
-            // Only do rendering if display parameter is provided
-            const current_colour = text_colour.from(display.theme, element.colour);
+            // Only render text if display parameter is provided
+            const current_colour = text_colour.text(display.theme, element.colour);
             _ = sdl.SDL_SetTextureColorMod(
                 item.texture,
                 current_colour.r,
                 current_colour.g,
                 current_colour.b,
             );
+            _ = sdl.SDL_SetTextureAlphaMod(item.texture, current_colour.a);
             _ = sdl.SDL_RenderTexture(
                 display.renderer,
                 item.texture,

src/theme.zig

@@ -51,7 +51,7 @@ pub const ThemeColour = enum {
     background,
     custom,
 
-    pub fn from(self: ThemeColour, theme: *Theme, custom: Colour) Colour {
+    pub fn text(self: ThemeColour, theme: *Theme, custom: Colour) Colour {
         return switch (self) {
             .normal => theme.text_colour,
             .faded => theme.faded_panel_colour,
@@ -63,6 +63,19 @@ pub const ThemeColour = enum {
             .custom => custom,
         };
     }
+
+    pub fn panel(self: ThemeColour, theme: *Theme, custom: Colour) Colour {
+        return switch (self) {
+            .normal => theme.text_colour,
+            .background => theme.background_colour,
+            .tinted => theme.tinted_text_colour,
+            .faded => theme.faded_panel_colour,
+            .emphasised => theme.emphasised_panel_colour,
+            .success => theme.success_panel_colour,
+            .failed => theme.failed_panel_colour,
+            .custom => custom,
+        };
+    }
 };
 
 /// The `Display` is prefilled with this usable set of default themes on

src/translation.zig

@@ -59,7 +59,6 @@ pub const Translation = struct {
                         err("load_translation_data has invalid languge code: '{s}'", .{i.value});
                         return;
                     }
-                    err("saw {s}, {s}", .{ i.value, @tagName(lr) });
                     try self.maps.put(allocator, lr, .empty);
                     try headers.append(allocator, self.maps.getPtr(lr).?);
                 },
@@ -81,20 +80,12 @@ pub const Translation = struct {
                     continue;
                 },
                 .field => {
-                    // read the key from the first column
                     const key = i.value;
-                    //try headers.items[0].*.put(allocator, key, key);
-                    // read the translations in the next columns
-                    //if (i.next() != .field) {
-                    //    err("load_translation_data expecting a translation field on line {d}.", .{line});
-                    //    return;
-                    //}
                     col = 0;
                     var n: Token = .eof;
                     while (col < headers.items.len) : (col += 1) {
                         n = i.next();
                         if (n == .field) {
-                            err("saw {d}, {s}={s}", .{ col, key, i.value });
                             try headers.items[col].*.put(allocator, key, i.value);
                         } else if (n == .eol or n == .eof) {
                             // Handle case where last column(s) are empty