fix merge

This commit is contained in:
Evan Almloff committed 2022-05-12 20:52:06 -05:00
1 parent 6ccbe662d2
commit bdbe452b33
1 file changed
+7 -2
+7 -2
View File
@@ -213,7 +213,7 @@ impl InnerInputState {
} }
fn resolve_mouse_events( fn resolve_mouse_events(
&self, &mut self,
previous_mouse: Option<MouseData>, previous_mouse: Option<MouseData>,
resolved_events: &mut Vec<UserEvent>, resolved_events: &mut Vec<UserEvent>,
layout: &Stretch, layout: &Stretch,
@@ -259,8 +259,13 @@ impl InnerInputState {
let new_client_coordinates = (mouse_data.client_coordinates() - node_origin) let new_client_coordinates = (mouse_data.client_coordinates() - node_origin)
.to_point() .to_point()
.cast_unit(); .cast_unit();
let coordinates = Coordinates::new(
mouse_data.screen_coordinates(),
mouse_data.client_coordinates(),
new_client_coordinates, new_client_coordinates,
mouse_data.page_coordinates(), mouse_data.page_coordinates(),
);
MouseData::new( MouseData::new(
coordinates, coordinates,
@@ -517,7 +522,7 @@ impl InnerInputState {
} }
// update focus // update focus
if released { if was_released {
let mut focus_id = None; let mut focus_id = None;
dom.traverse_depth_first(|node| { dom.traverse_depth_first(|node| {
let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap(); let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();