mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 15:57:34 +00:00
Move double click events from LibGUI to the window server
This commit is contained in:
parent
3cba2a8a78
commit
a4b0dfff43
10 changed files with 92 additions and 43 deletions
|
@ -18,6 +18,7 @@ public:
|
|||
Resize,
|
||||
MouseMove,
|
||||
MouseDown,
|
||||
MouseDoubleClick,
|
||||
MouseUp,
|
||||
MouseWheel,
|
||||
Enter,
|
||||
|
|
|
@ -159,6 +159,7 @@ void GEventLoop::handle_mouse_event(const WSAPI_ServerMessage& event, GWindow& w
|
|||
case WSAPI_ServerMessage::Type::MouseMove: type = GEvent::MouseMove; break;
|
||||
case WSAPI_ServerMessage::Type::MouseUp: type = GEvent::MouseUp; break;
|
||||
case WSAPI_ServerMessage::Type::MouseDown: type = GEvent::MouseDown; break;
|
||||
case WSAPI_ServerMessage::Type::MouseDoubleClick: type = GEvent::MouseDoubleClick; break;
|
||||
case WSAPI_ServerMessage::Type::MouseWheel: type = GEvent::MouseWheel; break;
|
||||
default: ASSERT_NOT_REACHED(); break;
|
||||
}
|
||||
|
@ -275,6 +276,7 @@ void GEventLoop::process_unprocessed_bundles()
|
|||
handle_paint_event(event, *window, bundle.extra_data);
|
||||
break;
|
||||
case WSAPI_ServerMessage::Type::MouseDown:
|
||||
case WSAPI_ServerMessage::Type::MouseDoubleClick:
|
||||
case WSAPI_ServerMessage::Type::MouseUp:
|
||||
case WSAPI_ServerMessage::Type::MouseMove:
|
||||
case WSAPI_ServerMessage::Type::MouseWheel:
|
||||
|
|
|
@ -84,6 +84,8 @@ void GWidget::event(CEvent& event)
|
|||
return mousemove_event(static_cast<GMouseEvent&>(event));
|
||||
case GEvent::MouseDown:
|
||||
return handle_mousedown_event(static_cast<GMouseEvent&>(event));
|
||||
case GEvent::MouseDoubleClick:
|
||||
return handle_mousedoubleclick_event(static_cast<GMouseEvent&>(event));
|
||||
case GEvent::MouseUp:
|
||||
return handle_mouseup_event(static_cast<GMouseEvent&>(event));
|
||||
case GEvent::MouseWheel:
|
||||
|
@ -157,38 +159,9 @@ void GWidget::handle_resize_event(GResizeEvent& event)
|
|||
return resize_event(event);
|
||||
}
|
||||
|
||||
CElapsedTimer& GWidget::click_clock(GMouseButton button)
|
||||
{
|
||||
switch (button) {
|
||||
case GMouseButton::Left: return m_left_click_clock;
|
||||
case GMouseButton::Right: return m_right_click_clock;
|
||||
case GMouseButton::Middle: return m_middle_click_clock;
|
||||
default:
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
}
|
||||
|
||||
void GWidget::handle_mouseup_event(GMouseEvent& event)
|
||||
{
|
||||
mouseup_event(event);
|
||||
|
||||
if (!rect().contains(event.position()))
|
||||
return;
|
||||
auto& clock = click_clock(event.button());
|
||||
// It's a click.. but is it a doubleclick?
|
||||
// FIXME: This needs improvement.
|
||||
if (!clock.is_valid()) {
|
||||
clock.start();
|
||||
return;
|
||||
}
|
||||
int elapsed_since_last_click = clock.elapsed();
|
||||
clock.start();
|
||||
#if 0
|
||||
dbgprintf("Click clock elapsed: %d\n", elapsed_since_last_click);
|
||||
#endif
|
||||
if (elapsed_since_last_click < 250) {
|
||||
doubleclick_event(event);
|
||||
}
|
||||
}
|
||||
|
||||
void GWidget::handle_mousedown_event(GMouseEvent& event)
|
||||
|
@ -202,6 +175,11 @@ void GWidget::handle_mousedown_event(GMouseEvent& event)
|
|||
}
|
||||
}
|
||||
|
||||
void GWidget::handle_mousedoubleclick_event(GMouseEvent& event)
|
||||
{
|
||||
doubleclick_event(event);
|
||||
}
|
||||
|
||||
void GWidget::handle_enter_event(CEvent& event)
|
||||
{
|
||||
if (has_tooltip())
|
||||
|
|
|
@ -190,6 +190,7 @@ private:
|
|||
void handle_paint_event(GPaintEvent&);
|
||||
void handle_resize_event(GResizeEvent&);
|
||||
void handle_mousedown_event(GMouseEvent&);
|
||||
void handle_mousedoubleclick_event(GMouseEvent&);
|
||||
void handle_mouseup_event(GMouseEvent&);
|
||||
void handle_enter_event(CEvent&);
|
||||
void handle_leave_event(CEvent&);
|
||||
|
@ -197,8 +198,6 @@ private:
|
|||
void focus_previous_widget();
|
||||
void focus_next_widget();
|
||||
|
||||
CElapsedTimer& click_clock(GMouseButton);
|
||||
|
||||
GWindow* m_window { nullptr };
|
||||
OwnPtr<GLayout> m_layout;
|
||||
|
||||
|
@ -219,9 +218,5 @@ private:
|
|||
bool m_layout_dirty { false };
|
||||
bool m_updates_enabled { true };
|
||||
|
||||
CElapsedTimer m_left_click_clock;
|
||||
CElapsedTimer m_right_click_clock;
|
||||
CElapsedTimer m_middle_click_clock;
|
||||
|
||||
HashMap<GShortcut, GAction*> m_local_shortcut_actions;
|
||||
};
|
||||
|
|
|
@ -170,7 +170,7 @@ void GWindow::set_override_cursor(GStandardCursor cursor)
|
|||
|
||||
void GWindow::event(CEvent& event)
|
||||
{
|
||||
if (event.type() == GEvent::MouseUp || event.type() == GEvent::MouseDown || event.type() == GEvent::MouseMove || event.type() == GEvent::MouseWheel) {
|
||||
if (event.type() == GEvent::MouseUp || event.type() == GEvent::MouseDown || event.type() == GEvent::MouseDoubleClick || event.type() == GEvent::MouseMove || event.type() == GEvent::MouseWheel) {
|
||||
auto& mouse_event = static_cast<GMouseEvent&>(event);
|
||||
if (m_global_cursor_tracking_widget) {
|
||||
auto window_relative_rect = m_global_cursor_tracking_widget->window_relative_rect();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue