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

script: Fix MouseOver handling

Browse source 
Now we only query for the topmost node, and apply the hover state to all
of the parent elements.

This fixes things like #9705, where the hover state was applied only to
the children.

This also makes us more conformant with other browsers in the case of
taking in account margins and paddings.

For example, prior to this PR, when your mouse was over the inner
element, in the bottom part, `hover` styles didn't apply to the parent.

```html
<style>
div {
  padding: 10px;
  margin: 10px;
  height: 15px;
  background: blue;
}

div:hover {
  background: red;
}
</style>

<div>
  <div></div>
</div>
```

Fixes #9705
This commit is contained in:
Emilio Cobos Álvarez 2016-02-20 20:19:13 +01:00
parent 9ceda7de50
commit b1f0581637
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/script/dom/document.rs
View file

@ -574,11 +574,11 @@ impl Document {
}
}
pub fn get_nodes_under_mouse(&self, page_point: &Point2D<f32>) -> Vec<UntrustedNodeAddress> {
pub fn get_node_under_mouse(&self, page_point: &Point2D<f32>) -> Option<UntrustedNodeAddress> {
assert!(self.GetDocumentElement().is_some());
match self.window.layout().mouse_over(*page_point) {
Ok(MouseOverResponse(node_address)) => node_address,
Err(()) => vec![],
Ok(MouseOverResponse(node_address)) => Some(node_address),
Err(()) => None,
}
}
@ -808,18 +808,21 @@ impl Document {
client_point: Option<Point2D<f32>>,
prev_mouse_over_targets: &mut RootedVec<JS<Element>>) {
// Build a list of elements that are currently under the mouse.
let mouse_over_addresses = client_point.as_ref().map(|client_point| {
let mouse_over_address = client_point.as_ref().map(|client_point| {
let page_point = Point2D::new(client_point.x + self.window.PageXOffset() as f32,
client_point.y + self.window.PageYOffset() as f32);
self.get_nodes_under_mouse(&page_point)
}).unwrap_or(vec![]);
let mut mouse_over_targets = mouse_over_addresses.iter().map(|node_address| {
node::from_untrusted_node_address(js_runtime, *node_address)
.inclusive_ancestors()
.filter_map(Root::downcast::<Element>)
.next()
.unwrap()
}).collect::<RootedVec<JS<Element>>>();
self.get_node_under_mouse(&page_point)
}).unwrap_or(None);
let mut mouse_over_targets = RootedVec::<JS<Element>>::new();
if let Some(address) = mouse_over_address {
let node = node::from_untrusted_node_address(js_runtime, address);
for node in node.inclusive_ancestors()
.filter_map(Root::downcast::<Element>) {
mouse_over_targets.push(JS::from_rooted(&node));
}
}
// Remove hover from any elements in the previous list that are no longer
// under the mouse.
@ -856,9 +859,9 @@ impl Document {
}
// Send mousemove event to topmost target
if mouse_over_addresses.len() > 0 {
if let Some(address) = mouse_over_address {
let top_most_node = node::from_untrusted_node_address(js_runtime,
mouse_over_addresses[0]);
address);
let client_point = client_point.unwrap(); // Must succeed because hit test succeeded.
// If the target is an iframe, forward the event to the child document.