mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 19:25:12 +01:00
Code Issues Releases Wiki Activity

Refactor widgets state (#23621)

Browse Source 
* Refactor windows to not share widget state

* First half of refactoring all the windows

* Refactor the remaining windows, compiles but has issues

* Fix drawing only every second widget

* Remove the need of an terminating widget

* Address WidgetIndex signedness issues; use kWidgetIndexNull more

* Address constexpr issue with Widget content union

* Fix tabs in scenery window

* Fix tabs in object selection window

* Adjust custom widget index for CustomTool events

* Use STR_NONE for default tooltip initialisation

* Adjustment for mingw compiler

* Fix bottom toolbar using the widget declaration not instance

* Remove pointless code in Guest window, handled by SetPage

* Prevent out of bounds crash

* Move scroll widgets initialization to SetPage in Cheats window

* Remove special logic in Options window

* Remove special logic in Park window

* Remove special logic for Player window

* Remove special logic for Research window

* Remove special logic for Ride window

* Remove special logic for Staff window

* Remove special logic for Finances window

* Remove special logic for MapGen window

* Remove special logic for editor objective options window

* Remove special logic for editor scenario options window

* Fix widgets not being set since page is initialized to 0

* Remove more redundant code

* Fix remaining access to widget declarations

* Remove unused variable

* Fix editor object selection tabs on successive windows

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
This commit is contained in:
Matt
2025-01-18 14:45:17 +02:00
committed by GitHub
parent 4dac6ff030
commit b9f6b6f754
92 changed files with 574 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2-ui/windows/Dropdown.cpp
View File

@@ -41,9 +41,8 @@ namespace OpenRCT2::Ui::Windows
WIDX_BACKGROUND,
};
static Widget window_dropdown_widgets[] = {
static constexpr Widget window_dropdown_widgets[] = {
MakeWidget({ 0, 0 }, { 1, 1 }, WindowWidgetType::ImgBtn, WindowColour::Primary),
kWidgetsEnd,
};
int32_t gDropdownNumItems;
@@ -75,7 +74,7 @@ namespace OpenRCT2::Ui::Windows
public:
void OnOpen() override
{
widgets = window_dropdown_widgets;
SetWidgets(window_dropdown_widgets);
// Input state
gDropdownHighlightedIndex = -1;
@@ -295,8 +294,8 @@ namespace OpenRCT2::Ui::Windows
boundedScreenPos.x = std::max(0, screenWidth - ddWidth);
if (screenPos.y + ddHeight > screenHeight)
boundedScreenPos.y = std::max(0, screenHeight - ddHeight);
window_dropdown_widgets[WIDX_BACKGROUND].right = ddWidth;
window_dropdown_widgets[WIDX_BACKGROUND].bottom = ddHeight;
widgets[WIDX_BACKGROUND].right = ddWidth;
widgets[WIDX_BACKGROUND].bottom = ddHeight;
Invalidate();
width = ddWidth + 1;