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

render: draw borders before rendering views

Browse source 
Menus, tooltips, etc. can extend beyond a view's borders.  Render views
after their borders so floating content appears on top.

Unfocused floating content can still be obscured by views higher in the
stack and the focused view.
This commit is contained in:
Keith Hubbard 2021-08-05 21:40:30 -04:00 committed by Isaac Freund
parent 2fc0875a3e
commit 556d790694
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
river/render.zig
View file

@ -93,32 +93,32 @@ pub fn renderOutput(output: *Output) void {
it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter); it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter);
while (it.next()) |view| { while (it.next()) |view| {
if (view.current.focus != 0 or view.current.float) continue; if (view.current.focus != 0 or view.current.float) continue;
renderView(output, view, &now);
if (view.draw_borders) renderBorders(output, view, &now); if (view.draw_borders) renderBorders(output, view, &now);
renderView(output, view, &now);
} }
// focused, non-floating views // focused, non-floating views
it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter); it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter);
while (it.next()) |view| { while (it.next()) |view| {
if (view.current.focus == 0 or view.current.float) continue; if (view.current.focus == 0 or view.current.float) continue;
renderView(output, view, &now);
if (view.draw_borders) renderBorders(output, view, &now); if (view.draw_borders) renderBorders(output, view, &now);
renderView(output, view, &now);
} }
// non-focused, floating views // non-focused, floating views
it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter); it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter);
while (it.next()) |view| { while (it.next()) |view| {
if (view.current.focus != 0 or !view.current.float) continue; if (view.current.focus != 0 or !view.current.float) continue;
renderView(output, view, &now);
if (view.draw_borders) renderBorders(output, view, &now); if (view.draw_borders) renderBorders(output, view, &now);
renderView(output, view, &now);
} }
// focused, floating views // focused, floating views
it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter); it = ViewStack(View).iter(output.views.last, .reverse, output.current.tags, renderFilter);
while (it.next()) |view| { while (it.next()) |view| {
if (view.current.focus == 0 or !view.current.float) continue; if (view.current.focus == 0 or !view.current.float) continue;
renderView(output, view, &now);
if (view.draw_borders) renderBorders(output, view, &now); if (view.draw_borders) renderBorders(output, view, &now);
renderView(output, view, &now);
} }
if (build_options.xwayland) renderXwaylandUnmanaged(output, &now); if (build_options.xwayland) renderXwaylandUnmanaged(output, &now);