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

view: draw borders around actual dimensions

Browse Source 
Previously if the view did not take the size requested, we would draw
the borders around the size we asked the view to take rather than its
actual size.
This commit is contained in:
Isaac Freund
2020-06-28 01:46:53 +02:00
parent 7f2e2610e3
commit 60f06a1a40
5 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
river/render.zig
View File

@ -241,28 +241,26 @@ fn renderTexture(
fn renderBorders(output: Output, view: *View, now: *c.timespec) void {
const config = &output.root.server.config;
var border: Box = undefined;
const color = if (view.focused)
&output.root.server.config.border_color_focused
else
&output.root.server.config.border_color_unfocused;
const border_width = output.root.server.config.border_width;
const color = if (view.focused) &config.border_color_focused else &config.border_color_unfocused;
const border_width = config.border_width;
const actual_box = view.getActualBox();
// left and right, covering the corners as well
border.y = view.current.box.y - @intCast(i32, border_width);
border.width = border_width;
border.height = view.current.box.height + border_width * 2;
border.height = actual_box.height + border_width * 2;
// left
border.x = view.current.box.x - @intCast(i32, border_width);
renderRect(output, border, color);
// right
border.x = view.current.box.x + @intCast(i32, view.current.box.width);
border.x = view.current.box.x + @intCast(i32, actual_box.width);
renderRect(output, border, color);
// top and bottom
border.x = view.current.box.x;
border.width = view.current.box.width;
border.width = actual_box.width;
border.height = border_width;
// top
@ -270,7 +268,7 @@ fn renderBorders(output: Output, view: *View, now: *c.timespec) void {
renderRect(output, border, color);
// bottom border
border.y = view.current.box.y + @intCast(i32, view.current.box.height);
border.y = view.current.box.y + @intCast(i32, actual_box.height);
renderRect(output, border, color);
}