Merge https://github.com/freref/libvaxis

merge
rockorager · Nov 12, 2024 · eb9244b · eb9244b
2 parents 5af63e9 + 1fd920a
commit eb9244b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/vxfw/App.zig b/src/vxfw/App.zig
@@ -261,7 +261,7 @@ const MouseHandler = struct {
             var m_local = mouse;
             m_local.col = item.local.col;
             m_local.row = item.local.row;
-            try item.widget.handleEvent(ctx, .{ .mouse = m_local });
+            try item.widget.captureEvent(ctx, .{ .mouse = m_local });
             try app.handleCommand(&ctx.cmds);
 
             // If the event was consumed, we check if we need to send a mouse_leave and return

diff --git a/src/vxfw/vxfw.zig b/src/vxfw/vxfw.zig
@@ -196,9 +196,16 @@ pub const MaxSize = struct {
 /// The Widget interface
 pub const Widget = struct {
     userdata: *anyopaque,
+    captureHandler: ?*const fn (userdata: *anyopaque, ctx: *EventContext, event: Event) anyerror!void = null,
     eventHandler: ?*const fn (userdata: *anyopaque, ctx: *EventContext, event: Event) anyerror!void = null,
     drawFn: *const fn (userdata: *anyopaque, ctx: DrawContext) Allocator.Error!Surface,
 
+    pub fn captureEvent(self: Widget, ctx: *EventContext, event: Event) anyerror!void {
+        if (self.captureHandler) |handle| {
+            return handle(self.userdata, ctx, event);
+        }
+    }
+
     pub fn handleEvent(self: Widget, ctx: *EventContext, event: Event) anyerror!void {
         if (self.eventHandler) |handle| {
             return handle(self.userdata, ctx, event);