RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 18:25:07 +00:00
Code Issues Activity Actions

WSWindowManager: Fix a small whoopsie with double click delivery

Browse source 
We must reset the click clock to invalid after delivering the double
click event. Otherwise, a subsequent click will make us (incorrectly)
deliver another double click.
This commit is contained in:
Robin Burchell 2019-05-16 00:40:11 +02:00 • committed by Andreas Kling
parent 966c5d10b1
commit c4610b825d
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Servers/WindowServer/WSWindowManager.cpp
View file

@ -688,7 +688,9 @@ void WSWindowManager::deliver_mouse_event(WSWindow& window, WSMouseEvent& event)
// if the clock is invalid, we haven't clicked with this button on this // if the clock is invalid, we haven't clicked with this button on this
// window yet, so there's nothing to do. // window yet, so there's nothing to do.
if (clock.is_valid()) { if (!clock.is_valid()) {
clock.start();
} else {
int elapsed_since_last_click = clock.elapsed(); int elapsed_since_last_click = clock.elapsed();
clock.start(); clock.start();
@ -699,11 +701,14 @@ void WSWindowManager::deliver_mouse_event(WSWindow& window, WSMouseEvent& event)
dbgprintf("Transforming MouseUp to MouseDoubleClick!\n"); dbgprintf("Transforming MouseUp to MouseDoubleClick!\n");
#endif #endif
event = WSMouseEvent(WSEvent::MouseDoubleClick, event.position(), event.buttons(), event.button(), event.modifiers(), event.wheel_delta()); event = WSMouseEvent(WSEvent::MouseDoubleClick, event.position(), event.buttons(), event.button(), event.modifiers(), event.wheel_delta());
// invalidate this now we've delivered a doubleclick, otherwise
// tripleclick will deliver two doubleclick events (incorrectly).
clock = CElapsedTimer();
} else {
// too slow; try again
clock.start();
} }
} }
// start (or re-start, if it was invalid) the double click timer again.
clock.start();
} }
window.event(event); window.event(event);