Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdg shell: use XdgSurface.getGeometry()

Browse Source 
This is important to use instead of direct access as clients are not
strictly required to set a geometry, in which caese the dimensions
of the wl_surface are used instead.
This commit is contained in:
Isaac Freund 2021-02-14 16:55:24 +01:00
parent 945b7dc986
commit fb7d50a019
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
river/XdgToplevel.zig
View File

@ -171,10 +171,12 @@ fn handleMap(listener: *wl.Listener(*wlr.XdgSurface), xdg_surface: *wlr.XdgSurfa
view.surface = self.xdg_surface.surface; view.surface = self.xdg_surface.surface;
// Use the view's "natural" size centered on the output as the default // Use the view's initial size centered on the output as the default
// floating dimensions // floating dimensions
view.float_box.width = @intCast(u32, self.xdg_surface.geometry.width); var initial_box: wlr.Box = undefined;
view.float_box.height = @intCast(u32, self.xdg_surface.geometry.height); self.xdg_surface.getGeometry(&initial_box);
view.float_box.width = @intCast(u32, initial_box.width);
view.float_box.height = @intCast(u32, initial_box.height);
view.float_box.x = std.math.max(0, @divTrunc(@intCast(i32, view.output.usable_box.width) - view.float_box.x = std.math.max(0, @divTrunc(@intCast(i32, view.output.usable_box.width) -
@intCast(i32, view.float_box.width), 2)); @intCast(i32, view.float_box.width), 2));
view.float_box.y = std.math.max(0, @divTrunc(@intCast(i32, view.output.usable_box.height) - view.float_box.y = std.math.max(0, @divTrunc(@intCast(i32, view.output.usable_box.height) -