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

rivertile: clamp main_amount

Browse source
This commit is contained in:
Leon Henrik Plickat 2021-05-15 17:24:23 +02:00 committed by Isaac Freund
parent 21bb333323
commit 6ab06120fa
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rivertile/main.zig
View file

@ -165,8 +165,9 @@ const Output = struct {
}, },
.layout_demand => |ev| { .layout_demand => |ev| {
const secondary_count = if (ev.view_count > output.main_count) const main_count = math.clamp(output.main_count, 1, ev.view_count);
ev.view_count - output.main_count const secondary_count = if (ev.view_count > main_count)
ev.view_count - main_count
else else
0; 0;
@ -189,18 +190,18 @@ const Output = struct {
var secondary_height: u32 = undefined; var secondary_height: u32 = undefined;
var secondary_height_rem: u32 = undefined; var secondary_height_rem: u32 = undefined;
if (output.main_count > 0 and secondary_count > 0) { if (main_count > 0 and secondary_count > 0) {
main_width = @floatToInt(u32, output.main_factor * @intToFloat(f64, usable_width)); main_width = @floatToInt(u32, output.main_factor * @intToFloat(f64, usable_width));
main_height = usable_height / output.main_count; main_height = usable_height / main_count;
main_height_rem = usable_height % output.main_count; main_height_rem = usable_height % main_count;
secondary_width = usable_width - main_width; secondary_width = usable_width - main_width;
secondary_height = usable_height / secondary_count; secondary_height = usable_height / secondary_count;
secondary_height_rem = usable_height % secondary_count; secondary_height_rem = usable_height % secondary_count;
} else if (output.main_count > 0) { } else if (main_count > 0) {
main_width = usable_width; main_width = usable_width;
main_height = usable_height / output.main_count; main_height = usable_height / main_count;
main_height_rem = usable_height % output.main_count; main_height_rem = usable_height % main_count;
} else if (secondary_width > 0) { } else if (secondary_width > 0) {
main_width = 0; main_width = 0;
secondary_width = usable_width; secondary_width = usable_width;
@ -215,17 +216,17 @@ const Output = struct {
var width: u32 = undefined; var width: u32 = undefined;
var height: u32 = undefined; var height: u32 = undefined;
if (i < output.main_count) { if (i < main_count) {
x = 0; x = 0;
y = @intCast(i32, (i * main_height) + if (i > 0) main_height_rem else 0); y = @intCast(i32, (i * main_height) + if (i > 0) main_height_rem else 0);
width = main_width; width = main_width;
height = main_height + if (i == 0) main_height_rem else 0; height = main_height + if (i == 0) main_height_rem else 0;
} else { } else {
x = @intCast(i32, main_width); x = @intCast(i32, main_width);
y = @intCast(i32, (i - output.main_count) * secondary_height + y = @intCast(i32, (i - main_count) * secondary_height +
if (i > output.main_count) secondary_height_rem else 0); if (i > main_count) secondary_height_rem else 0);
width = secondary_width; width = secondary_width;
height = secondary_height + if (i == output.main_count) secondary_height_rem else 0; height = secondary_height + if (i == main_count) secondary_height_rem else 0;
} }
x += @intCast(i32, view_padding); x += @intCast(i32, view_padding);