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

river: fix resize command

Browse Source 
In 489a49735 the view.move() call, which is used to keep the view centered after
a resize, was accidentally removed.
This commit is contained in:
Leon Henrik Plickat 2022-12-29 14:56:06 +01:00
parent e18d0d5e1c
commit 5d4c2f2fbd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
river/command/move.zig
View File

@ -92,22 +92,32 @@ pub fn resize(
view.output.wlr_output.effectiveResolution(&output_width, &output_height); view.output.wlr_output.effectiveResolution(&output_width, &output_height);
switch (orientation) { switch (orientation) {
.horizontal => { .horizontal => {
const prev_width = view.pending.box.width;
view.pending.box.width += delta; view.pending.box.width += delta;
view.applyConstraints(); view.applyConstraints();
// Get width difference after applying view constraints, so that the
// move reflects the actual size difference, but before applying the
// output size constraints, to allow growing a view even if it is
// up against an output edge.
const diff_width = prev_width - view.pending.box.width;
// Do not grow bigger than the output // Do not grow bigger than the output
view.pending.box.width = math.min( view.pending.box.width = math.min(
view.pending.box.width, view.pending.box.width,
output_width - 2 * server.config.border_width, output_width - 2 * server.config.border_width,
); );
view.move(@divFloor(diff_width, 2), 0);
}, },
.vertical => { .vertical => {
const prev_height = view.pending.box.height;
view.pending.box.height += delta; view.pending.box.height += delta;
view.applyConstraints(); view.applyConstraints();
const diff_height = prev_height - view.pending.box.height;
// Do not grow bigger than the output // Do not grow bigger than the output
view.pending.box.height = math.min( view.pending.box.height = math.min(
view.pending.box.height, view.pending.box.height,
output_height - 2 * server.config.border_width, output_height - 2 * server.config.border_width,
); );
view.move(0, @divFloor(diff_height, 2));
}, },
} }