RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 19:15:09 +00:00
Code Issues Activity Actions

LibGUI: Fix broken doubleclick detection due to uninitialized GElapsedTimer.

Browse source
This commit is contained in:
Andreas Kling 2019-04-01 22:03:32 +02:00
parent ee4d7c18c8
commit c9b0d87927
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
LibGUI/GWidget.cpp
View file

@ -67,9 +67,7 @@ void GWidget::event(GEvent& event)
case GEvent::MouseMove:
return mousemove_event(static_cast<GMouseEvent&>(event));
case GEvent::MouseDown:
if (accepts_focus())
set_focus(true);
return mousedown_event(static_cast<GMouseEvent&>(event));
return handle_mousedown_event(static_cast<GMouseEvent&>(event));
case GEvent::MouseUp:
return handle_mouseup_event(static_cast<GMouseEvent&>(event));
case GEvent::Enter:
@ -154,6 +152,7 @@ void GWidget::handle_mouseup_event(GMouseEvent& event)
// It's a click.. but is it a doubleclick?
// FIXME: This needs improvement.
int elapsed_since_last_click = m_click_clock.elapsed();
dbgprintf("Click clock elapsed: %d\n", m_click_clock.elapsed());
if (elapsed_since_last_click < 250) {
doubleclick_event(event);
} else {
@ -161,6 +160,15 @@ void GWidget::handle_mouseup_event(GMouseEvent& event)
}
}
void GWidget::handle_mousedown_event(GMouseEvent& event)
{
if (accepts_focus())
set_focus(true);
if (!m_click_clock.is_valid())
m_click_clock.start();
mousedown_event(event);
}
void GWidget::click_event(GMouseEvent&)
{
}