mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity

Use ScreenCoordsXY for interface\Widget.h (#10123)

Browse Source
This commit is contained in:
Tulio Leao
2019-10-29 13:41:19 -03:00
committed by Michael Steenbeek
parent f2eb1fada6
commit d9efd64fea
4 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@@ -271,13 +271,14 @@ static ResearchItem* get_research_item_at(int32_t x, int32_t y, int32_t* outScro
if (widgetIndex == WIDX_PRE_RESEARCHED_SCROLL || widgetIndex == WIDX_RESEARCH_ORDER_SCROLL)
{
gPressedWidget.widget_index = widgetIndex;
int32_t outX, outY, outScrollArea;
widget_scroll_get_part(w, widget, x, y, &outX, &outY, &outScrollArea, outScrollId);
int32_t outScrollArea;
ScreenCoordsXY outScrollCoords;
widget_scroll_get_part(w, widget, ScreenCoordsXY(x, y), outScrollCoords, &outScrollArea, outScrollId);
if (outScrollArea == SCROLL_PART_VIEW)
{
*outScrollId = *outScrollId == 0 ? 0 : 1;
int32_t scrollY = y - (w->y + widget->top) + w->scrolls[*outScrollId].v_top + 5;
int32_t scrollY = outScrollCoords.y + 6;
return window_editor_inventions_list_get_item_from_scroll_y_include_seps(*outScrollId, scrollY);
}
}