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

Arrange layers on layer surface destroy

Browse source 
Fixes https://github.com/ifreund/river/issues/15
This commit is contained in:
Isaac Freund 2020-04-27 19:58:44 +02:00
parent 460fb6da19
commit ce8d8a7825
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/layer_surface.zig
View file

@ -52,11 +52,6 @@ pub const LayerSurface = struct {
c.wl_signal_add(&self.wlr_layer_surface.events.unmap, &self.listen_unmap); c.wl_signal_add(&self.wlr_layer_surface.events.unmap, &self.listen_unmap);
} }
/// Send a configure event to the client with the dimensions of the current box
pub fn sendConfigure(self: Self) void {
c.wlr_layer_surface_v1_configure(self.wlr_layer_surface, self.box.width, self.box.height);
}
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 self = @fieldParentPtr(Self, "listen_destroy", listener.?); const self = @fieldParentPtr(Self, "listen_destroy", listener.?);
const output = self.output; const output = self.output;
@ -71,6 +66,8 @@ pub const LayerSurface = struct {
const node = @fieldParentPtr(std.TailQueue(Self).Node, "data", self); const node = @fieldParentPtr(std.TailQueue(Self).Node, "data", self);
output.layers[@intCast(usize, @enumToInt(self.layer))].remove(node); output.layers[@intCast(usize, @enumToInt(self.layer))].remove(node);
output.root.server.allocator.destroy(node); output.root.server.allocator.destroy(node);
self.output.arrangeLayers();
} }
fn handleMap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleMap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
@ -92,8 +89,6 @@ pub const LayerSurface = struct {
wlr_layer_surface.surface, wlr_layer_surface.surface,
wlr_layer_surface.output, wlr_layer_surface.output,
); );
self.output.arrangeLayers();
} }
fn handleUnmap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleUnmap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {

8
src/output.zig
View file

@ -464,7 +464,13 @@ pub const Output = struct {
} }
} }
layer_surface.sendConfigure(); // Tell the client to assume the new size
Log.Debug.log("send configure, {} x {}", .{ layer_surface.box.width, layer_surface.box.height });
c.wlr_layer_surface_v1_configure(
layer_surface.wlr_layer_surface,
layer_surface.box.width,
layer_surface.box.height,
);
} }
} }