Dispatch source hit testing for native pointer clicks
Verify Tessera GUI / verify (push) Failing after 7m31s
Verify Tessera GUI / verify (push) Failing after 7m31s
This commit is contained in:
+20
-5
@@ -1043,7 +1043,10 @@ impl UiBridge {
|
||||
Ok(())
|
||||
}
|
||||
pub fn dispatch(&self, vm: &mut Vm, input: &crate::events::Input) -> Result<()> {
|
||||
let (weak, desktop) = {
|
||||
input
|
||||
.validate()
|
||||
.map_err(|message| anyhow::anyhow!(message))?;
|
||||
let (weak, desktop, candidates) = {
|
||||
let state = self
|
||||
.session
|
||||
.lock()
|
||||
@@ -1058,11 +1061,19 @@ impl UiBridge {
|
||||
.get(&input.mount)
|
||||
.ok_or_else(|| anyhow::anyhow!("Mount is no longer active"))?,
|
||||
state.desktop,
|
||||
state.mounts.ordered(),
|
||||
)
|
||||
};
|
||||
let mount = vm
|
||||
.upgrade(weak)?
|
||||
.ok_or_else(|| anyhow::anyhow!("Mount has expired"))?;
|
||||
let mount = if let (Some(press), Some(release)) = (input.press_point, input.point) {
|
||||
let Some(mount) = crate::source_hit::resolve(vm, desktop, candidates, press, release)?
|
||||
else {
|
||||
return Ok(());
|
||||
};
|
||||
mount
|
||||
} else {
|
||||
vm.upgrade(weak)?
|
||||
.ok_or_else(|| anyhow::anyhow!("Mount has expired"))?
|
||||
};
|
||||
let result = (|| {
|
||||
let data = vm.payload::<crate::mount::Mount>(mount, "Mount")?.clone();
|
||||
if !data.mounted {
|
||||
@@ -1071,7 +1082,11 @@ impl UiBridge {
|
||||
if !data.geometry.interactive {
|
||||
bail!("Mount does not accept input");
|
||||
}
|
||||
vm.set_attr(desktop, "focus", Value::Number((input.mount as i64).into()))?;
|
||||
vm.set_attr(
|
||||
desktop,
|
||||
"focus",
|
||||
Value::Number((data.geometry.id as i64).into()),
|
||||
)?;
|
||||
vm.set_attr(desktop, "focusRequested", Value::Bool(true))?;
|
||||
let (owner, name, args) = match input.kind.as_str() {
|
||||
"click" => (data.block, "click", vec![Value::Object(mount)]),
|
||||
|
||||
Reference in New Issue
Block a user