Add clear_image and clear_background_image

Author: Jay

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .engine,
-    .version = "0.7.6",
+    .version = "0.7.7",
     .fingerprint = 0xe8a81a8d0aa558d5,
     .minimum_zig_version = "0.15.2",
     .dependencies = .{
@@ -17,8 +17,8 @@
             .hash = "zigimg-0.1.0-8_eo2vBrFQBhsrLpexdcDQY-zrlzkyFZfKuYX-Nry6KN",
         },
         .resources = .{
-            .url = "git+https://github.com/loftafi/resources.git#0776cc10cdcfa686543c3f92be6cbc2f36384541",
-            .hash = "resources-0.7.4-J0GwI9E6AgDyFTZKD7THemvJZGHYjueSxU27ZCZ2L1jq",
+            .url = "git+https://github.com/loftafi/resources.git#b65dd592bc1fb1eadbb5b1b6ca8cf8015ee8a669",
+            .hash = "resources-0.7.5-J0GwI0o7AgAv3hn0V03TUNxFQBnPSlKv85pkJDd2boL4",
         },
     },
     .paths = .{

src/animator.zig

@@ -24,17 +24,17 @@ pub const Ease = enum {
     stretch,
 };
 
+target: *Element,
 mode: Mode = .move,
 movement: Ease = .ease,
 start: Rect = undefined,
 end: Rect = undefined,
 duration: i64 = 0, // number of nanoseconds to animate over
-on_end: ?*const fn (display: *Display, element: *Element) void = null,
+on_end: engine.Callback = .{ .func = null },
 
 setup: bool = false,
 start_time: i64 = 0,
 end_time: i64 = 0,
-target: *Element,
 
 /// Reposition/adjust an element based on the current_time in nanoseconds.
 /// When an animation starts, an `Ease` formula calculates the current

src/engine.zig

@@ -805,6 +805,17 @@ pub const Element = struct {
         return texture;
     }
 
+    pub inline fn clear_image(
+        self: *Element,
+        gpa: Allocator,
+        display: *Display,
+    ) void {
+        if (self.texture != null) {
+            display.release_texture_resource(gpa, self.texture.?);
+            self.texture = null;
+        }
+    }
+
     pub inline fn set_background_image(
         self: *Element,
         gpa: Allocator,
@@ -827,6 +838,17 @@ pub const Element = struct {
         return texture;
     }
 
+    pub inline fn clear_background_image(
+        self: *Element,
+        gpa: Allocator,
+        display: *Display,
+    ) void {
+        if (self.background.image != null) {
+            display.release_texture_resource(gpa, self.background.image.?);
+            self.background.image = null;
+        }
+    }
+
     /// set_text updates the `text` and `translation` fields of labels,
     /// checkboxes and buttons, and regenerates the grahpics/image
     /// textures for each word if the text was changed or `forced`
@@ -3353,12 +3375,12 @@ pub const Display = struct {
         // do start/centre/end alignment.
         if (expanders.len > 0) {
             // Relayout the children with expanders
-            trace("expanders: {s} has {any}.  needed_height: {d} available_height: {d}", .{
-                parent.name,
-                expanders.len,
-                needed_height,
-                parent.rect.height,
-            });
+            //trace("expanders: {s} has {any}.  needed_height: {d} available_height: {d}", .{
+            //    parent.name,
+            //    expanders.len,
+            //    needed_height,
+            //    parent.rect.height,
+            //});
 
             if (parent.rect.height > needed_height) {
                 const spare_height = parent.rect.height - needed_height;
@@ -3368,10 +3390,10 @@ pub const Display = struct {
                     }
                     const percent = expander.type.expander.weight / expander_weights;
                     expander.rect.height = @trunc(spare_height * percent);
-                    trace("   expander: weight {d} given: {d}", .{
-                        percent,
-                        expander.rect.height,
-                    });
+                    //trace("   expander: weight {d} given: {d}", .{
+                    //    percent,
+                    //    expander.rect.height,
+                    //});
                 }
                 var new_y: f32 = parent.rect.y + parent.pad.top;
                 for (parent.type.panel.children.items) |child| {
@@ -3560,8 +3582,8 @@ pub const Display = struct {
                     old.start_time,
                     old.end_time,
                 });
-                if (old.on_end) |callback| {
-                    callback(display, old.target);
+                if (old.on_end.func) |callback| {
+                    try callback(old.on_end.ptr, display, old.target, display.allocator);
                 }
                 display.allocator.destroy(old);
             } else {
@@ -3644,7 +3666,14 @@ pub const Display = struct {
 
     /// Add an animator that points to a currently active/valid element.
     /// The element must not be destroyed for the lifetime of the animation.
-    pub inline fn add_animator(self: *Display, allocator: Allocator, animator: Animator) error{OutOfMemory}!void {
+    pub inline fn add_animator(self: *Display, allocator: Allocator, animator: Animator) Allocator.Error!void {
+        //err("add animator: {t} {d}x{d} -> {d}x{d}", .{
+        //    animator.mode,
+        //    animator.start.x,
+        //    animator.start.y,
+        //    animator.end.x,
+        //    animator.end.y,
+        //});
         var new_animator = try allocator.create(Animator);
         new_animator.* = animator;
         new_animator.setup = false;