Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-08 06:55:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adopt Rect::contains in compositor hit-testing

Browse source 
This does make hit-testing inclusive in the right/bottom edges, whereas it
was only inclusive in the top/left edges before.
This commit is contained in:
Cameron Zwarich 2014-07-07 10:45:48 -07:00
parent 797663c43e
commit 91c7acd4c4
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/compositing/compositor_data.rs
View file

@ -230,12 +230,11 @@ impl CompositorData {
}
Some(rect) => {
let rect: TypedRect<PagePx, f32> = Rect::from_untyped(&rect);
if cursor.x >= rect.origin.x && cursor.x < rect.origin.x + rect.size.width
&& cursor.y >= rect.origin.y && cursor.y < rect.origin.y + rect.size.height
&& CompositorData::handle_scroll_event(child.clone(),
delta,
cursor - rect.origin,
rect.size) {
if rect.contains(&cursor) &&
CompositorData::handle_scroll_event(child.clone(),
delta,
cursor - rect.origin,
rect.size) {
return true
}
}
@ -312,8 +311,7 @@ impl CompositorData {
}
Some(rect) => {
let rect: TypedRect<PagePx, f32> = Rect::from_untyped(&rect);
if cursor.x >= rect.origin.x && cursor.x < rect.origin.x + rect.size.width
&& cursor.y >= rect.origin.y && cursor.y < rect.origin.y + rect.size.height {
if rect.contains(&cursor) {
CompositorData::send_mouse_event(child.clone(), event, cursor - rect.origin);
return;
}