neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix: only reset mouse drag context when the dragging button is released

Browse source 
closes #320
This commit is contained in:
CJ van den Berg 2025-11-03 20:48:08 +01:00
parent 1fb3a8828a
commit fa6ea11d57
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tui/status/tabs.zig
View file

@ -206,7 +206,7 @@ pub const TabBar = struct {
if (self.tabs[dragging].widget.dynamic_cast(Tab.ButtonType)) |btn| btn.hover = false; if (self.tabs[dragging].widget.dynamic_cast(Tab.ButtonType)) |btn| btn.hover = false;
self.update(); self.update();
for (self.widget_list.widgets.items) |*widgetstate| if (widgetstate.widget.dynamic_cast(Tab.ButtonType)) |btn| if (btn.drag_pos) |_| for (self.widget_list.widgets.items) |*widgetstate| if (widgetstate.widget.dynamic_cast(Tab.ButtonType)) |btn| if (btn.drag_pos) |_|
tui.set_drag_source(&widgetstate.widget); tui.update_drag_source(&widgetstate.widget);
tui.refresh_hover(); tui.refresh_hover();
} }
} }

24
src/tui/tui.zig
View file

@ -10,6 +10,7 @@ const builtin = @import("builtin");
const file_link = @import("file_link"); const file_link = @import("file_link");
pub const renderer = @import("renderer"); pub const renderer = @import("renderer");
const input = @import("input");
const command = @import("command"); const command = @import("command");
const EventHandler = @import("EventHandler"); const EventHandler = @import("EventHandler");
const keybind = @import("keybind"); const keybind = @import("keybind");
@ -57,6 +58,7 @@ last_hover_y: c_int = -1,
commands: Commands = undefined, commands: Commands = undefined,
logger: log.Logger, logger: log.Logger,
drag_source: ?*Widget = null, drag_source: ?*Widget = null,
drag_button: ?input.MouseType = null,
dark_theme: Widget.Theme, dark_theme: Widget.Theme,
dark_parsed_theme: ?std.json.Parsed(Widget.Theme), dark_parsed_theme: ?std.json.Parsed(Widget.Theme),
light_theme: Widget.Theme, light_theme: Widget.Theme,
@ -587,7 +589,9 @@ fn dispatch_mouse(ctx: *anyopaque, y: c_int, x: c_int, cbor_msg: []const u8) voi
self.unrendered_input_events_count += 1; self.unrendered_input_events_count += 1;
const send_func = if (self.drag_source) |_| &send_mouse_drag else &send_mouse; const send_func = if (self.drag_source) |_| &send_mouse_drag else &send_mouse;
send_func(self, y, x, from, m) catch |e| self.logger.err("dispatch mouse", e); send_func(self, y, x, from, m) catch |e| self.logger.err("dispatch mouse", e);
self.drag_source = null; var btn: input.MouseType = 0;
_ = m.match(.{ tp.string, tp.any, tp.extract(&btn), tp.more }) catch false;
self.maybe_reset_drag_source_internal(btn);
} }
fn dispatch_mouse_drag(ctx: *anyopaque, y: c_int, x: c_int, cbor_msg: []const u8) void { fn dispatch_mouse_drag(ctx: *anyopaque, y: c_int, x: c_int, cbor_msg: []const u8) void {
@ -596,7 +600,9 @@ fn dispatch_mouse_drag(ctx: *anyopaque, y: c_int, x: c_int, cbor_msg: []const u8
const m: tp.message = .{ .buf = cbor_msg }; const m: tp.message = .{ .buf = cbor_msg };
const from = tp.self_pid(); const from = tp.self_pid();
self.unrendered_input_events_count += 1; self.unrendered_input_events_count += 1;
if (self.drag_source == null) self.drag_source = self.find_coord_widget(@intCast(y), @intCast(x)); var btn: input.MouseType = undefined;
if (m.match(.{ tp.string, tp.any, tp.extract(&btn), tp.more }) catch false)
if (self.drag_source == null) self.set_drag_source(self.find_coord_widget(@intCast(y), @intCast(x)), btn);
self.send_mouse_drag(y, x, from, m) catch |e| self.logger.err("dispatch mouse", e); self.send_mouse_drag(y, x, from, m) catch |e| self.logger.err("dispatch mouse", e);
} }
@ -1439,14 +1445,26 @@ pub fn get_keybind_mode() ?Mode {
return self.input_mode_ orelse self.delayed_init_input_mode; return self.input_mode_ orelse self.delayed_init_input_mode;
} }
pub fn set_drag_source(drag_source: *Widget) void { pub fn update_drag_source(drag_source: *Widget) void {
const self = current(); const self = current();
self.drag_source = drag_source; self.drag_source = drag_source;
} }
fn set_drag_source(self: *Self, drag_source: ?*Widget, btn: input.MouseType) void {
self.drag_source = drag_source;
self.drag_button = btn;
}
pub fn reset_drag_context() void { pub fn reset_drag_context() void {
const self = current(); const self = current();
self.drag_source = null; self.drag_source = null;
self.drag_button = 0;
}
fn maybe_reset_drag_source_internal(self: *Self, btn: input.MouseType) void {
if (self.drag_button != btn) return;
self.drag_source = null;
self.drag_button = 0;
} }
pub fn need_render() void { pub fn need_render() void {