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

cursor: fix viewAt() ordering

Browse Source 
Focused views must be checked first as they are always rendered on top.
This commit is contained in:
Isaac Freund 2020-06-28 00:29:44 +02:00
parent 9dfcec72a8
commit b6ef4c5a1a
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
river/Cursor.zig
View File

@ -359,8 +359,17 @@ fn layerSurfaceAt(
/// Find the topmost visible view surface (incl. popups) at ox,oy. /// Find the topmost visible view surface (incl. popups) at ox,oy.
fn viewSurfaceAt(output: Output, ox: f64, oy: f64, sx: *f64, sy: *f64) ?*c.wlr_surface { fn viewSurfaceAt(output: Output, ox: f64, oy: f64, sx: *f64, sy: *f64) ?*c.wlr_surface {
// Focused views are rendered on top, so look for them first.
var it = ViewStack(View).iterator(output.views.first, output.current_focused_tags); var it = ViewStack(View).iterator(output.views.first, output.current_focused_tags);
return while (it.next()) |node| { while (it.next()) |node| {
if (node.view.surfaceAt(ox, oy, sx, sy)) |found| break found; if (!node.view.focused) continue;
} else null; if (node.view.surfaceAt(ox, oy, sx, sy)) |found| return found;
}
it = ViewStack(View).iterator(output.views.first, output.current_focused_tags);
while (it.next()) |node| {
if (node.view.surfaceAt(ox, oy, sx, sy)) |found| return found;
}
return null;
} }