switch released pressed
This commit is contained in:
1 parent
e3757f97ed
commit
ac95ab5222
1 file changed
+7
-5
@@ -232,10 +232,12 @@ impl InnerInputState {
|
|||||||
let old_pos = previous_mouse
|
let old_pos = previous_mouse
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(|m| (m.0.screen_x, m.0.screen_y));
|
.map(|m| (m.0.screen_x, m.0.screen_y));
|
||||||
let clicked =
|
// the a mouse button is pressed if a button was not down and is now down
|
||||||
(!mouse.0.buttons & previous_mouse.as_ref().map(|m| m.0.buttons).unwrap_or(0)) > 0;
|
let pressed =
|
||||||
|
(mouse.0.buttons & !previous_mouse.as_ref().map(|m| m.0.buttons).unwrap_or(0)) > 0;
|
||||||
|
// the a mouse button is pressed if a button was down and is now not down
|
||||||
let released =
|
let released =
|
||||||
(mouse.0.buttons & !previous_mouse.map(|m| m.0.buttons).unwrap_or(0)) > 0;
|
(!mouse.0.buttons & previous_mouse.map(|m| m.0.buttons).unwrap_or(0)) > 0;
|
||||||
let wheel_delta = self.wheel.as_ref().map_or(0.0, |w| w.delta_y);
|
let wheel_delta = self.wheel.as_ref().map_or(0.0, |w| w.delta_y);
|
||||||
let mouse_data = &mouse.0;
|
let mouse_data = &mouse.0;
|
||||||
let wheel_data = &self.wheel;
|
let wheel_data = &self.wheel;
|
||||||
@@ -311,8 +313,8 @@ impl InnerInputState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
// mousedown
|
||||||
// mousedown
|
if pressed {
|
||||||
let mut will_bubble = FxHashSet::default();
|
let mut will_bubble = FxHashSet::default();
|
||||||
for node in dom.get_listening_sorted("mousedown") {
|
for node in dom.get_listening_sorted("mousedown") {
|
||||||
let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
|
let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();
|
||||||
|
|||||||
Reference in new issue
Block a user