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

Merge pull request #2781 from zwarich/compositor-contains

Browse source 
Adopt Rect::contains in compositor hit-testing
This commit is contained in:
Patrick Walton 2014-07-07 13:50:17 -07:00
commit f8fbf557f1
2 changed files with 7 additions and 9 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;
}

2
src/support/geom/rust-geom

@ -1 +1 @@
Subproject commit 2b5981a97ab607a7b24f39484105d17c1e3a6fb8
Subproject commit 862af73433f36f156519ff24bd87abd3a8c10790