Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove uneeded abstraction

Browse source
This commit is contained in:
Isaac Freund 2020-04-18 17:07:57 +02:00
parent fb2639a226
commit 837513d329
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/command/close_view.zig
View file

@ -6,6 +6,8 @@ const Seat = @import("../seat.zig").Seat;
/// Close the focused view, if any. /// Close the focused view, if any.
pub fn close_view(seat: *Seat, arg: Arg) void { pub fn close_view(seat: *Seat, arg: Arg) void {
if (seat.focused_view) |view| { if (seat.focused_view) |view| {
view.close(); // Note: we don't call arrange() here as it will be called
// automatically when the view is unmapped.
c.wlr_xdg_toplevel_send_close(view.wlr_xdg_surface);
} }
} }

7
src/view.zig
View file

@ -136,13 +136,6 @@ pub const View = struct {
self.output = destination_output; self.output = destination_output;
} }
/// Send a close event to the view's client
pub fn close(self: Self) void {
// Note: we don't call arrange() here as it will be called
// automatically when the view is unmapped.
c.wlr_xdg_toplevel_send_close(self.wlr_xdg_surface);
}
fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const view = @fieldParentPtr(View, "listen_destroy", listener.?); const view = @fieldParentPtr(View, "listen_destroy", listener.?);
const output = view.output; const output = view.output;