mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

Make CursorState store a ScreenCoordsXY object

Browse Source
This commit is contained in:
Tulio Leao
2019-12-14 23:30:55 -03:00
parent 9d09f1b95c
commit 2cd3add373
9 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/interface/Window.cpp
View File

@@ -533,7 +533,7 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex,
void window_all_wheel_input()
{
// Get wheel value
CursorState* cursorState = (CursorState*)context_get_cursor_state();
auto cursorState = context_get_cursor_state();
int32_t absolute_wheel = cursorState->wheel;
int32_t relative_wheel = absolute_wheel - _previousAbsoluteWheel;
int32_t pixel_scroll = relative_wheel * WINDOW_SCROLL_PIXELS;
@@ -545,7 +545,7 @@ void window_all_wheel_input()
// Check window cursor is over
if (!(input_test_flag(INPUT_FLAG_5)))
{
rct_window* w = window_find_from_point(ScreenCoordsXY(cursorState->x, cursorState->y));
rct_window* w = window_find_from_point(cursorState->position);
if (w != nullptr)
{
// Check if main window
@@ -556,7 +556,7 @@ void window_all_wheel_input()
}
// Check scroll view, cursor is over
rct_widgetindex widgetIndex = window_find_widget_from_point(w, ScreenCoordsXY(cursorState->x, cursorState->y));
rct_widgetindex widgetIndex = window_find_widget_from_point(w, cursorState->position);
if (widgetIndex != -1)
{
rct_widget* widget = &w->widgets[widgetIndex];