public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-29 15:13:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

make elementFromPoint more robust against future changes

Browse Source
This commit is contained in:
sjorsdonkers
2025-05-15 10:59:45 +02:00
committed by Sjors
parent 59b33faf61
commit 333c377bc7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/browser/html/document.zig
View File

@@ -22,6 +22,8 @@ const parser = @import("../netsurf.zig");
const SessionState = @import("../env.zig").SessionState; const SessionState = @import("../env.zig").SessionState;
const Window = @import("window.zig").Window; const Window = @import("window.zig").Window;
const Element = @import("../dom/element.zig").Element;
const ElementUnion = @import("../dom/element.zig").Union;
const Document = @import("../dom/document.zig").Document; const Document = @import("../dom/document.zig").Document;
const NodeList = @import("../dom/nodelist.zig").NodeList; const NodeList = @import("../dom/nodelist.zig").NodeList;
const Location = @import("location.zig").Location; const Location = @import("location.zig").Location;
@@ -226,15 +228,16 @@ pub const HTMLDocument = struct {
return ""; return "";
} }
pub fn _elementFromPoint(_: *parser.DocumentHTML, x: f32, y: f32, state: *SessionState) !?*parser.Element { // This returns an ElementUnion instead of a *Parser.Element in case the element somehow hasn't passed through the js runtime yet.
pub fn _elementFromPoint(_: *parser.DocumentHTML, x: f32, y: f32, state: *SessionState) !?ElementUnion {
const ix: i32 = @intFromFloat(@floor(x)); const ix: i32 = @intFromFloat(@floor(x));
const iy: i32 = @intFromFloat(@floor(y)); const iy: i32 = @intFromFloat(@floor(y));
const element = state.renderer.getElementAtPosition(ix, iy) orelse return null; const element = state.renderer.getElementAtPosition(ix, iy) orelse return null;
// TODO if pointer-events set to none the underlying element should be returned (parser.documentGetDocumentElement(self.document);?) // TODO if pointer-events set to none the underlying element should be returned (parser.documentGetDocumentElement(self.document);?)
return element; return try Element.toInterface(element);
} }
pub fn _elementsFromPoint(_: *parser.DocumentHTML, x: f32, y: f32, state: *SessionState) ![]*parser.Element { pub fn _elementsFromPoint(_: *parser.DocumentHTML, x: f32, y: f32, state: *SessionState) ![]ElementUnion {
const ix: i32 = @intFromFloat(@floor(x)); const ix: i32 = @intFromFloat(@floor(x));
const iy: i32 = @intFromFloat(@floor(y)); const iy: i32 = @intFromFloat(@floor(y));
const element = state.renderer.getElementAtPosition(ix, iy) orelse return &.{}; const element = state.renderer.getElementAtPosition(ix, iy) orelse return &.{};
@@ -243,8 +246,8 @@ pub const HTMLDocument = struct {
// We need to return either 0 or 1 item, so we cannot fix the size to [1]*parser.Element // We need to return either 0 or 1 item, so we cannot fix the size to [1]*parser.Element
// Converting the pointer to a slice []parser.Element is not supported by our framework. // Converting the pointer to a slice []parser.Element is not supported by our framework.
// So instead we just need to allocate the pointer to create a slice of 1. // So instead we just need to allocate the pointer to create a slice of 1.
const heap_ptr = try state.call_arena.create(@TypeOf(element)); const heap_ptr = try state.call_arena.create(ElementUnion);
heap_ptr.* = element; heap_ptr.* = try Element.toInterface(element);
return heap_ptr[0..1]; return heap_ptr[0..1];
} }