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

view: stop enforcing custom minimum size

Browse Source 
I have encountered a crash (failing assert) if a view specified a fixed
size less than this minimum, and according to ifreund this behavior was
planned to be removed, anyway.
This commit is contained in:
tiosgz
2022-03-02 19:24:20 +00:00
parent 238c39379d
commit 81ba188df0
4 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
river/XwaylandView.zig
View File

@ -141,22 +141,22 @@ pub fn getAppId(self: Self) ?[*:0]const u8 {
/// Return bounds on the dimensions of the view
pub fn getConstraints(self: Self) View.Constraints {
const hints = self.xwayland_surface.size_hints orelse return .{
.min_width = View.min_size,
.min_height = View.min_size,
.min_width = 1,
.min_height = 1,
.max_width = math.maxInt(u32),
.max_height = math.maxInt(u32),
};
return .{
.min_width = @intCast(u32, math.max(hints.min_width, View.min_size)),
.min_height = @intCast(u32, math.max(hints.min_height, View.min_size)),
.min_width = @intCast(u32, math.max(hints.min_width, 1)),
.min_height = @intCast(u32, math.max(hints.min_height, 1)),
.max_width = if (hints.max_width > 0)
math.max(@intCast(u32, hints.max_width), View.min_size)
@intCast(u32, hints.max_width)
else
math.maxInt(u32),
.max_height = if (hints.max_height > 0)
math.max(@intCast(u32, hints.max_height), View.min_size)
@intCast(u32, hints.max_height)
else
math.maxInt(u32),
};