diff options
author | 2020-10-10 03:11:01 +1100 | |
---|---|---|
committer | 2020-10-10 03:11:01 +1100 | |
commit | d822e7ec4ad29eeb7724e9249ef97a7220f541e0 (patch) | |
tree | 3db9fd33235502b2bef495a342efb949f813de24 /src/emu/uiinput.cpp | |
parent | 7ae53fff264c9d4c75a06a2edebd5346590e138b (diff) |
Miscellaneous cleanup:
* osd/windows: Use steady clock for timing double-clicks.
* emu/uiinput.cpp: Made the event type a scoped enum.
Diffstat (limited to 'src/emu/uiinput.cpp')
-rw-r--r-- | src/emu/uiinput.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp index 232440dcba6..a5470505f12 100644 --- a/src/emu/uiinput.cpp +++ b/src/emu/uiinput.cpp @@ -109,13 +109,13 @@ bool ui_input_manager::push_event(ui_event evt) // some pre-processing (this is an icky place to do this stuff!) switch (evt.event_type) { - case ui_event::MOUSE_MOVE: + case ui_event::type::MOUSE_MOVE: m_current_mouse_target = evt.target; m_current_mouse_x = evt.mouse_x; m_current_mouse_y = evt.mouse_y; break; - case ui_event::MOUSE_LEAVE: + case ui_event::type::MOUSE_LEAVE: if (m_current_mouse_target == evt.target) { m_current_mouse_target = nullptr; @@ -124,11 +124,11 @@ bool ui_input_manager::push_event(ui_event evt) } break; - case ui_event::MOUSE_DOWN: + case ui_event::type::MOUSE_DOWN: m_current_mouse_down = true; break; - case ui_event::MOUSE_UP: + case ui_event::type::MOUSE_UP: m_current_mouse_down = false; break; @@ -301,8 +301,8 @@ g_profiler.stop(); void ui_input_manager::push_mouse_move_event(render_target* target, s32 x, s32 y) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_MOVE; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_MOVE; event.target = target; event.mouse_x = x; event.mouse_y = y; @@ -316,8 +316,8 @@ void ui_input_manager::push_mouse_move_event(render_target* target, s32 x, s32 y void ui_input_manager::push_mouse_leave_event(render_target* target) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_LEAVE; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_LEAVE; event.target = target; push_event(event); } @@ -329,8 +329,8 @@ void ui_input_manager::push_mouse_leave_event(render_target* target) void ui_input_manager::push_mouse_down_event(render_target* target, s32 x, s32 y) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_DOWN; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_DOWN; event.target = target; event.mouse_x = x; event.mouse_y = y; @@ -344,8 +344,8 @@ void ui_input_manager::push_mouse_down_event(render_target* target, s32 x, s32 y void ui_input_manager::push_mouse_up_event(render_target* target, s32 x, s32 y) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_UP; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_UP; event.target = target; event.mouse_x = x; event.mouse_y = y; @@ -359,8 +359,8 @@ down event to the specified render_target void ui_input_manager::push_mouse_rdown_event(render_target* target, s32 x, s32 y) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_RDOWN; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_RDOWN; event.target = target; event.mouse_x = x; event.mouse_y = y; @@ -374,8 +374,8 @@ down event to the specified render_target void ui_input_manager::push_mouse_rup_event(render_target* target, s32 x, s32 y) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_RUP; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_RUP; event.target = target; event.mouse_x = x; event.mouse_y = y; @@ -389,8 +389,8 @@ void ui_input_manager::push_mouse_rup_event(render_target* target, s32 x, s32 y) -------------------------------------------------*/ void ui_input_manager::push_mouse_double_click_event(render_target* target, s32 x, s32 y) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_DOUBLE_CLICK; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_DOUBLE_CLICK; event.target = target; event.mouse_x = x; event.mouse_y = y; @@ -403,8 +403,8 @@ void ui_input_manager::push_mouse_double_click_event(render_target* target, s32 -------------------------------------------------*/ void ui_input_manager::push_char_event(render_target* target, char32_t ch) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::IME_CHAR; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::IME_CHAR; event.target = target; event.ch = ch; push_event(event); @@ -417,8 +417,8 @@ void ui_input_manager::push_char_event(render_target* target, char32_t ch) void ui_input_manager::push_mouse_wheel_event(render_target *target, s32 x, s32 y, short delta, int ucNumLines) { - ui_event event = { ui_event::NONE }; - event.event_type = ui_event::MOUSE_WHEEL; + ui_event event = { ui_event::type::NONE }; + event.event_type = ui_event::type::MOUSE_WHEEL; event.target = target; event.mouse_x = x; event.mouse_y = y; |