mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor UI/Interface Window to Title Case (#13367)

This commit is contained in:
pizza2004 2020-11-03 21:52:23 -07:00 committed by GitHub
parent 7897fb1829
commit 2015acd4c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
82 changed files with 392 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/WindowManager.cpp
View File

@ -550,7 +550,7 @@ public:
void UpdateMouseWheel() override
{
window_all_wheel_input();
WindowAllWheelInput();
}
rct_window* GetOwner(const rct_viewport* viewport) override

2
src/openrct2-ui/input/MouseInput.cpp
View File

@ -105,7 +105,7 @@ void GameHandleInput()
{
window_visit_each([](rct_window* w) { window_event_periodic_update_call(w); });
invalidate_all_windows_after_input();
InvalidateAllWindowsAfterInput();
MouseState state;
ScreenCoordsXY screenCoords;

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

@ -28,11 +28,11 @@
using namespace OpenRCT2;
// The amount of pixels to scroll per wheel click
constexpr int32_t WINDOW_SCROLL_PIXELS = 17;
constexpr int32_t WindowScrollPixels = 17;
static int32_t _previousAbsoluteWheel = 0;
static bool window_fits_between_others(const ScreenCoordsXY& loc, int32_t width, int32_t height)
static bool WindowFitsBetweenOthers(const ScreenCoordsXY& loc, int32_t width, int32_t height)
{
for (auto& w : g_window_list)
{
@ -53,7 +53,7 @@ static bool window_fits_between_others(const ScreenCoordsXY& loc, int32_t width,
return true;
}
static bool window_fits_within_space(const ScreenCoordsXY& loc, int32_t width, int32_t height)
static bool WindowFitsWithinSpace(const ScreenCoordsXY& loc, int32_t width, int32_t height)
{
if (loc.x < 0)
return false;
@ -63,10 +63,10 @@ static bool window_fits_within_space(const ScreenCoordsXY& loc, int32_t width, i
return false;
if (loc.y + height > context_get_height())
return false;
return window_fits_between_others(loc, width, height);
return WindowFitsBetweenOthers(loc, width, height);
}
static bool window_fits_on_screen(const ScreenCoordsXY& loc, int32_t width, int32_t height)
static bool WindowFitsOnScreen(const ScreenCoordsXY& loc, int32_t width, int32_t height)
{
uint16_t screenWidth = context_get_width();
uint16_t screenHeight = context_get_height();
@ -83,10 +83,10 @@ static bool window_fits_on_screen(const ScreenCoordsXY& loc, int32_t width, int3
unk = screenHeight - (height / 4);
if (loc.y > unk)
return false;
return window_fits_between_others(loc, width, height);
return WindowFitsBetweenOthers(loc, width, height);
}
rct_window* window_create(
rct_window* WindowCreate(
const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, rct_window_event_list* event_handlers,
rct_windowclass cls, uint16_t flags)
{
@ -187,7 +187,7 @@ static ScreenCoordsXY ClampWindowToScreen(const ScreenCoordsXY& pos, const int32
return screenPos;
}
rct_window* window_create_auto_pos(
rct_window* WindowCreateAutoPos(
int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls, uint16_t flags)
{
auto uiContext = GetContext()->GetUiContext();
@ -204,8 +204,8 @@ rct_window* window_create_auto_pos(
for (const auto& cornerPos : cornerPositions)
{
if (window_fits_within_space(cornerPos, width, height))
return window_create(ClampWindowToScreen(cornerPos, screenWidth, width), width, height, event_handlers, cls, flags);
if (WindowFitsWithinSpace(cornerPos, width, height))
return WindowCreate(ClampWindowToScreen(cornerPos, screenWidth, width), width, height, event_handlers, cls, flags);
}
// Place window next to another
@ -226,8 +226,8 @@ rct_window* window_create_auto_pos(
for (const auto& offset : offsets)
{
auto screenPos = w->windowPos + offset;
if (window_fits_within_space(screenPos, width, height))
return window_create(
if (WindowFitsWithinSpace(screenPos, width, height))
return WindowCreate(
ClampWindowToScreen(screenPos, screenWidth, width), width, height, event_handlers, cls, flags);
}
}
@ -250,8 +250,8 @@ rct_window* window_create_auto_pos(
for (const auto& offset : offsets)
{
auto screenPos = w->windowPos + offset;
if (window_fits_on_screen(screenPos, width, height))
return window_create(
if (WindowFitsOnScreen(screenPos, width, height))
return WindowCreate(
ClampWindowToScreen(screenPos, screenWidth, width), width, height, event_handlers, cls, flags);
}
}
@ -267,10 +267,10 @@ rct_window* window_create_auto_pos(
}
}
return window_create(ClampWindowToScreen(screenPos, screenWidth, width), width, height, event_handlers, cls, flags);
return WindowCreate(ClampWindowToScreen(screenPos, screenWidth, width), width, height, event_handlers, cls, flags);
}
rct_window* window_create_centred(
rct_window* WindowCreateCentred(
int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls, uint16_t flags)
{
auto uiContext = GetContext()->GetUiContext();
@ -278,10 +278,10 @@ rct_window* window_create_centred(
auto screenHeight = uiContext->GetHeight();
auto screenPos = ScreenCoordsXY{ (screenWidth - width) / 2, std::max(TOP_TOOLBAR_HEIGHT + 1, (screenHeight - height) / 2) };
return window_create(screenPos, width, height, event_handlers, cls, flags);
return WindowCreate(screenPos, width, height, event_handlers, cls, flags);
}
static int32_t window_get_widget_index(rct_window* w, rct_widget* widget)
static int32_t WindowGetWidgetIndex(rct_window* w, rct_widget* widget)
{
int32_t i = 0;
for (rct_widget* widget2 = w->widgets; widget2->type != WWT_LAST; widget2++, i++)
@ -290,7 +290,7 @@ static int32_t window_get_widget_index(rct_window* w, rct_widget* widget)
return -1;
}
static int32_t window_get_scroll_index(rct_window* w, int32_t targetWidgetIndex)
static int32_t WindowGetScrollIndex(rct_window* w, int32_t targetWidgetIndex)
{
if (w->widgets[targetWidgetIndex].type != WWT_SCROLL)
return -1;
@ -308,7 +308,7 @@ static int32_t window_get_scroll_index(rct_window* w, int32_t targetWidgetIndex)
return scrollIndex;
}
static rct_widget* window_get_scroll_widget(rct_window* w, int32_t scrollIndex)
static rct_widget* WindowGetScrollWidget(rct_window* w, int32_t scrollIndex)
{
for (rct_widget* widget = w->widgets; widget->type != WWT_LAST; widget++)
{
@ -327,11 +327,11 @@ static rct_widget* window_get_scroll_widget(rct_window* w, int32_t scrollIndex)
*
* rct2: 0x006E78E3
*/
static void window_scroll_wheel_input(rct_window* w, int32_t scrollIndex, int32_t wheel)
static void WindowScrollWheelInput(rct_window* w, int32_t scrollIndex, int32_t wheel)
{
rct_scroll* scroll = &w->scrolls[scrollIndex];
rct_widget* widget = window_get_scroll_widget(w, scrollIndex);
rct_widgetindex widgetIndex = window_get_widget_index(w, widget);
rct_widget* widget = WindowGetScrollWidget(w, scrollIndex);
rct_widgetindex widgetIndex = WindowGetWidgetIndex(w, widget);
if (scroll->flags & VSCROLLBAR_VISIBLE)
{
@ -358,7 +358,7 @@ static void window_scroll_wheel_input(rct_window* w, int32_t scrollIndex, int32_
*
* rct2: 0x006E793B
*/
static int32_t window_wheel_input(rct_window* w, int32_t wheel)
static int32_t WindowWheelInput(rct_window* w, int32_t wheel)
{
int32_t i = 0;
for (rct_widget* widget = w->widgets; widget->type != WWT_LAST; widget++)
@ -370,7 +370,7 @@ static int32_t window_wheel_input(rct_window* w, int32_t wheel)
rct_scroll* scroll = &w->scrolls[i];
if (scroll->flags & (HSCROLLBAR_VISIBLE | VSCROLLBAR_VISIBLE))
{
window_scroll_wheel_input(w, i, wheel);
WindowScrollWheelInput(w, i, wheel);
return 1;
}
i++;
@ -383,7 +383,7 @@ static int32_t window_wheel_input(rct_window* w, int32_t wheel)
*
* rct2: 0x006E79FB
*/
static void window_viewport_wheel_input(rct_window* w, int32_t wheel)
static void WindowViewportWheelInput(rct_window* w, int32_t wheel)
{
if (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TITLE_DEMO))
return;
@ -394,7 +394,7 @@ static void window_viewport_wheel_input(rct_window* w, int32_t wheel)
window_zoom_out(w, true);
}
static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex, int32_t wheel)
static bool WindowOtherWheelInput(rct_window* w, rct_widgetindex widgetIndex, int32_t wheel)
{
// HACK: Until we have a new window system that allows us to add new events like mouse wheel easily,
// this selective approach will have to do.
@ -482,13 +482,13 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex,
*
* rct2: 0x006E7868
*/
void window_all_wheel_input()
void WindowAllWheelInput()
{
// Get wheel value
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;
int32_t pixel_scroll = relative_wheel * WindowScrollPixels;
_previousAbsoluteWheel = absolute_wheel;
if (relative_wheel == 0)
@ -503,7 +503,7 @@ void window_all_wheel_input()
// Check if main window
if (w->classification == WC_MAIN_WINDOW || w->classification == WC_VIEWPORT)
{
window_viewport_wheel_input(w, relative_wheel);
WindowViewportWheelInput(w, relative_wheel);
return;
}
@ -514,24 +514,24 @@ void window_all_wheel_input()
rct_widget* widget = &w->widgets[widgetIndex];
if (widget->type == WWT_SCROLL)
{
int32_t scrollIndex = window_get_scroll_index(w, widgetIndex);
int32_t scrollIndex = WindowGetScrollIndex(w, widgetIndex);
rct_scroll* scroll = &w->scrolls[scrollIndex];
if (scroll->flags & (HSCROLLBAR_VISIBLE | VSCROLLBAR_VISIBLE))
{
window_scroll_wheel_input(w, window_get_scroll_index(w, widgetIndex), pixel_scroll);
WindowScrollWheelInput(w, WindowGetScrollIndex(w, widgetIndex), pixel_scroll);
return;
}
}
else
{
if (window_other_wheel_input(w, widgetIndex, pixel_scroll))
if (WindowOtherWheelInput(w, widgetIndex, pixel_scroll))
{
return;
}
}
// Check other scroll views on window
if (window_wheel_input(w, pixel_scroll))
if (WindowWheelInput(w, pixel_scroll))
return;
}
}
@ -547,7 +547,7 @@ void ApplyScreenSaverLockSetting()
* Initialises scroll widgets to their virtual size.
* rct2: 0x006EAEB8
*/
void window_init_scroll_widgets(rct_window* w)
void WindowInitScrollWidgets(rct_window* w)
{
rct_widget* widget;
rct_scroll* scroll;
@ -590,7 +590,7 @@ void window_init_scroll_widgets(rct_window* w)
*
* rct2: 0x006EB15C
*/
void window_draw_widgets(rct_window* w, rct_drawpixelinfo* dpi)
void WindowDrawWidgets(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* widget;
rct_widgetindex widgetIndex;
@ -625,7 +625,7 @@ void window_draw_widgets(rct_window* w, rct_drawpixelinfo* dpi)
*
* rct2: 0x006EA776
*/
static void window_invalidate_pressed_image_buttons(rct_window* w)
static void WindowInvalidatePressedImageButton(rct_window* w)
{
rct_widgetindex widgetIndex;
rct_widget* widget;
@ -645,11 +645,11 @@ static void window_invalidate_pressed_image_buttons(rct_window* w)
*
* rct2: 0x006EA73F
*/
void invalidate_all_windows_after_input()
void InvalidateAllWindowsAfterInput()
{
window_visit_each([](rct_window* w) {
window_update_scroll_widgets(w);
window_invalidate_pressed_image_buttons(w);
WindowInvalidatePressedImageButton(w);
window_event_resize_call(w);
});
}

2
src/openrct2-ui/interface/Window.h
View File

@ -12,5 +12,5 @@
#include <openrct2/interface/Window.h>
#include <openrct2/interface/Window_internal.h>
void window_all_wheel_input();
void WindowAllWheelInput();
void ApplyScreenSaverLockSetting();

2
src/openrct2-ui/scripting/CustomListView.cpp
View File

@ -724,7 +724,7 @@ std::optional<RowColumn> CustomListView::GetItemIndexAt(const ScreenCoordsXY& po
void CustomListView::RefreshScroll()
{
window_init_scroll_widgets(ParentWindow);
WindowInitScrollWidgets(ParentWindow);
Invalidate();
}

11
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@ -381,12 +381,11 @@ namespace OpenRCT2::Ui::Windows
rct_window* window{};
if (desc.X && desc.Y)
{
window = window_create(
{ *desc.X, *desc.Y }, desc.Width, desc.Height, &window_custom_events, WC_CUSTOM, windowFlags);
window = WindowCreate({ *desc.X, *desc.Y }, desc.Width, desc.Height, &window_custom_events, WC_CUSTOM, windowFlags);
}
else
{
window = window_create_auto_pos(desc.Width, desc.Height, &window_custom_events, WC_CUSTOM, windowFlags);
window = WindowCreateAutoPos(desc.Width, desc.Height, &window_custom_events, WC_CUSTOM, windowFlags);
}
window->number = GetNewWindowNumber();
@ -436,7 +435,7 @@ namespace OpenRCT2::Ui::Windows
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
InvokeEventHandler(info.Owner, info.Desc.OnTabChange);
@ -703,7 +702,7 @@ namespace OpenRCT2::Ui::Windows
static void window_custom_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_custom_draw_tab_images(w, dpi);
if (w->viewport != nullptr)
{
@ -1029,7 +1028,7 @@ namespace OpenRCT2::Ui::Windows
widgets.push_back({ WIDGETS_END });
w->widgets = widgets.data();
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
window_custom_update_viewport(w);
}

8
src/openrct2-ui/windows/About.cpp
View File

@ -123,11 +123,11 @@ rct_window* window_about_open()
if (window != nullptr)
return window;
window = window_create_centred(WW, WH, window_about_page_events[WINDOW_ABOUT_PAGE_OPENRCT2], WC_ABOUT, 0);
window = WindowCreateCentred(WW, WH, window_about_page_events[WINDOW_ABOUT_PAGE_OPENRCT2], WC_ABOUT, 0);
window_about_set_page(window, WINDOW_ABOUT_PAGE_OPENRCT2);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->colours[0] = COLOUR_GREY;
window->colours[1] = COLOUR_LIGHT_BLUE;
window->colours[2] = COLOUR_LIGHT_BLUE;
@ -162,7 +162,7 @@ static void window_about_openrct2_mouseup(rct_window* w, rct_widgetindex widgetI
static void window_about_openrct2_common_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
const auto& aboutOpenRCT2 = w->widgets[WIDX_TAB_ABOUT_OPENRCT2];
const auto& aboutRCT2 = w->widgets[WIDX_TAB_ABOUT_RCT2];
@ -315,6 +315,6 @@ static void window_about_set_page(rct_window* w, int32_t page)
w->pressed_widgets |= (page == WINDOW_ABOUT_PAGE_RCT2) ? (1ULL << WIDX_TAB_ABOUT_RCT2) : (1ULL << WIDX_TAB_ABOUT_OPENRCT2);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}

6
src/openrct2-ui/windows/Banner.cpp
View File

@ -103,13 +103,13 @@ rct_window* window_banner_open(rct_windownumber number)
if (w != nullptr)
return w;
w = window_create_auto_pos(WW, WH, &window_banner_events, WC_BANNER, WF_NO_SCROLLING);
w = WindowCreateAutoPos(WW, WH, &window_banner_events, WC_BANNER, WF_NO_SCROLLING);
w->widgets = window_banner_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_BANNER_TEXT) | (1 << WIDX_BANNER_NO_ENTRY) | (1 << WIDX_BANNER_DEMOLISH)
| (1 << WIDX_MAIN_COLOUR) | (1 << WIDX_TEXT_COLOUR_DROPDOWN) | (1 << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON);
w->number = number;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
auto banner = GetBanner(w->number);
auto bannerViewPos = banner->position.ToCoordsXY().ToTileCentre();
@ -300,7 +300,7 @@ static void window_banner_invalidate(rct_window* w)
/* rct2: 0x006BA4C5 */
static void window_banner_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw viewport
if (w->viewport != nullptr)

6
src/openrct2-ui/windows/Changelog.cpp
View File

@ -123,12 +123,12 @@ rct_window* window_changelog_open(int personality)
int32_t screenWidth = context_get_width();
int32_t screenHeight = context_get_height();
window = window_create_centred(
window = WindowCreateCentred(
screenWidth * 4 / 5, screenHeight * 4 / 5, &window_changelog_events, WC_CHANGELOG, WF_RESIZABLE);
window->widgets = window_changelog_widgets;
window->enabled_widgets = enabled_widgets;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->min_width = MIN_WW;
window->min_height = MIN_WH;
window->max_width = MIN_WW;
@ -208,7 +208,7 @@ static void window_changelog_invalidate(rct_window* w)
static void window_changelog_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
static void window_changelog_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, [[maybe_unused]] int32_t scrollIndex)

8
src/openrct2-ui/windows/Cheats.cpp
View File

@ -523,11 +523,11 @@ rct_window* window_cheats_open()
if (window != nullptr)
return window;
window = window_create(ScreenCoordsXY(32, 32), WW, WH, &window_cheats_money_events, WC_CHEATS, 0);
window = WindowCreate(ScreenCoordsXY(32, 32), WW, WH, &window_cheats_money_events, WC_CHEATS, 0);
window->widgets = window_cheats_money_widgets;
window->enabled_widgets = window_cheats_page_enabled_widgets[0];
window->hold_down_widgets = window_cheats_page_hold_down_widgets[0];
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_cheats_set_page(window, WINDOW_CHEATS_PAGE_MONEY);
_parkRatingSpinnerValue = get_forced_park_rating() >= 0 ? get_forced_park_rating() : 999;
@ -1024,7 +1024,7 @@ static void window_cheats_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets = 0;
@ -1127,7 +1127,7 @@ static void window_cheats_update_tab_positions(rct_window* w)
static void window_cheats_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_cheats_update_tab_positions(w);
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_cheats_draw_tab_images(dpi, w);
static constexpr int16_t X_LCOL = 14;

6
src/openrct2-ui/windows/ClearScenery.cpp
View File

@ -78,13 +78,13 @@ rct_window* window_clear_scenery_open()
if (window != nullptr)
return window;
window = window_create(
window = WindowCreate(
ScreenCoordsXY(context_get_width() - WW, 29), WW, WH, &window_clear_scenery_events, WC_CLEAR_SCENERY, 0);
window->widgets = window_clear_scenery_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT) | (1 << WIDX_PREVIEW)
| (1 << WIDX_SMALL_SCENERY) | (1 << WIDX_LARGE_SCENERY) | (1 << WIDX_FOOTPATH);
window->hold_down_widgets = (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_below(window);
gLandToolSize = 2;
@ -215,7 +215,7 @@ static void window_clear_scenery_invalidate(rct_window* w)
*/
static void window_clear_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw number for tool sizes bigger than 7
ScreenCoordsXY screenCoords = { w->windowPos.x + window_clear_scenery_widgets[WIDX_PREVIEW].midX(),

6
src/openrct2-ui/windows/CustomCurrency.cpp
View File

@ -69,13 +69,13 @@ rct_window* custom_currency_window_open()
if (window != nullptr)
return window;
window = window_create_centred(400, 100, &_windowCustomCurrencyEvents, WC_CUSTOM_CURRENCY_CONFIG, 0);
window = WindowCreateCentred(400, 100, &_windowCustomCurrencyEvents, WC_CUSTOM_CURRENCY_CONFIG, 0);
window->widgets = window_custom_currency_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RATE) | (1 << WIDX_RATE_UP) | (1 << WIDX_RATE_DOWN)
| (1 << WIDX_SYMBOL_TEXT) | (1 << WIDX_AFFIX_DROPDOWN) | (1 << WIDX_AFFIX_DROPDOWN_BUTTON);
window->hold_down_widgets = (1 << WIDX_RATE_UP) | (1 << WIDX_RATE_DOWN);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->colours[0] = COLOUR_LIGHT_BROWN;
window->colours[1] = COLOUR_LIGHT_BROWN;
window->colours[2] = COLOUR_LIGHT_BROWN;
@ -214,7 +214,7 @@ static void custom_currency_window_paint(rct_window* w, rct_drawpixelinfo* dpi)
auto ft = Formatter::Common();
ft.Add<int32_t>(100);
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
auto screenCoords = w->windowPos + ScreenCoordsXY{ 10, 30 };

6
src/openrct2-ui/windows/DebugPaint.cpp
View File

@ -66,14 +66,14 @@ rct_window* window_debug_paint_open()
if (window != nullptr)
return window;
window = window_create(
window = WindowCreate(
ScreenCoordsXY(16, context_get_height() - 16 - 33 - WINDOW_HEIGHT), WINDOW_WIDTH, WINDOW_HEIGHT,
&window_debug_paint_events, WC_DEBUG_PAINT, WF_STICK_TO_FRONT | WF_TRANSPARENT);
window->widgets = window_debug_paint_widgets;
window->enabled_widgets = (1 << WIDX_TOGGLE_SHOW_WIDE_PATHS) | (1 << WIDX_TOGGLE_SHOW_BLOCKED_TILES)
| (1 << WIDX_TOGGLE_SHOW_BOUND_BOXES) | (1 << WIDX_TOGGLE_SHOW_SEGMENT_HEIGHTS) | (1 << WIDX_TOGGLE_SHOW_DIRTY_VISUALS);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_below(window);
window->colours[0] = TRANSLUCENT(COLOUR_BLACK);
@ -159,5 +159,5 @@ static void window_debug_paint_invalidate(rct_window* w)
static void window_debug_paint_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}

16
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -74,16 +74,16 @@ rct_window* window_ride_demolish_prompt_open(Ride* ride)
{
auto windowPos = w->windowPos;
window_close(w);
w = window_create(windowPos, WW, WH, &window_ride_demolish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
w = WindowCreate(windowPos, WW, WH, &window_ride_demolish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
}
else
{
w = window_create_centred(WW, WH, &window_ride_demolish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
w = WindowCreateCentred(WW, WH, &window_ride_demolish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
}
w->widgets = window_ride_demolish_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_CANCEL) | (1 << WIDX_DEMOLISH);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->number = ride->id;
_demolishRideCost = -ride_get_refund_price(ride);
@ -99,16 +99,16 @@ rct_window* window_ride_refurbish_prompt_open(Ride* ride)
{
auto windowPos = w->windowPos;
window_close(w);
w = window_create(windowPos, WW, WH, &window_ride_refurbish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
w = WindowCreate(windowPos, WW, WH, &window_ride_refurbish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
}
else
{
w = window_create_centred(WW, WH, &window_ride_refurbish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
w = WindowCreateCentred(WW, WH, &window_ride_refurbish_events, WC_DEMOLISH_RIDE_PROMPT, WF_TRANSPARENT);
}
w->widgets = window_ride_refurbish_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_CANCEL) | (1 << WIDX_REFURBISH);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->number = ride->id;
_demolishRideCost = -ride_get_refund_price(ride);
@ -159,7 +159,7 @@ static void window_ride_refurbish_mouseup(rct_window* w, rct_widgetindex widgetI
*/
static void window_ride_demolish_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
auto ride = get_ride(w->number);
if (ride != nullptr)
@ -176,7 +176,7 @@ static void window_ride_demolish_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void window_ride_refurbish_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
auto ride = get_ride(w->number);
if (ride != nullptr)

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

@ -183,7 +183,7 @@ void WindowDropdownShowTextCustomWidth(
window_dropdown_widgets[WIDX_BACKGROUND].bottom = height;
// Create the window
w = window_create(
w = WindowCreate(
boundedScreenPos + ScreenCoordsXY{ 0, extray }, window_dropdown_widgets[WIDX_BACKGROUND].right + 1,
window_dropdown_widgets[WIDX_BACKGROUND].bottom + 1, &window_dropdown_events, WC_DROPDOWN, WF_STICK_TO_FRONT);
w->widgets = window_dropdown_widgets;
@ -263,7 +263,7 @@ void WindowDropdownShowImage(
window_dropdown_widgets[WIDX_BACKGROUND].bottom = height;
// Create the window
w = window_create(
w = WindowCreate(
ScreenCoordsXY(x, y + extray), window_dropdown_widgets[WIDX_BACKGROUND].right + 1,
window_dropdown_widgets[WIDX_BACKGROUND].bottom + 1, &window_dropdown_events, WC_DROPDOWN, WF_STICK_TO_FRONT);
w->widgets = window_dropdown_widgets;
@ -289,7 +289,7 @@ static void window_dropdown_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t cell_x, cell_y, l, t, r, b, item, image, colour;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
int32_t highlightedIndex = gDropdownHighlightedIndex;
for (int32_t i = 0; i < gDropdownNumItems; i++)

6
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -105,7 +105,7 @@ static constexpr const rct_string_id EditorStepNames[] = {
*/
rct_window* window_editor_bottom_toolbar_open()
{
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(0, context_get_height() - 32), context_get_width(), 32, &window_editor_bottom_toolbar_events,
WC_BOTTOM_TOOLBAR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
window->widgets = window_editor_bottom_toolbar_widgets;
@ -113,7 +113,7 @@ rct_window* window_editor_bottom_toolbar_open()
window->enabled_widgets |= (1 << WIDX_PREVIOUS_STEP_BUTTON) | (1 << WIDX_NEXT_STEP_BUTTON) | (1 << WIDX_PREVIOUS_IMAGE)
| (1 << WIDX_NEXT_IMAGE);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
set_all_scenery_items_invented();
return window;
@ -405,7 +405,7 @@ void window_editor_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
}
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER))
{

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

@ -262,12 +262,12 @@ rct_window* window_editor_inventions_list_open()
research_rides_setup();
w = window_create_centred(
w = WindowCreateCentred(
WW, WH, &window_editor_inventions_list_events, WC_EDITOR_INVENTION_LIST, WF_NO_SCROLLING | WF_RESIZABLE);
w->widgets = window_editor_inventions_list_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RESIZE) | (1 << WIDX_TAB_1) | (1 << WIDX_RANDOM_SHUFFLE)
| (1 << WIDX_MOVE_ITEMS_TO_BOTTOM) | (1 << WIDX_MOVE_ITEMS_TO_TOP);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->selected_tab = 0;
w->research_item = nullptr;
_editorInventionsListDraggedItem.SetNull();
@ -314,12 +314,12 @@ static void window_editor_inventions_list_mouseup(rct_window* w, rct_widgetindex
break;
case WIDX_MOVE_ITEMS_TO_TOP:
research_items_make_all_researched();
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
break;
case WIDX_MOVE_ITEMS_TO_BOTTOM:
research_items_make_all_unresearched();
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
break;
}
@ -508,7 +508,7 @@ static void window_editor_inventions_list_paint(rct_window* w, rct_drawpixelinfo
rct_string_id stringId;
int32_t width;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Tab image
auto screenPos = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_TAB_1].left, w->widgets[WIDX_TAB_1].top };
@ -710,7 +710,7 @@ static void window_editor_inventions_list_drag_open(ResearchItem* researchItem)
auto stringWidth = gfx_get_string_width(buffer);
window_editor_inventions_list_drag_widgets[0].right = stringWidth;
auto* w = window_create(
auto* w = WindowCreate(
gTooltipCursor - ScreenCoordsXY{ stringWidth / 2, 7 }, stringWidth, 14, &window_editor_inventions_list_drag_events,
WC_EDITOR_INVENTION_LIST_DRAG, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_SNAPPING);
w->widgets = window_editor_inventions_list_drag_widgets;

2
src/openrct2-ui/windows/EditorMain.cpp
View File

@ -36,7 +36,7 @@ rct_window* window_editor_main_open()
{
window_editor_main_widgets[0].right = context_get_width();
window_editor_main_widgets[0].bottom = context_get_height();
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(0, 0), window_editor_main_widgets[0].right, window_editor_main_widgets[0].bottom,
&window_editor_main_events, WC_MAIN_WINDOW, WF_STICK_TO_BACK);
window->widgets = window_editor_main_widgets;

6
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -373,7 +373,7 @@ rct_window* window_editor_object_selection_open()
sub_6AB211();
reset_selected_object_count_and_size();
window = window_create_centred(
window = WindowCreateCentred(
600, 400, &window_editor_object_selection_events, WC_EDITOR_OBJECT_SELECTION, WF_10 | WF_RESIZABLE);
window->widgets = _window_editor_object_selection_widgets.data();
window->widgets[WIDX_FILTER_TEXT_BOX].string = _filter_string;
@ -389,7 +389,7 @@ rct_window* window_editor_object_selection_open()
{
window->enabled_widgets |= (1LL << i);
}
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->selected_tab = 0;
window->selected_list_item = -1;
@ -943,7 +943,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
int32_t width;
rct_widget* widget;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw tabs
for (size_t i = 0; i < std::size(ObjectSelectionPages); i++)

14
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -222,12 +222,12 @@ rct_window* window_editor_objective_options_open()
if (w != nullptr)
return w;
w = window_create_centred(450, 228, &window_objective_options_main_events, WC_EDITOR_OBJECTIVE_OPTIONS, WF_10);
w = WindowCreateCentred(450, 228, &window_objective_options_main_events, WC_EDITOR_OBJECTIVE_OPTIONS, WF_10);
w->widgets = window_editor_objective_options_main_widgets;
w->enabled_widgets = window_editor_objective_options_page_enabled_widgets[WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN];
w->pressed_widgets = 0;
w->hold_down_widgets = window_editor_objective_options_page_hold_down_widgets[WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->selected_tab = WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN;
w->no_list_items = 0;
w->selected_list_item = -1;
@ -303,7 +303,7 @@ static void window_editor_objective_options_set_page(rct_window* w, int32_t page
window_editor_objective_options_update_disabled_widgets(w);
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}
@ -736,7 +736,7 @@ static void window_editor_objective_options_main_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_editor_objective_options_set_pressed_tab(w);
@ -792,7 +792,7 @@ static void window_editor_objective_options_main_paint(rct_window* w, rct_drawpi
rct_string_id stringId;
uint32_t arg;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_editor_objective_options_draw_tab_images(w, dpi);
// Objective label
@ -1041,7 +1041,7 @@ static void window_editor_objective_options_rides_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_editor_objective_options_set_pressed_tab(w);
@ -1059,7 +1059,7 @@ static void window_editor_objective_options_rides_invalidate(rct_window* w)
*/
static void window_editor_objective_options_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_editor_objective_options_draw_tab_images(w, dpi);
gfx_draw_string_left(

18
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -331,12 +331,12 @@ rct_window* window_editor_scenario_options_open()
if (w != nullptr)
return w;
w = window_create_centred(
w = WindowCreateCentred(
280, 148, window_editor_scenario_options_page_events[0], WC_EDITOR_SCENARIO_OPTIONS, WF_NO_SCROLLING);
w->widgets = window_editor_scenario_options_widgets[0];
w->enabled_widgets = window_editor_scenario_options_page_enabled_widgets[0];
w->hold_down_widgets = window_editor_scenario_options_page_hold_down_widgets[0];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->page = 0;
return w;
@ -411,7 +411,7 @@ static void window_editor_scenario_options_set_page(rct_window* w, int32_t page)
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}
@ -631,7 +631,7 @@ static void window_editor_scenario_options_financial_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_editor_scenario_options_set_pressed_tab(w);
@ -679,7 +679,7 @@ static void window_editor_scenario_options_financial_paint(rct_window* w, rct_dr
{
ScreenCoordsXY screenCoords{};
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_editor_scenario_options_draw_tab_images(w, dpi);
if (w->widgets[WIDX_INITIAL_CASH].type != WWT_EMPTY)
@ -911,7 +911,7 @@ static void window_editor_scenario_options_guests_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_editor_scenario_options_set_pressed_tab(w);
@ -956,7 +956,7 @@ static void window_editor_scenario_options_guests_paint(rct_window* w, rct_drawp
int32_t arg;
ScreenCoordsXY screenCoords{};
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_editor_scenario_options_draw_tab_images(w, dpi);
if (w->widgets[WIDX_CASH_PER_GUEST].type != WWT_EMPTY)
@ -1245,7 +1245,7 @@ static void window_editor_scenario_options_park_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_editor_scenario_options_set_pressed_tab(w);
@ -1317,7 +1317,7 @@ static void window_editor_scenario_options_park_paint(rct_window* w, rct_drawpix
ScreenCoordsXY screenCoords{};
rct_string_id stringId;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_editor_scenario_options_draw_tab_images(w, dpi);
if (w->widgets[WIDX_LAND_COST].type != WWT_EMPTY)

2
src/openrct2-ui/windows/Error.cpp
View File

@ -118,7 +118,7 @@ rct_window* window_error_open(const std::string_view& title, const std::string_v
windowPosition.y = std::min(windowPosition.y - height - 40, maxY);
}
w = window_create(
w = WindowCreate(
windowPosition, width, height, &window_error_events, WC_ERROR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_RESIZABLE);
w->widgets = window_error_widgets;
w->error.var_480 = 0;

30
src/openrct2-ui/windows/Finances.cpp
View File

@ -383,7 +383,7 @@ rct_window* window_finances_open()
w = window_bring_to_front_by_class(WC_FINANCES);
if (w == nullptr)
{
w = window_create_auto_pos(WW_OTHER_TABS, WH_SUMMARY, _windowFinancesPageEvents[0], WC_FINANCES, WF_10);
w = WindowCreateAutoPos(WW_OTHER_TABS, WH_SUMMARY, _windowFinancesPageEvents[0], WC_FINANCES, WF_10);
w->number = 0;
w->frame_no = 0;
@ -403,7 +403,7 @@ rct_window* window_finances_open()
w->pressed_widgets = 0;
w->disabled_widgets = 0;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
// Scroll summary all the way to the right, initially.
window_finances_summary_invertscroll(w);
@ -505,7 +505,7 @@ static void window_finances_summary_invalidate(rct_window* w)
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
// Keep up with new months being added in the first two years.
@ -524,7 +524,7 @@ static void window_finances_summary_invalidate(rct_window* w)
*/
static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, 51 };
@ -697,7 +697,7 @@ static void window_finances_financial_graph_invalidate(rct_window* w)
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
@ -711,7 +711,7 @@ static void window_finances_financial_graph_paint(rct_window* w, rct_drawpixelin
{
int32_t i, x, y, graphLeft, graphTop, graphRight, graphBottom;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
rct_widget* pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND];
@ -807,7 +807,7 @@ static void window_finances_park_value_graph_invalidate(rct_window* w)
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
@ -821,7 +821,7 @@ static void window_finances_park_value_graph_paint(rct_window* w, rct_drawpixeli
{
int32_t i, x, y, graphLeft, graphTop, graphRight, graphBottom;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
rct_widget* pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND];
@ -911,7 +911,7 @@ static void window_finances_profit_graph_invalidate(rct_window* w)
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
@ -925,7 +925,7 @@ static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo*
{
int32_t i, graphLeft, graphTop, graphRight, graphBottom;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
rct_widget* pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND];
@ -1021,7 +1021,7 @@ static void window_finances_marketing_invalidate(rct_window* w)
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
@ -1060,7 +1060,7 @@ static void window_finances_marketing_invalidate(rct_window* w)
*/
static void window_finances_marketing_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, 62 };
@ -1242,7 +1242,7 @@ static void window_finances_research_invalidate(rct_window* w)
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_finances_set_pressed_tab(w);
@ -1294,7 +1294,7 @@ static void window_finances_research_invalidate(rct_window* w)
*/
static void window_finances_research_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_finances_draw_tab_images(dpi, w);
window_research_funding_page_paint(w, dpi, WIDX_RESEARCH_FUNDING);
@ -1340,7 +1340,7 @@ static void window_finances_set_page(rct_window* w, int32_t page)
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
// Scroll summary all the way to the right, initially.

6
src/openrct2-ui/windows/Footpath.cpp
View File

@ -205,14 +205,14 @@ rct_window* window_footpath_open()
return window;
}
window = window_create(ScreenCoordsXY(0, 29), 106, 381, &window_footpath_events, WC_FOOTPATH, 0);
window = WindowCreate(ScreenCoordsXY(0, 29), 106, 381, &window_footpath_events, WC_FOOTPATH, 0);
window->widgets = window_footpath_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_FOOTPATH_TYPE) | (1 << WIDX_QUEUELINE_TYPE)
| (1 << WIDX_DIRECTION_NW) | (1 << WIDX_DIRECTION_NE) | (1 << WIDX_DIRECTION_SW) | (1 << WIDX_DIRECTION_SE)
| (1 << WIDX_SLOPEDOWN) | (1 << WIDX_LEVEL) | (1 << WIDX_SLOPEUP) | (1 << WIDX_CONSTRUCT) | (1 << WIDX_REMOVE)
| (1 << WIDX_CONSTRUCT_ON_LAND) | (1 << WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_right(window);
show_gridlines();
@ -587,7 +587,7 @@ static void window_footpath_invalidate(rct_window* w)
static void window_footpath_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY screenCoords;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
if (!(w->disabled_widgets & (1 << WIDX_CONSTRUCT)))
{

6
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -112,7 +112,7 @@ rct_window* window_game_bottom_toolbar_open()
uint32_t line_height = font_get_line_height(FONT_SPRITE_BASE_MEDIUM);
uint32_t toolbar_height = line_height * 2 + 12;
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(0, screenHeight - toolbar_height), screenWidth, toolbar_height, &window_game_bottom_toolbar_events,
WC_BOTTOM_TOOLBAR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
window->widgets = window_game_bottom_toolbar_widgets;
@ -121,7 +121,7 @@ rct_window* window_game_bottom_toolbar_open()
| (1 << WIDX_RIGHT_OUTSET) | (1 << WIDX_DATE);
window->frame_no = 0;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
// Reset the middle widget to not show by default.
// If it is required to be shown news_update will reshow it.
@ -372,7 +372,7 @@ static void window_game_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* d
w->windowPos.y + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].bottom, PALETTE_51);
}
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_game_bottom_toolbar_draw_left_panel(dpi, w);
window_game_bottom_toolbar_draw_right_panel(dpi, w);

22
src/openrct2-ui/windows/Guest.cpp
View File

@ -386,7 +386,7 @@ rct_window* window_guest_open(Peep* peep)
if (gConfigGeneral.debugging_tools)
windowWidth += TabWidth;
window = window_create_auto_pos(windowWidth, 157, &window_guest_overview_events, WC_PEEP, WF_RESIZABLE);
window = WindowCreateAutoPos(windowWidth, 157, &window_guest_overview_events, WC_PEEP, WF_RESIZABLE);
window->widgets = window_guest_overview_widgets;
window->enabled_widgets = window_guest_page_enabled_widgets[0];
window->number = peep->sprite_index;
@ -417,7 +417,7 @@ rct_window* window_guest_open(Peep* peep)
window->pressed_widgets = 0;
window_guest_disable_widgets(window);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_guest_viewport_init(window);
return window;
@ -449,7 +449,7 @@ static void window_guest_common_invalidate(rct_window* w)
if (window_guest_page_widgets[w->page] != w->widgets)
{
w->widgets = window_guest_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
@ -653,7 +653,7 @@ void window_guest_set_page(rct_window* w, int32_t page)
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
if (listen && w->viewport)
@ -944,7 +944,7 @@ static void window_guest_debug_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*/
void window_guest_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
@ -1295,7 +1295,7 @@ static int32_t NormalizeGuestStatValue(int32_t value, int32_t currMax, int32_t n
*/
void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
@ -1550,7 +1550,7 @@ void window_guest_rides_invalidate(rct_window* w)
*/
void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
@ -1635,7 +1635,7 @@ void window_guest_finance_update(rct_window* w)
*/
void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
@ -1773,7 +1773,7 @@ void window_guest_thoughts_update(rct_window* w)
*/
void window_guest_thoughts_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
@ -1954,7 +1954,7 @@ static std::pair<rct_string_id, Formatter> window_guest_inventory_format_item(Pe
*/
void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);
@ -2012,7 +2012,7 @@ void window_guest_debug_paint(rct_window* w, rct_drawpixelinfo* dpi)
char buffer[512]{};
char buffer2[512]{};
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_guest_overview_tab_paint(w, dpi);
window_guest_stats_tab_paint(w, dpi);
window_guest_rides_tab_paint(w, dpi);

6
src/openrct2-ui/windows/GuestList.cpp
View File

@ -189,13 +189,13 @@ rct_window* window_guest_list_open()
if (window != nullptr)
return window;
window = window_create_auto_pos(350, 330, &window_guest_list_events, WC_GUEST_LIST, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(350, 330, &window_guest_list_events, WC_GUEST_LIST, WF_10 | WF_RESIZABLE);
window->widgets = window_guest_list_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_PAGE_DROPDOWN) | (1 << WIDX_PAGE_DROPDOWN_BUTTON)
| (1 << WIDX_INFO_TYPE_DROPDOWN) | (1 << WIDX_INFO_TYPE_DROPDOWN_BUTTON) | (1 << WIDX_MAP) | (1 << WIDX_TRACKING)
| (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_FILTER_BY_NAME);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
_window_guest_list_highlighted_index = 0xFFFF;
window->list_information_type = 0;
_window_guest_list_selected_tab = PAGE_INDIVIDUAL;
@ -667,7 +667,7 @@ static void window_guest_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
rct_string_id format;
// Widgets
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Tab 1 image
i = (_window_guest_list_selected_tab == 0 ? w->list_information_type & 0x0FFFFFFFC : 0);
i += GetPeepAnimation(PeepSpriteType::Normal).base_image + 1;

6
src/openrct2-ui/windows/InstallTrack.cpp
View File

@ -111,11 +111,11 @@ rct_window* window_install_track_open(const utf8* path)
int32_t x = screenWidth / 2 - 201;
int32_t y = std::max(TOP_TOOLBAR_HEIGHT + 1, screenHeight / 2 - 200);
rct_window* w = window_create(ScreenCoordsXY(x, y), WW, WH, &window_install_track_events, WC_INSTALL_TRACK, 0);
rct_window* w = WindowCreate(ScreenCoordsXY(x, y), WW, WH, &window_install_track_events, WC_INSTALL_TRACK, 0);
w->widgets = window_install_track_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_ROTATE) | (1 << WIDX_TOGGLE_SCENERY) | (1 << WIDX_INSTALL)
| (1 << WIDX_CANCEL);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->track_list.track_list_being_updated = false;
window_push_others_right(w);
@ -193,7 +193,7 @@ static void window_install_track_invalidate(rct_window* w)
*/
static void window_install_track_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Track preview
rct_widget* widget = &window_install_track_widgets[WIDX_TRACK_PREVIEW];

6
src/openrct2-ui/windows/Land.cpp
View File

@ -92,12 +92,12 @@ rct_window* window_land_open()
if (window != nullptr)
return window;
window = window_create(ScreenCoordsXY(context_get_width() - 98, 29), 98, 160, &window_land_events, WC_LAND, 0);
window = WindowCreate(ScreenCoordsXY(context_get_width() - 98, 29), 98, 160, &window_land_events, WC_LAND, 0);
window->widgets = window_land_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_DECREMENT) | (1 << WIDX_INCREMENT) | (1 << WIDX_FLOOR)
| (1 << WIDX_WALL) | (1 << WIDX_MOUNTAINMODE) | (1 << WIDX_PAINTMODE) | (1 << WIDX_PREVIEW);
window->hold_down_widgets = (1 << WIDX_DECREMENT) | (1 << WIDX_INCREMENT);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_below(window);
gLandToolSize = 1;
@ -322,7 +322,7 @@ static void window_land_paint(rct_window* w, rct_drawpixelinfo* dpi)
money32 price;
rct_widget* previewWidget = &window_land_widgets[WIDX_PREVIEW];
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw number for tool sizes bigger than 7
if (gLandToolSize > MAX_TOOL_SIZE_WITH_SPRITE)

6
src/openrct2-ui/windows/LandRights.cpp
View File

@ -92,12 +92,12 @@ rct_window* window_land_rights_open()
if (window != nullptr)
return window;
window = window_create(ScreenCoordsXY(context_get_width() - 98, 29), 98, 94, &window_land_rights_events, WC_LAND_RIGHTS, 0);
window = WindowCreate(ScreenCoordsXY(context_get_width() - 98, 29), 98, 94, &window_land_rights_events, WC_LAND_RIGHTS, 0);
window->widgets = window_land_rights_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_DECREMENT) | (1 << WIDX_INCREMENT) | (1 << WIDX_PREVIEW)
| (1 << WIDX_BUY_LAND_RIGHTS) | (1 << WIDX_BUY_CONSTRUCTION_RIGHTS);
window->hold_down_widgets = (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_below(window);
_landRightsMode = LAND_RIGHTS_MODE_BUY_LAND;
@ -258,7 +258,7 @@ static void window_land_rights_paint(rct_window* w, rct_drawpixelinfo* dpi)
auto screenCoords = ScreenCoordsXY{ w->windowPos.x + window_land_rights_widgets[WIDX_PREVIEW].midX(),
w->windowPos.y + window_land_rights_widgets[WIDX_PREVIEW].midY() };
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw number for tool sizes bigger than 7
if (gLandToolSize > MAX_TOOL_SIZE_WITH_SPRITE)
{

22
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -264,7 +264,7 @@ rct_window* window_loadsave_open(int32_t type, const char* defaultName, loadsave
rct_window* w = window_bring_to_front_by_class(WC_LOADSAVE);
if (w == nullptr)
{
w = window_create_centred(WW, WH, &window_loadsave_events, WC_LOADSAVE, WF_STICK_TO_FRONT | WF_RESIZABLE);
w = WindowCreateCentred(WW, WH, &window_loadsave_events, WC_LOADSAVE, WF_STICK_TO_FRONT | WF_RESIZABLE);
w->widgets = window_loadsave_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_UP) | (1 << WIDX_NEW_FOLDER) | (1 << WIDX_NEW_FILE)
| (1 << WIDX_SORT_NAME) | (1 << WIDX_SORT_DATE) | (1 << WIDX_BROWSE) | (1 << WIDX_DEFAULT);
@ -308,7 +308,7 @@ rct_window* window_loadsave_open(int32_t type, const char* defaultName, loadsave
openrct2_assert(true, "Unsupported load/save type: %d", type & 0x0F);
}
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
window_loadsave_compute_max_date_width();
return w;
@ -438,7 +438,7 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_UP:
safe_strcpy(path, _parentDirectory, sizeof(path));
window_loadsave_populate_list(w, isSave, path, _extension);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
break;
@ -462,7 +462,7 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
// If user cancels file dialog, refresh list
safe_strcpy(path, _directory, sizeof(path));
window_loadsave_populate_list(w, isSave, path, _extension);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
}
break;
@ -498,7 +498,7 @@ static void window_loadsave_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_DEFAULT:
getInitialDirectoryByType(_type, path, sizeof(path));
window_loadsave_populate_list(w, isSave, path, _extension);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
break;
}
@ -530,7 +530,7 @@ static void window_loadsave_scrollmousedown(rct_window* w, int32_t scrollIndex,
safe_strcpy(directory, _listItems[selectedItem].path.c_str(), sizeof(directory));
window_loadsave_populate_list(w, includeNewItem, directory, _extension);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
}
@ -588,7 +588,7 @@ static void window_loadsave_textinput(rct_window* w, rct_widgetindex widgetIndex
w->selected_list_item = -1;
window_loadsave_populate_list(w, (_type & 1) == LOADSAVETYPE_SAVE, path, _extension);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
w->Invalidate();
@ -682,7 +682,7 @@ static void window_loadsave_invalidate(rct_window* w)
static void window_loadsave_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
if (_shortenedDirectory[0] == '\0')
{
@ -1155,12 +1155,12 @@ static rct_window* window_overwrite_prompt_open(const char* name, const char* pa
window_close_by_class(WC_LOADSAVE_OVERWRITE_PROMPT);
w = window_create_centred(
w = WindowCreateCentred(
OVERWRITE_WW, OVERWRITE_WH, &window_overwrite_prompt_events, WC_LOADSAVE_OVERWRITE_PROMPT, WF_STICK_TO_FRONT);
w->widgets = window_overwrite_prompt_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_OVERWRITE_CANCEL) | (1 << WIDX_OVERWRITE_OVERWRITE);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->flags |= WF_TRANSPARENT;
w->colours[0] = TRANSLUCENT(COLOUR_BORDEAUX_RED);
@ -1195,7 +1195,7 @@ static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widge
static void window_overwrite_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
auto ft = Formatter();
ft.Add<rct_string_id>(STR_STRING);

2
src/openrct2-ui/windows/Main.cpp
View File

@ -37,7 +37,7 @@ rct_window* window_main_open()
{
window_main_widgets[0].right = context_get_width();
window_main_widgets[0].bottom = context_get_height();
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(0, 0), window_main_widgets[0].right, window_main_widgets[0].bottom, &window_main_events, WC_MAIN_WINDOW,
WF_STICK_TO_BACK);
window->widgets = window_main_widgets;

6
src/openrct2-ui/windows/Map.cpp
View File

@ -217,7 +217,7 @@ rct_window* window_map_open()
return nullptr;
}
w = window_create_auto_pos(245, 259, &window_map_events, WC_MAP, WF_10);
w = WindowCreateAutoPos(245, 259, &window_map_events, WC_MAP, WF_10);
w->widgets = window_map_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_PEOPLE_TAB) | (1 << WIDX_RIDES_TAB) | (1 << WIDX_MAP_SIZE_SPINNER)
| (1 << WIDX_MAP_SIZE_SPINNER_UP) | (1 << WIDX_MAP_SIZE_SPINNER_DOWN) | (1 << WIDX_LAND_TOOL)
@ -229,7 +229,7 @@ rct_window* window_map_open()
w->hold_down_widgets = (1 << WIDX_MAP_SIZE_SPINNER_UP) | (1 << WIDX_MAP_SIZE_SPINNER_DOWN) | (1 << WIDX_LAND_TOOL_LARGER)
| (1 << WIDX_LAND_TOOL_SMALLER);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->map.rotation = get_current_rotation();
@ -793,7 +793,7 @@ static void window_map_invalidate(rct_window* w)
*/
static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_map_draw_tab_images(w, dpi);
auto screenCoords = w->windowPos

22
src/openrct2-ui/windows/MapGen.cpp
View File

@ -447,7 +447,7 @@ rct_window* window_mapgen_open()
return w;
}
w = window_create_centred(WW, WH, PageEvents[WINDOW_MAPGEN_PAGE_BASE], WC_MAPGEN, WF_10);
w = WindowCreateCentred(WW, WH, PageEvents[WINDOW_MAPGEN_PAGE_BASE], WC_MAPGEN, WF_10);
w->number = 0;
w->frame_no = 0;
@ -459,7 +459,7 @@ rct_window* window_mapgen_open()
w->event_handlers = PageEvents[WINDOW_MAPGEN_PAGE_BASE];
w->pressed_widgets = PressedWidgets[WINDOW_MAPGEN_PAGE_BASE];
w->disabled_widgets = PageDisabledWidgets[WINDOW_MAPGEN_PAGE_BASE];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
_heightmapLoaded = false;
@ -675,7 +675,7 @@ static void window_mapgen_base_invalidate(rct_window* w)
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_BASE])
{
w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_BASE];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->widgets[WIDX_FLOOR_TEXTURE].image = surfaceImage;
@ -688,7 +688,7 @@ static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
uint16_t arg;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
const uint8_t textColour = w->colours[1];
@ -777,7 +777,7 @@ static void window_mapgen_random_invalidate(rct_window* w)
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM])
{
w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets = 0;
@ -791,7 +791,7 @@ static void window_mapgen_random_invalidate(rct_window* w)
static void window_mapgen_random_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
}
@ -979,7 +979,7 @@ static void window_mapgen_simplex_invalidate(rct_window* w)
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_SIMPLEX])
{
w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_SIMPLEX];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->widgets[WIDX_SIMPLEX_FLOOR_TEXTURE].image = surfaceImage;
@ -1007,7 +1007,7 @@ static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
uint16_t arg;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
const uint8_t textColour = w->colours[1];
@ -1194,7 +1194,7 @@ static void window_mapgen_heightmap_invalidate(rct_window* w)
if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP])
{
w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, _heightmapSmoothMap);
@ -1206,7 +1206,7 @@ static void window_mapgen_heightmap_invalidate(rct_window* w)
static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_mapgen_draw_tab_images(dpi, w);
const uint8_t enabledColour = w->colours[1];
@ -1291,7 +1291,7 @@ static void window_mapgen_set_page(rct_window* w, int32_t page)
WidgetSetEnabled(w, WIDX_HEIGHTMAP_WATER_LEVEL_DOWN, true);
}
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}

2
src/openrct2-ui/windows/MapTooltip.cpp
View File

@ -108,7 +108,7 @@ static void window_map_tooltip_open()
w = window_find_by_class(WC_MAP_TOOLTIP);
if (w == nullptr)
{
w = window_create(
w = WindowCreate(
pos, width, height, &window_map_tooltip_events, WC_MAP_TOOLTIP,
WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
w->widgets = window_map_tooltip_widgets;

6
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -120,7 +120,7 @@ static void window_maze_construction_construct(int32_t direction);
*/
rct_window* window_maze_construction_open()
{
rct_window* w = window_create(
rct_window* w = WindowCreate(
ScreenCoordsXY(0, 29), 166, 200, &window_maze_construction_events, WC_RIDE_CONSTRUCTION, WF_NO_AUTO_CLOSE);
w->widgets = window_maze_construction_widgets;
w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_MAZE_BUILD_MODE) | (1ULL << WIDX_MAZE_MOVE_MODE)
@ -128,7 +128,7 @@ rct_window* window_maze_construction_open()
| (1ULL << WIDX_MAZE_DIRECTION_SW) | (1ULL << WIDX_MAZE_DIRECTION_SE) | (1ULL << WIDX_MAZE_ENTRANCE)
| (1ULL << WIDX_MAZE_EXIT);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->number = _currentRideIndex;
@ -444,7 +444,7 @@ static void window_maze_construction_invalidate(rct_window* w)
*/
static void window_maze_construction_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
/**

12
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -231,7 +231,7 @@ rct_window* window_multiplayer_open()
rct_window* window = window_bring_to_front_by_class(WC_MULTIPLAYER);
if (window == nullptr)
{
window = window_create_auto_pos(320, 144, &window_multiplayer_players_events, WC_MULTIPLAYER, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(320, 144, &window_multiplayer_players_events, WC_MULTIPLAYER, WF_10 | WF_RESIZABLE);
window_multiplayer_set_page(window, WINDOW_MULTIPLAYER_PAGE_INFORMATION);
}
@ -256,7 +256,7 @@ static void window_multiplayer_set_page(rct_window* w, int32_t page)
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}
@ -404,7 +404,7 @@ static void window_multiplayer_information_invalidate(rct_window* w)
static void window_multiplayer_information_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
rct_drawpixelinfo clippedDPI;
@ -554,7 +554,7 @@ static void window_multiplayer_players_paint(rct_window* w, rct_drawpixelinfo* d
{
rct_string_id stringId;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
// Number of players
@ -823,7 +823,7 @@ static void window_multiplayer_groups_invalidate(rct_window* w)
static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
rct_widget* widget = &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP];
@ -978,7 +978,7 @@ static void window_multiplayer_options_invalidate(rct_window* w)
static void window_multiplayer_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_multiplayer_draw_tab_images(w, dpi);
}

6
src/openrct2-ui/windows/MusicCredits.cpp
View File

@ -106,12 +106,12 @@ rct_window* window_music_credits_open()
if (window != nullptr)
return window;
window = window_create_centred(510, 314, &window_music_credits_events, WC_MUSIC_CREDITS, 0);
window = WindowCreateCentred(510, 314, &window_music_credits_events, WC_MUSIC_CREDITS, 0);
window->widgets = window_music_credits_widgets;
window->enabled_widgets = 1 << WIDX_CLOSE;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->colours[0] = COLOUR_LIGHT_BLUE;
window->colours[1] = COLOUR_LIGHT_BLUE;
window->colours[2] = COLOUR_LIGHT_BLUE;
@ -149,7 +149,7 @@ static void window_music_credits_scrollgetsize(rct_window* w, int32_t scrollInde
*/
static void window_music_credits_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
/**

6
src/openrct2-ui/windows/Network.cpp
View File

@ -125,7 +125,7 @@ rct_window* window_network_open()
rct_window* window = window_bring_to_front_by_class(WC_NETWORK);
if (window == nullptr)
{
window = window_create_auto_pos(320, 144, &window_network_information_events, WC_NETWORK, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(320, 144, &window_network_information_events, WC_NETWORK, WF_10 | WF_RESIZABLE);
window_network_set_page(window, WINDOW_NETWORK_PAGE_INFORMATION);
// Fill the buffer so it will start scrolling in.
@ -158,7 +158,7 @@ static void window_network_set_page(rct_window* w, int32_t page)
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}
@ -363,7 +363,7 @@ static void window_network_information_paint(rct_window* w, rct_drawpixelinfo* d
{
char textBuffer[200] = {};
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_network_draw_tab_images(w, dpi);
constexpr int32_t padding = 5;

6
src/openrct2-ui/windows/NetworkStatus.cpp
View File

@ -63,11 +63,11 @@ rct_window* window_network_status_open(const char* text, close_callback onClose)
if (window != nullptr)
return window;
window = window_create_centred(420, 90, &window_network_status_events, WC_NETWORK_STATUS, WF_10 | WF_TRANSPARENT);
window = WindowCreateCentred(420, 90, &window_network_status_events, WC_NETWORK_STATUS, WF_10 | WF_TRANSPARENT);
window->widgets = window_network_status_widgets;
window->enabled_widgets = 1 << WIDX_CLOSE;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->no_list_items = 0;
window->selected_list_item = -1;
window->frame_no = 0;
@ -154,7 +154,7 @@ static void window_network_status_invalidate(rct_window* w)
static void window_network_status_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
char buffer[sizeof(window_network_status_text) + 10];
char* lineCh = buffer;

6
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -116,12 +116,12 @@ rct_window* window_new_campaign_open(int16_t campaignType)
window_close(w);
}
w = window_create_auto_pos(WW, WH, &window_new_campaign_events, WC_NEW_CAMPAIGN, 0);
w = WindowCreateAutoPos(WW, WH, &window_new_campaign_events, WC_NEW_CAMPAIGN, 0);
w->widgets = window_new_campaign_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RIDE_DROPDOWN) | (1 << WIDX_RIDE_DROPDOWN_BUTTON)
| (1 << WIDX_WEEKS_INCREASE_BUTTON) | (1 << WIDX_WEEKS_DECREASE_BUTTON) | (1 << WIDX_START_BUTTON);
w->hold_down_widgets = (1 << WIDX_WEEKS_INCREASE_BUTTON) | (1 << WIDX_WEEKS_DECREASE_BUTTON);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
window_new_campaign_widgets[WIDX_TITLE].text = MarketingCampaignNames[campaignType][0];
@ -367,7 +367,7 @@ static void window_new_campaign_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
ScreenCoordsXY screenCoords{};
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Number of weeks
rct_widget* spinnerWidget = &window_new_campaign_widgets[WIDX_WEEKS_SPINNER];

8
src/openrct2-ui/windows/NewRide.cpp
View File

@ -426,13 +426,13 @@ rct_window* window_new_ride_open()
window_close_by_class(WC_TRACK_DESIGN_LIST);
window_close_by_class(WC_TRACK_DESIGN_PLACE);
w = window_create_auto_pos(WW, WH, &window_new_ride_events, WC_CONSTRUCT_RIDE, WF_10);
w = WindowCreateAutoPos(WW, WH, &window_new_ride_events, WC_CONSTRUCT_RIDE, WF_10);
w->widgets = window_new_ride_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | (1 << WIDX_TAB_3) | (1 << WIDX_TAB_4)
| (1 << WIDX_TAB_5) | (1 << WIDX_TAB_6) | (1 << WIDX_TAB_7) | (1 << WIDX_LAST_DEVELOPMENT_BUTTON)
| (1 << WIDX_RESEARCH_FUNDING_BUTTON);
window_new_ride_populate_list();
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->frame_no = 0;
w->new_ride.SelectedRide = { RIDE_TYPE_NULL, RIDE_ENTRY_INDEX_NULL };
@ -586,7 +586,7 @@ static void window_new_ride_refresh_widget_sizing(rct_window* w)
w->Invalidate();
}
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
static void window_new_ride_set_pressed_tab(rct_window* w)
@ -770,7 +770,7 @@ static void window_new_ride_invalidate(rct_window* w)
*/
static void window_new_ride_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_new_ride_draw_tab_images(dpi, w);
if (_windowNewRideCurrentTab != WINDOW_NEW_RIDE_PAGE_RESEARCH)

6
src/openrct2-ui/windows/News.cpp
View File

@ -70,10 +70,10 @@ rct_window* window_news_open()
window = window_bring_to_front_by_class(WC_RECENT_NEWS);
if (window == nullptr)
{
window = window_create_auto_pos(400, 300, &window_news_events, WC_RECENT_NEWS, 0);
window = WindowCreateAutoPos(400, 300, &window_news_events, WC_RECENT_NEWS, 0);
window->widgets = window_news_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_SETTINGS);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->news.var_480 = -1;
}
@ -209,7 +209,7 @@ static void window_news_scrollmousedown(rct_window* w, int32_t scrollIndex, cons
*/
static void window_news_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
/**

6
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -109,10 +109,10 @@ rct_window* window_news_options_open()
window = window_bring_to_front_by_class(WC_NOTIFICATION_OPTIONS);
if (window == nullptr)
{
window = window_create_centred(400, 300, &window_news_options_events, WC_NOTIFICATION_OPTIONS, 0);
window = WindowCreateCentred(400, 300, &window_news_options_events, WC_NOTIFICATION_OPTIONS, 0);
window->widgets = window_news_options_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_TAB_PARK) | (1 << WIDX_TAB_RIDE) | (1 << WIDX_TAB_GUEST);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->colours[0] = COLOUR_GREY;
window->colours[1] = COLOUR_LIGHT_BLUE;
window->colours[2] = COLOUR_LIGHT_BLUE;
@ -232,7 +232,7 @@ static void window_news_options_invalidate(rct_window* w)
static void window_news_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_news_options_draw_tab_images(w, dpi);
}

6
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@ -407,13 +407,13 @@ rct_window* window_object_load_error_open(utf8* path, size_t numMissingObjects,
rct_window* window = window_bring_to_front_by_class(WC_OBJECT_LOAD_ERROR);
if (window == nullptr)
{
window = window_create_centred(WW, WH, &window_object_load_error_events, WC_OBJECT_LOAD_ERROR, 0);
window = WindowCreateCentred(WW, WH, &window_object_load_error_events, WC_OBJECT_LOAD_ERROR, 0);
window->widgets = window_object_load_error_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_COPY_CURRENT) | (1 << WIDX_COPY_ALL)
| (1 << WIDX_DOWNLOAD_ALL);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->colours[0] = COLOUR_LIGHT_BLUE;
window->colours[1] = COLOUR_LIGHT_BLUE;
window->colours[2] = COLOUR_LIGHT_BLUE;
@ -534,7 +534,7 @@ static void window_object_load_error_scrollgetsize(rct_window* w, int32_t scroll
static void window_object_load_error_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw explanatory message
auto ft = Formatter();

22
src/openrct2-ui/windows/Options.cpp
View File

@ -570,7 +570,7 @@ static void window_options_common_invalidate_before(rct_window* w)
if (window_options_page_widgets[w->page] != w->widgets)
{
w->widgets = window_options_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_options_set_pressed_tab(w);
@ -879,7 +879,7 @@ static void window_options_display_invalidate(rct_window* w)
static void window_options_display_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
gfx_draw_string_left(
@ -1086,7 +1086,7 @@ static void window_options_rendering_invalidate(rct_window* w)
static void window_options_rendering_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
}
@ -1314,7 +1314,7 @@ static void window_options_culture_invalidate(rct_window* w)
static void window_options_culture_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
gfx_draw_string_left(
@ -1576,7 +1576,7 @@ static void window_options_audio_invalidate(rct_window* w)
static void window_options_audio_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
}
@ -1723,7 +1723,7 @@ static void window_options_controls_invalidate(rct_window* w)
static void window_options_controls_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
gfx_draw_string_left(
@ -1924,7 +1924,7 @@ static void window_options_misc_invalidate(rct_window* w)
static void window_options_misc_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
gfx_draw_string_left(
@ -2090,7 +2090,7 @@ static void window_options_advanced_invalidate(rct_window* w)
static void window_options_advanced_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_options_draw_tab_images(dpi, w);
gfx_draw_string_left(
@ -2237,12 +2237,12 @@ rct_window* window_options_open()
if (w != nullptr)
return w;
w = window_create_centred(WW, WH, &window_options_events_display, WC_OPTIONS, 0);
w = WindowCreateCentred(WW, WH, &window_options_events_display, WC_OPTIONS, 0);
w->widgets = window_options_display_widgets;
w->enabled_widgets = window_options_page_enabled_widgets[WINDOW_OPTIONS_PAGE_DISPLAY];
w->page = WINDOW_OPTIONS_PAGE_DISPLAY;
w->frame_no = 0;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
return w;
}
@ -2259,7 +2259,7 @@ static void window_options_set_page(rct_window* w, int32_t page)
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}

38
src/openrct2-ui/windows/Park.cpp
View File

@ -410,7 +410,7 @@ static rct_window* window_park_open()
{
rct_window* w;
w = window_create_auto_pos(230, 174 + 9, &window_park_entrance_events, WC_PARK_INFORMATION, WF_10);
w = WindowCreateAutoPos(230, 174 + 9, &window_park_entrance_events, WC_PARK_INFORMATION, WF_10);
w->widgets = window_park_entrance_widgets;
w->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_ENTRANCE];
w->number = 0;
@ -469,7 +469,7 @@ rct_window* window_park_entrance_open()
window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_ENTRANCE];
window->event_handlers = &window_park_entrance_events;
window->pressed_widgets = 0;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_park_init_viewport(window);
return window;
@ -621,7 +621,7 @@ static void window_park_entrance_invalidate(rct_window* w)
int32_t i, height;
w->widgets = window_park_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
window_park_set_pressed_tab(w);
@ -711,7 +711,7 @@ static void window_park_entrance_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* labelWidget;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
// Draw viewport
@ -827,7 +827,7 @@ rct_window* window_park_rating_open()
window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_RATING];
window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_RATING];
window->event_handlers = &window_park_rating_events;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -875,7 +875,7 @@ static void window_park_rating_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
@ -891,7 +891,7 @@ static void window_park_rating_invalidate(rct_window* w)
*/
static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
auto screenPos = w->windowPos;
@ -961,7 +961,7 @@ rct_window* window_park_guests_open()
window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_GUESTS];
window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_GUESTS];
window->event_handlers = &window_park_guests_events;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -1010,7 +1010,7 @@ static void window_park_guests_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
@ -1026,7 +1026,7 @@ static void window_park_guests_invalidate(rct_window* w)
*/
static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
auto screenPos = ScreenCoordsXY{ w->windowPos.x, w->windowPos.y };
@ -1135,7 +1135,7 @@ static void window_park_price_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
@ -1175,7 +1175,7 @@ static void window_park_price_invalidate(rct_window* w)
*/
static void window_park_price_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
auto screenCoords = w->windowPos
@ -1253,7 +1253,7 @@ static void window_park_stats_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
@ -1271,7 +1271,7 @@ static void window_park_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t parkSize, stringIndex;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
auto screenCoords = w->windowPos
@ -1351,7 +1351,7 @@ rct_window* window_park_objective_open()
window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_OBJECTIVE];
window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_OBJECTIVE];
window->event_handlers = &window_park_objective_events;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->windowPos.x = context_get_width() / 2 - 115;
window->windowPos.y = context_get_height() / 2 - 87;
window->Invalidate();
@ -1452,7 +1452,7 @@ static void window_park_objective_invalidate(rct_window* w)
*/
static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
// Scenario description
@ -1542,7 +1542,7 @@ rct_window* window_park_awards_open()
window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_AWARDS];
window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_AWARDS];
window->event_handlers = &window_park_awards_events;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -1590,7 +1590,7 @@ static void window_park_awards_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_park_set_pressed_tab(w);
@ -1606,7 +1606,7 @@ static void window_park_awards_invalidate(rct_window* w)
*/
static void window_park_awards_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_park_draw_tab_images(dpi, w);
auto screenCoords = w->windowPos

14
src/openrct2-ui/windows/Player.cpp
View File

@ -151,7 +151,7 @@ rct_window* window_player_open(uint8_t id)
window = window_bring_to_front_by_number(WC_PLAYER, id);
if (window == nullptr)
{
window = window_create_auto_pos(240, 170, &window_player_overview_events, WC_PLAYER, WF_RESIZABLE);
window = WindowCreateAutoPos(240, 170, &window_player_overview_events, WC_PLAYER, WF_RESIZABLE);
window->number = id;
window->page = 0;
window->viewport_focus_coordinates.y = 0;
@ -178,7 +178,7 @@ rct_window* window_player_open(uint8_t id)
window->event_handlers = window_player_page_events[WINDOW_PLAYER_PAGE_OVERVIEW];
window->pressed_widgets = 0;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_player_set_page(window, WINDOW_PLAYER_PAGE_OVERVIEW);
return window;
@ -315,7 +315,7 @@ void window_player_overview_update(rct_window* w)
void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_player_draw_tab_images(dpi, w);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
@ -384,7 +384,7 @@ void window_player_overview_invalidate(rct_window* w)
if (window_player_page_widgets[w->page] != w->widgets)
{
w->widgets = window_player_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets &= ~(WIDX_TAB_1);
@ -477,7 +477,7 @@ void window_player_statistics_invalidate(rct_window* w)
if (window_player_page_widgets[w->page] != w->widgets)
{
w->widgets = window_player_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets &= ~(WIDX_TAB_1);
@ -499,7 +499,7 @@ void window_player_statistics_invalidate(rct_window* w)
void window_player_statistics_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_player_draw_tab_images(dpi, w);
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
@ -540,7 +540,7 @@ static void window_player_set_page(rct_window* w, int32_t page)
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
if (page == WINDOW_PLAYER_PAGE_OVERVIEW)

14
src/openrct2-ui/windows/Research.cpp
View File

@ -193,7 +193,7 @@ rct_window* window_research_open()
w = window_bring_to_front_by_class(WC_RESEARCH);
if (w == nullptr)
{
w = window_create_auto_pos(WW_FUNDING, WH_FUNDING, window_research_page_events[0], WC_RESEARCH, WF_10);
w = WindowCreateAutoPos(WW_FUNDING, WH_FUNDING, window_research_page_events[0], WC_RESEARCH, WF_10);
w->widgets = window_research_page_widgets[0];
w->enabled_widgets = window_research_page_enabled_widgets[0];
w->number = 0;
@ -215,7 +215,7 @@ rct_window* window_research_open()
w->event_handlers = window_research_page_events[0];
w->pressed_widgets = 0;
w->disabled_widgets = 0;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
return w;
}
@ -264,7 +264,7 @@ static void window_research_development_invalidate(rct_window* w)
if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_DEVELOPMENT])
{
w->widgets = window_research_page_widgets[WINDOW_RESEARCH_PAGE_DEVELOPMENT];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_research_set_pressed_tab(w);
@ -286,7 +286,7 @@ static void window_research_development_invalidate(rct_window* w)
*/
static void window_research_development_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_research_draw_tab_images(dpi, w);
window_research_development_page_paint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
@ -506,7 +506,7 @@ static void window_research_funding_invalidate(rct_window* w)
if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_FUNDING])
{
w->widgets = window_research_page_widgets[WINDOW_RESEARCH_PAGE_FUNDING];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_research_set_pressed_tab(w);
@ -559,7 +559,7 @@ static void window_research_funding_invalidate(rct_window* w)
*/
static void window_research_funding_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_research_draw_tab_images(dpi, w);
window_research_funding_page_paint(w, dpi, WIDX_RESEARCH_FUNDING);
@ -611,7 +611,7 @@ static void window_research_set_page(rct_window* w, int32_t page)
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}

48
src/openrct2-ui/windows/Ride.cpp
View File

@ -1257,7 +1257,7 @@ static rct_window* window_ride_open(Ride* ride)
{
rct_window* w;
w = window_create_auto_pos(316, 207, window_ride_page_events[0], WC_RIDE, WF_10 | WF_RESIZABLE);
w = WindowCreateAutoPos(316, 207, window_ride_page_events[0], WC_RIDE, WF_10 | WF_RESIZABLE);
w->widgets = window_ride_page_widgets[WINDOW_RIDE_PAGE_MAIN];
w->enabled_widgets = window_ride_page_enabled_widgets[WINDOW_RIDE_PAGE_MAIN];
w->hold_down_widgets = window_ride_page_hold_down_widgets[WINDOW_RIDE_PAGE_MAIN];
@ -1356,7 +1356,7 @@ static rct_window* window_ride_open_station(Ride* ride, StationIndex stationInde
w->event_handlers = window_ride_page_events[w->page];
w->pressed_widgets = 0;
window_ride_disable_tabs(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
// View
for (int32_t i = stationIndex; i >= 0; i--)
@ -1488,7 +1488,7 @@ rct_window* window_ride_open_vehicle(Vehicle* vehicle)
w->event_handlers = window_ride_page_events[w->page];
w->pressed_widgets = 0;
window_ride_disable_tabs(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->ride.view = view;
window_ride_init_viewport(w);
@ -1547,7 +1547,7 @@ static void window_ride_set_page(rct_window* w, int32_t page)
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
if (listen != 0 && w->viewport != nullptr)
@ -2349,7 +2349,7 @@ static void window_ride_main_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -2626,7 +2626,7 @@ static void window_ride_main_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
rct_widget* widget;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
// Viewport and ear icon
@ -2850,7 +2850,7 @@ static void window_ride_vehicle_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -2932,7 +2932,7 @@ static void window_ride_vehicle_invalidate(rct_window* w)
*/
static void window_ride_vehicle_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
auto ride = get_ride(w->number);
@ -3417,7 +3417,7 @@ static void window_ride_operating_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -3660,7 +3660,7 @@ static void window_ride_operating_invalidate(rct_window* w)
*/
static void window_ride_operating_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
auto ride = get_ride(w->number);
@ -4013,7 +4013,7 @@ static void window_ride_maintenance_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -4057,7 +4057,7 @@ static void window_ride_maintenance_invalidate(rct_window* w)
*/
static void window_ride_maintenance_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
auto ride = get_ride(w->number);
@ -4559,7 +4559,7 @@ static void window_ride_colour_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -4795,7 +4795,7 @@ static void window_ride_colour_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (ride == nullptr)
return;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
// Track / shop item preview
@ -5086,7 +5086,7 @@ static void window_ride_music_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -5126,7 +5126,7 @@ static void window_ride_music_invalidate(rct_window* w)
*/
static void window_ride_music_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
}
@ -5449,7 +5449,7 @@ static void window_ride_measurements_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -5502,7 +5502,7 @@ static void window_ride_measurements_paint(rct_window* w, rct_drawpixelinfo* dpi
int16_t holes, maxSpeed, averageSpeed, drops, highestDropHeight, inversions, time;
int32_t maxPositiveVerticalGs, maxNegativeVerticalGs, maxLateralGs, totalAirTime, length;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
if (window_ride_measurements_widgets[WIDX_SAVE_DESIGN].type == WWT_BUTTON)
@ -5921,7 +5921,7 @@ static void window_ride_graphs_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -5979,7 +5979,7 @@ static void window_ride_graphs_invalidate(rct_window* w)
*/
static void window_ride_graphs_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
}
@ -6475,7 +6475,7 @@ static void window_ride_income_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -6586,7 +6586,7 @@ static void window_ride_income_paint(rct_window* w, rct_drawpixelinfo* dpi)
money32 profit, costPerHour;
int32_t primaryItem, secondaryItem;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
auto ride = get_ride(w->number);
@ -6760,7 +6760,7 @@ static void window_ride_customer_invalidate(rct_window* w)
if (w->widgets != widgets)
{
w->widgets = widgets;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
window_ride_set_pressed_tab(w);
@ -6799,7 +6799,7 @@ static void window_ride_customer_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t customersPerHour;
rct_string_id stringId;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_draw_tab_images(dpi, w);
auto ride = get_ride(w->number);

6
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -520,7 +520,7 @@ rct_window* window_ride_construction_open()
return context_open_window_view(WV_MAZE_CONSTRUCTION);
}
auto w = window_create(
auto w = WindowCreate(
ScreenCoordsXY(0, 29), 166, 394, &window_ride_construction_events, WC_RIDE_CONSTRUCTION, WF_NO_AUTO_CLOSE);
w->widgets = window_ride_construction_widgets;
@ -534,7 +534,7 @@ rct_window* window_ride_construction_open()
| (1ULL << WIDX_RIGHT_CURVE_LARGE) | (1ULL << WIDX_ROTATE) | (1ULL << WIDX_U_TRACK) | (1ULL << WIDX_O_TRACK)
| (1ULL << WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP) | (1ULL << WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->colours[0] = COLOUR_DARK_BROWN;
w->colours[1] = COLOUR_DARK_BROWN;
@ -2302,7 +2302,7 @@ static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi
rct_widget* widget;
int32_t width, height;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
widget = &window_ride_construction_widgets[WIDX_CONSTRUCT];
if (widget->type == WWT_EMPTY)

6
src/openrct2-ui/windows/RideList.cpp
View File

@ -187,7 +187,7 @@ rct_window* window_ride_list_open()
window = window_bring_to_front_by_class(WC_RIDE_LIST);
if (window == nullptr)
{
window = window_create_auto_pos(340, 240, &window_ride_list_events, WC_RIDE_LIST, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(340, 240, &window_ride_list_events, WC_RIDE_LIST, WF_10 | WF_RESIZABLE);
window->widgets = window_ride_list_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_OPEN_CLOSE_ALL) | (1 << WIDX_CURRENT_INFORMATION_TYPE)
| (1 << WIDX_INFORMATION_TYPE_DROPDOWN) | (1 << WIDX_SORT) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2)
@ -196,7 +196,7 @@ rct_window* window_ride_list_open()
{
window->enabled_widgets |= (1 << WIDX_QUICK_DEMOLISH);
}
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->page = PAGE_RIDES;
window->no_list_items = 0;
window->selected_list_item = -1;
@ -555,7 +555,7 @@ static void window_ride_list_invalidate(rct_window* w)
*/
static void window_ride_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_ride_list_draw_tab_images(dpi, w);
// Draw number of attractions on bottom

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

@ -146,12 +146,11 @@ rct_window* window_save_prompt_open()
log_warning("Invalid save prompt mode %u", prompt_mode);
return nullptr;
}
window = window_create_centred(
width, height, &window_save_prompt_events, WC_SAVE_PROMPT, WF_TRANSPARENT | WF_STICK_TO_FRONT);
window = WindowCreateCentred(width, height, &window_save_prompt_events, WC_SAVE_PROMPT, WF_TRANSPARENT | WF_STICK_TO_FRONT);
window->widgets = widgets;
window->enabled_widgets = enabled_widgets;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
// Pause the game if not network play.
if (network_get_mode() == NETWORK_MODE_NONE)
@ -246,7 +245,7 @@ static void window_save_prompt_mouseup(rct_window* w, rct_widgetindex widgetInde
static void window_save_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
static void window_save_prompt_callback(int32_t result, const utf8* path)

8
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -165,7 +165,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
else
windowWidth = 733;
window = window_create_centred(
window = WindowCreateCentred(
windowWidth, windowHeight, &window_scenarioselect_events, WC_SCENARIO_SELECT,
WF_10 | (titleEditor ? WF_STICK_TO_FRONT : 0));
window->widgets = window_scenarioselect_widgets;
@ -175,7 +175,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
window_scenarioselect_init_tabs(window);
initialise_list_items(window);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->viewport_focus_coordinates.var_480 = -1;
window->highlighted_scenario = nullptr;
@ -266,7 +266,7 @@ static void window_scenarioselect_mousedown(rct_window* w, rct_widgetindex widge
w->Invalidate();
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
}
}
@ -422,7 +422,7 @@ static void window_scenarioselect_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t format;
const scenario_index_entry* scenario;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
format = (ThemeGetFlags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? STR_SMALL_WINDOW_COLOUR_2_STRINGID
: STR_WINDOW_COLOUR_2_STRINGID;

6
src/openrct2-ui/windows/Scenery.cpp
View File

@ -436,7 +436,7 @@ rct_window* window_scenery_open()
window_scenery_init();
window = window_create(
window = WindowCreate(
ScreenCoordsXY(context_get_width() - WINDOW_SCENERY_WIDTH, 0x1D), WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT,
&window_scenery_events, WC_SCENERY, WF_NO_SCROLLING);
window->widgets = window_scenery_widgets;
@ -451,7 +451,7 @@ rct_window* window_scenery_open()
| (1 << WIDX_SCENERY_REPAINT_SCENERY_BUTTON) | (1 << WIDX_SCENERY_TERTIARY_COLOUR_BUTTON)
| (1 << WIDX_SCENERY_EYEDROPPER_BUTTON) | (1ULL << WIDX_SCENERY_BUILD_CLUSTER_BUTTON);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_scenery_update_scroll(window);
show_gridlines();
gWindowSceneryRotation = 3;
@ -1108,7 +1108,7 @@ void window_scenery_invalidate(rct_window* w)
*/
void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
uint16_t tabIndex = gWindowSceneryActiveTabIndex;
uint16_t selectedWidgetId = tabIndex + 4;

6
src/openrct2-ui/windows/SceneryScatter.cpp
View File

@ -80,13 +80,13 @@ rct_window* window_scenery_scatter_open()
if (window != nullptr)
return window;
window = window_create_auto_pos(86, 100, &window_clear_scenery_events, WC_SCENERY_SCATTER, 0);
window = WindowCreateAutoPos(86, 100, &window_clear_scenery_events, WC_SCENERY_SCATTER, 0);
window->widgets = window_scenery_scatter_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT) | (1 << WIDX_PREVIEW)
| (1 << WIDX_DENSITY_LOW) | (1 << WIDX_DENSITY_MEDIUM) | (1 << WIDX_DENSITY_HIGH);
window->hold_down_widgets = (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_below(window);
gWindowSceneryScatterEnabled = true;
@ -209,7 +209,7 @@ static void window_scenery_scatter_invalidate(rct_window* w)
static void window_scenery_scatter_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw area as a number for tool sizes bigger than 7
if (gWindowSceneryScatterSize > MAX_TOOL_SIZE_WITH_SPRITE)

6
src/openrct2-ui/windows/ServerList.cpp
View File

@ -124,14 +124,14 @@ rct_window* window_server_list_open()
if (window != nullptr)
return window;
window = window_create_centred(WWIDTH_MIN, WHEIGHT_MIN, &window_server_list_events, WC_SERVER_LIST, WF_10 | WF_RESIZABLE);
window = WindowCreateCentred(WWIDTH_MIN, WHEIGHT_MIN, &window_server_list_events, WC_SERVER_LIST, WF_10 | WF_RESIZABLE);
window_server_list_widgets[WIDX_PLAYER_NAME_INPUT].string = _playerName;
window->widgets = window_server_list_widgets;
window->enabled_widgets
= ((1 << WIDX_CLOSE) | (1 << WIDX_PLAYER_NAME_INPUT) | (1 << WIDX_FETCH_SERVERS) | (1 << WIDX_ADD_SERVER)
| (1 << WIDX_START_SERVER));
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->no_list_items = 0;
window->selected_list_item = -1;
window->frame_no = 0;
@ -398,7 +398,7 @@ static void window_server_list_invalidate(rct_window* w)
static void window_server_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
gfx_draw_string_left(
dpi, STR_PLAYER_NAME, nullptr, COLOUR_WHITE,

6
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -92,7 +92,7 @@ rct_window* window_server_start_open()
if (window != nullptr)
return window;
window = window_create_centred(WW, WH, &window_server_start_events, WC_SERVER_START, WF_10);
window = WindowCreateCentred(WW, WH, &window_server_start_events, WC_SERVER_START, WF_10);
window_server_start_widgets[WIDX_PORT_INPUT].string = _port;
window_server_start_widgets[WIDX_NAME_INPUT].string = _name;
@ -105,7 +105,7 @@ rct_window* window_server_start_open()
| (1 << WIDX_GREETING_INPUT) | (1 << WIDX_PASSWORD_INPUT) | (1 << WIDX_MAXPLAYERS) | (1 << WIDX_MAXPLAYERS_INCREASE)
| (1 << WIDX_MAXPLAYERS_DECREASE) | (1 << WIDX_ADVERTISE_CHECKBOX) | (1 << WIDX_START_SERVER)
| (1 << WIDX_LOAD_SERVER));
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->no_list_items = 0;
window->selected_list_item = -1;
window->frame_no = 0;
@ -317,7 +317,7 @@ static void window_server_start_invalidate(rct_window* w)
static void window_server_start_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
gfx_draw_string_left(
dpi, STR_PORT, nullptr, w->colours[1], w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_PORT_INPUT].top });

6
src/openrct2-ui/windows/ShortcutKeyChange.cpp
View File

@ -54,11 +54,11 @@ rct_window* window_shortcut_change_open(OpenRCT2::Input::Shortcut shortcut, rct_
gKeyboardShortcutChangeId = shortcut;
CurrentShortcutKeyStringId = key_string_id;
rct_window* w = window_create_centred(WW, WH, &window_shortcut_change_events, WC_CHANGE_KEYBOARD_SHORTCUT, 0);
rct_window* w = WindowCreateCentred(WW, WH, &window_shortcut_change_events, WC_CHANGE_KEYBOARD_SHORTCUT, 0);
w->widgets = window_shortcut_change_widgets;
w->enabled_widgets = (1ULL << WIDX_CLOSE);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
return w;
}
@ -82,7 +82,7 @@ static void window_shortcut_change_mouseup(rct_window* w, rct_widgetindex widget
*/
static void window_shortcut_change_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
ScreenCoordsXY stringCoords(w->windowPos.x + 125, w->windowPos.y + 30);

6
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -203,11 +203,11 @@ rct_window* window_shortcut_keys_open()
rct_window* w = window_bring_to_front_by_class(WC_KEYBOARD_SHORTCUT_LIST);
if (w == nullptr)
{
w = window_create_auto_pos(WW, WH, &window_shortcut_events, WC_KEYBOARD_SHORTCUT_LIST, WF_RESIZABLE);
w = WindowCreateAutoPos(WW, WH, &window_shortcut_events, WC_KEYBOARD_SHORTCUT_LIST, WF_RESIZABLE);
w->widgets = window_shortcut_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RESET);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->no_list_items = static_cast<uint16_t>(std::size(ShortcutList));
w->selected_list_item = -1;
@ -262,7 +262,7 @@ static void window_shortcut_invalidate(rct_window* w)
*/
static void window_shortcut_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
/**

10
src/openrct2-ui/windows/Sign.cpp
View File

@ -106,13 +106,13 @@ rct_window* window_sign_open(rct_windownumber number)
if (w != nullptr)
return w;
w = window_create_auto_pos(WW, WH, &window_sign_events, WC_BANNER, WF_NO_SCROLLING);
w = WindowCreateAutoPos(WW, WH, &window_sign_events, WC_BANNER, WF_NO_SCROLLING);
w->widgets = window_sign_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_SIGN_TEXT) | (1 << WIDX_SIGN_DEMOLISH) | (1 << WIDX_MAIN_COLOUR)
| (1 << WIDX_TEXT_COLOUR);
w->number = number;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
auto banner = GetBanner(w->number);
if (banner == nullptr)
@ -307,7 +307,7 @@ static void window_sign_invalidate(rct_window* w)
*/
static void window_sign_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw viewport
if (w->viewport != nullptr)
@ -352,13 +352,13 @@ rct_window* window_sign_small_open(rct_windownumber number)
if (w != nullptr)
return w;
w = window_create_auto_pos(WW, WH, &window_sign_small_events, WC_BANNER, 0);
w = WindowCreateAutoPos(WW, WH, &window_sign_small_events, WC_BANNER, 0);
w->widgets = window_sign_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_SIGN_TEXT) | (1 << WIDX_SIGN_DEMOLISH) | (1 << WIDX_MAIN_COLOUR)
| (1 << WIDX_TEXT_COLOUR);
w->number = number;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->colours[0] = COLOUR_DARK_BROWN;
w->colours[1] = COLOUR_DARK_BROWN;
w->colours[2] = COLOUR_DARK_BROWN;

18
src/openrct2-ui/windows/Staff.cpp
View File

@ -261,7 +261,7 @@ rct_window* window_staff_open(Peep* peep)
rct_window* w = window_bring_to_front_by_number(WC_PEEP, peep->sprite_index);
if (w == nullptr)
{
w = window_create_auto_pos(WW, WH, &window_staff_overview_events, WC_PEEP, WF_10 | WF_RESIZABLE);
w = WindowCreateAutoPos(WW, WH, &window_staff_overview_events, WC_PEEP, WF_10 | WF_RESIZABLE);
w->number = peep->sprite_index;
w->page = 0;
@ -285,7 +285,7 @@ rct_window* window_staff_open(Peep* peep)
w->event_handlers = window_staff_page_events[0];
w->pressed_widgets = 0;
window_staff_disable_widgets(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
window_staff_viewport_init(w);
if (peep->State == PeepState::Picked)
@ -379,7 +379,7 @@ void window_staff_set_page(rct_window* w, int32_t page)
window_event_resize_call(w);
window_event_invalidate_call(w);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->Invalidate();
if (listen && w->viewport)
@ -740,7 +740,7 @@ void window_staff_stats_invalidate(rct_window* w)
if (window_staff_page_widgets[w->page] != w->widgets)
{
w->widgets = window_staff_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
@ -779,7 +779,7 @@ void window_staff_options_invalidate(rct_window* w)
if (window_staff_page_widgets[w->page] != w->widgets)
{
w->widgets = window_staff_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
@ -861,7 +861,7 @@ void window_staff_overview_invalidate(rct_window* w)
if (window_staff_page_widgets[w->page] != w->widgets)
{
w->widgets = window_staff_page_widgets[w->page];
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
}
w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);
@ -916,7 +916,7 @@ void window_staff_overview_invalidate(rct_window* w)
*/
void window_staff_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_staff_overview_tab_paint(w, dpi);
window_staff_options_tab_paint(w, dpi);
window_staff_stats_tab_paint(w, dpi);
@ -1067,7 +1067,7 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
*/
void window_staff_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_staff_overview_tab_paint(w, dpi);
window_staff_options_tab_paint(w, dpi);
window_staff_stats_tab_paint(w, dpi);
@ -1079,7 +1079,7 @@ void window_staff_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
*/
void window_staff_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_staff_overview_tab_paint(w, dpi);
window_staff_options_tab_paint(w, dpi);
window_staff_stats_tab_paint(w, dpi);

6
src/openrct2-ui/windows/StaffFirePrompt.cpp
View File

@ -60,11 +60,11 @@ rct_window* window_staff_fire_prompt_open(Peep* peep)
return w;
}
w = window_create_centred(WW, WH, &window_staff_fire_events, WC_FIRE_PROMPT, WF_TRANSPARENT);
w = WindowCreateCentred(WW, WH, &window_staff_fire_events, WC_FIRE_PROMPT, WF_TRANSPARENT);
w->widgets = window_staff_fire_widgets;
w->enabled_widgets |= (1 << WIDX_CLOSE) | (1 << WIDX_YES) | (1 << WIDX_CANCEL);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->number = peep->sprite_index;
@ -97,7 +97,7 @@ static void window_staff_fire_mouseup(rct_window* w, rct_widgetindex widgetIndex
*/
static void window_staff_fire_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
Peep* peep = GetEntity<Peep>(w->number);
auto ft = Formatter();

6
src/openrct2-ui/windows/StaffList.cpp
View File

@ -145,14 +145,14 @@ rct_window* window_staff_list_open()
if (window != nullptr)
return window;
window = window_create_auto_pos(WW, WH, &window_staff_list_events, WC_STAFF_LIST, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(WW, WH, &window_staff_list_events, WC_STAFF_LIST, WF_10 | WF_RESIZABLE);
window->widgets = window_staff_list_widgets;
window->enabled_widgets = (1 << WIDX_STAFF_LIST_CLOSE) | (1 << WIDX_STAFF_LIST_HANDYMEN_TAB)
| (1 << WIDX_STAFF_LIST_MECHANICS_TAB) | (1 << WIDX_STAFF_LIST_SECURITY_TAB) | (1 << WIDX_STAFF_LIST_ENTERTAINERS_TAB)
| (1 << WIDX_STAFF_LIST_HIRE_BUTTON) | (1 << WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER)
| (1 << WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) | (1 << WIDX_STAFF_LIST_MAP) | (1 << WIDX_STAFF_LIST_QUICK_FIRE);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
_windowStaffListHighlightedIndex = -1;
window->list_information_type = 0;
@ -557,7 +557,7 @@ void window_staff_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
uint8_t selectedTab;
// Widgets
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
selectedTab = _windowStaffListSelectedTab;

6
src/openrct2-ui/windows/TextInput.cpp
View File

@ -118,7 +118,7 @@ void window_text_input_raw_open(
int32_t height = no_lines * 10 + WH;
// Window will be in the centre of the screen
rct_window* w = window_create_centred(WW, height, &window_text_input_events, WC_TEXTINPUT, WF_STICK_TO_FRONT);
rct_window* w = WindowCreateCentred(WW, height, &window_text_input_events, WC_TEXTINPUT, WF_STICK_TO_FRONT);
w->widgets = window_text_input_widgets;
w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_CANCEL) | (1ULL << WIDX_OKAY);
@ -141,7 +141,7 @@ void window_text_input_raw_open(
gTextInput = context_start_text_input(text_input, maxLength);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
if (call_w == nullptr)
{
@ -228,7 +228,7 @@ static void window_text_input_mouseup(rct_window* w, rct_widgetindex widgetIndex
*/
static void window_text_input_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
ScreenCoordsXY screenCoords;
screenCoords.y = w->windowPos.y + 25;

6
src/openrct2-ui/windows/Themes.cpp
View File

@ -319,7 +319,7 @@ rct_window* window_themes_open()
if (window != nullptr)
return window;
window = window_create_auto_pos(320, 107, &window_themes_events, WC_THEMES, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(320, 107, &window_themes_events, WC_THEMES, WF_10 | WF_RESIZABLE);
window->widgets = window_themes_widgets;
window->enabled_widgets = (1 << WIDX_THEMES_CLOSE) | (1 << WIDX_THEMES_SETTINGS_TAB) | (1 << WIDX_THEMES_MAIN_UI_TAB)
| (1 << WIDX_THEMES_PARK_TAB) | (1 << WIDX_THEMES_TOOLS_TAB) | (1 << WIDX_THEMES_RIDE_PEEPS_TAB)
@ -331,7 +331,7 @@ rct_window* window_themes_open()
window_themes_init_vars();
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->list_information_type = 0;
_colour_index_1 = -1;
_colour_index_2 = -1;
@ -813,7 +813,7 @@ void window_themes_invalidate(rct_window* w)
void window_themes_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
// Widgets
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_themes_draw_tab_images(dpi, w);
if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS)

6
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -506,7 +506,7 @@ rct_window* window_tile_inspector_open()
if (window != nullptr)
return window;
window = window_create(ScreenCoordsXY(0, 29), WW, WH, &TileInspectorWindowEvents, WC_TILE_INSPECTOR, WF_RESIZABLE);
window = WindowCreate(ScreenCoordsXY(0, 29), WW, WH, &TileInspectorWindowEvents, WC_TILE_INSPECTOR, WF_RESIZABLE);
window_tile_inspector_set_page(window, TILE_INSPECTOR_PAGE_DEFAULT);
window->min_width = MIN_WW;
@ -514,7 +514,7 @@ rct_window* window_tile_inspector_open()
window->max_width = MAX_WW;
window->max_height = MAX_WH;
windowTileInspectorSelectedIndex = -1;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
windowTileInspectorTileSelected = false;
@ -1699,7 +1699,7 @@ static void window_tile_inspector_invalidate(rct_window* w)
static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Set medium font size
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;

6
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -212,7 +212,7 @@ void window_title_command_editor_open(TitleSequence* sequence, int32_t index, bo
if (window_find_by_class(WC_TITLE_COMMAND_EDITOR) != nullptr)
return;
rct_window* window = window_create_centred(
rct_window* window = WindowCreateCentred(
WW, WH, &window_title_command_editor_events, WC_TITLE_COMMAND_EDITOR, WF_STICK_TO_FRONT);
window_title_command_editor_widgets[WIDX_TEXTBOX_FULL].string = textbox1Buffer;
window_title_command_editor_widgets[WIDX_TEXTBOX_X].string = textbox1Buffer;
@ -221,7 +221,7 @@ void window_title_command_editor_open(TitleSequence* sequence, int32_t index, bo
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_COMMAND) | (1 << WIDX_COMMAND_DROPDOWN) | (1 << WIDX_TEXTBOX_FULL)
| (1 << WIDX_TEXTBOX_X) | (1 << WIDX_TEXTBOX_Y) | (1 << WIDX_INPUT) | (1 << WIDX_INPUT_DROPDOWN) | (1 << WIDX_GET)
| (1 << WIDX_SELECT_SCENARIO) | (1 << WIDX_SELECT_SPRITE) | (1 << WIDX_OKAY) | (1 << WIDX_CANCEL);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
rct_widget* const viewportWidget = &window_title_command_editor_widgets[WIDX_VIEWPORT];
viewport_create(
@ -703,7 +703,7 @@ static void window_title_command_editor_invalidate(rct_window* w)
static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
TITLE_COMMAND_ORDER command_info = get_command_info(command.Type);

6
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -209,7 +209,7 @@ void window_title_editor_open(int32_t tab)
if (_selectedTitleSequence == SIZE_MAX)
_selectedTitleSequence = title_get_config_sequence();
window = window_create_auto_pos(WW, WH2, &window_title_editor_events, WC_TITLE_EDITOR, WF_10 | WF_RESIZABLE);
window = WindowCreateAutoPos(WW, WH2, &window_title_editor_events, WC_TITLE_EDITOR, WF_10 | WF_RESIZABLE);
window->widgets = window_title_editor_widgets;
window->enabled_widgets = (1 << WIDX_TITLE_EDITOR_CLOSE) | (1 << WIDX_TITLE_EDITOR_PRESETS_TAB)
| (1 << WIDX_TITLE_EDITOR_SAVES_TAB) | (1 << WIDX_TITLE_EDITOR_SCRIPT_TAB) |
@ -228,7 +228,7 @@ void window_title_editor_open(int32_t tab)
(1 << WIDX_TITLE_EDITOR_PLAY) | (1 << WIDX_TITLE_EDITOR_STOP) | (1 << WIDX_TITLE_EDITOR_REPLAY)
| (1 << WIDX_TITLE_EDITOR_SKIP);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->list_information_type = 0;
window->selected_tab = tab;
@ -796,7 +796,7 @@ static void window_title_editor_invalidate(rct_window* w)
static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
// Widgets
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
window_title_editor_draw_tab_images(dpi, w);
// Draw strings

6
src/openrct2-ui/windows/TitleExit.cpp
View File

@ -43,12 +43,12 @@ rct_window* window_title_exit_open()
{
rct_window* window;
window = window_create(
window = WindowCreate(
ScreenCoordsXY(context_get_width() - 40, context_get_height() - 64), 40, 64, &window_title_exit_events, WC_TITLE_EXIT,
WF_STICK_TO_BACK | WF_TRANSPARENT);
window->widgets = window_title_exit_widgets;
window->enabled_widgets |= (1ULL << WIDX_EXIT);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -77,5 +77,5 @@ static void window_title_exit_mouseup(rct_window* w, rct_widgetindex widgetIndex
*/
static void window_title_exit_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}

4
src/openrct2-ui/windows/TitleLogo.cpp
View File

@ -44,10 +44,10 @@ static rct_window_event_list window_title_logo_events([](auto& events)
*/
rct_window* window_title_logo_open()
{
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(0, 0), WW, WH, &window_title_logo_events, WC_TITLE_LOGO, WF_STICK_TO_BACK | WF_TRANSPARENT);
window->widgets = window_title_logo_widgets;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window->colours[0] = TRANSLUCENT(COLOUR_GREY);
window->colours[1] = TRANSLUCENT(COLOUR_GREY);
window->colours[2] = TRANSLUCENT(COLOUR_GREY);

6
src/openrct2-ui/windows/TitleMenu.cpp
View File

@ -71,7 +71,7 @@ rct_window* window_title_menu_open()
rct_window* window;
const uint16_t windowHeight = MenuButtonDims.height + UpdateButtonDims.height;
window = window_create(
window = WindowCreate(
ScreenCoordsXY(0, context_get_height() - 182), 0, windowHeight, &window_title_menu_events, WC_TITLE_MENU,
WF_STICK_TO_BACK | WF_TRANSPARENT | WF_NO_BACKGROUND);
@ -105,7 +105,7 @@ rct_window* window_title_menu_open()
window->windowPos.x = (context_get_width() - window->width) / 2;
window->colours[1] = TRANSLUCENT(COLOUR_LIGHT_ORANGE);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -234,5 +234,5 @@ static void window_title_menu_invalidate(rct_window* w)
static void window_title_menu_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
gfx_filter_rect(dpi, _filterRect, PALETTE_51);
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}

6
src/openrct2-ui/windows/TitleOptions.cpp
View File

@ -39,12 +39,12 @@ static rct_window_event_list window_title_options_events([](auto& events)
*/
rct_window* window_title_options_open()
{
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(context_get_width() - 80, 0), 80, 15, &window_title_options_events, WC_TITLE_OPTIONS,
WF_STICK_TO_BACK | WF_TRANSPARENT);
window->widgets = window_title_options_widgets;
window->enabled_widgets |= (1ULL << WIDX_OPTIONS);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -64,5 +64,5 @@ static void window_title_options_mouseup(rct_window* w, rct_widgetindex widgetIn
static void window_title_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}

2
src/openrct2-ui/windows/Tooltip.cpp
View File

@ -91,7 +91,7 @@ void window_tooltip_show(const OpenRCT2String& message, ScreenCoordsXY screenCoo
screenCoords.y -= height + 40;
screenCoords.y = std::clamp(screenCoords.y, 22, max_y);
w = window_create(screenCoords, width, height, &window_tooltip_events, WC_TOOLTIP, WF_TRANSPARENT | WF_STICK_TO_FRONT);
w = WindowCreate(screenCoords, width, height, &window_tooltip_events, WC_TOOLTIP, WF_TRANSPARENT | WF_STICK_TO_FRONT);
w->widgets = window_tooltip_widgets;
reset_tooltip_not_shown();

6
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -325,12 +325,12 @@ static colour_t _tertiaryColour;
*/
rct_window* window_top_toolbar_open()
{
rct_window* window = window_create(
rct_window* window = WindowCreate(
ScreenCoordsXY(0, 0), context_get_width(), TOP_TOOLBAR_HEIGHT + 1, &window_top_toolbar_events, WC_TOP_TOOLBAR,
WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
window->widgets = window_top_toolbar_widgets;
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
return window;
}
@ -838,7 +838,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
int32_t imgId;
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
ScreenCoordsXY screenPos{};
// Draw staff button image (setting masks to the staff colours)

12
src/openrct2-ui/windows/TrackDesignManage.cpp
View File

@ -92,11 +92,11 @@ rct_window* window_track_manage_open(track_design_file_ref* tdFileRef)
{
window_close_by_class(WC_MANAGE_TRACK_DESIGN);
rct_window* w = window_create_centred(
rct_window* w = WindowCreateCentred(
250, 44, &window_track_manage_events, WC_MANAGE_TRACK_DESIGN, WF_STICK_TO_FRONT | WF_TRANSPARENT);
w->widgets = window_track_manage_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RENAME) | (1 << WIDX_DELETE);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
rct_window* trackDesignListWindow = window_find_by_class(WC_TRACK_DESIGN_LIST);
if (trackDesignListWindow != nullptr)
@ -186,7 +186,7 @@ static void window_track_manage_textinput(rct_window* w, rct_widgetindex widgetI
static void window_track_manage_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
Formatter::Common().Add<char*>(_trackDesignFileReference->name);
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
}
/**
@ -199,12 +199,12 @@ static void window_track_delete_prompt_open()
int32_t screenWidth = context_get_width();
int32_t screenHeight = context_get_height();
rct_window* w = window_create(
rct_window* w = WindowCreate(
ScreenCoordsXY(std::max(TOP_TOOLBAR_HEIGHT + 1, (screenWidth - 250) / 2), (screenHeight - 44) / 2), 250, 74,
&window_track_delete_prompt_events, WC_TRACK_DELETE_PROMPT, WF_STICK_TO_FRONT);
w->widgets = window_track_delete_prompt_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RENAME) | (1 << WIDX_DELETE);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->flags |= WF_TRANSPARENT;
}
@ -241,7 +241,7 @@ static void window_track_delete_prompt_mouseup(rct_window* w, rct_widgetindex wi
*/
static void window_track_delete_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
gfx_draw_string_centred_wrapped(
dpi, &_trackDesignFileReference->name, { w->windowPos.x + 125, w->windowPos.y + 28 }, 246,

6
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -142,10 +142,10 @@ rct_window* window_track_place_open(const track_design_file_ref* tdFileRef)
_window_track_place_mini_preview.resize(TRACK_MINI_PREVIEW_SIZE);
rct_window* w = window_create(ScreenCoordsXY(0, 29), 200, 124, &window_track_place_events, WC_TRACK_DESIGN_PLACE, 0);
rct_window* w = WindowCreate(ScreenCoordsXY(0, 29), 200, 124, &window_track_place_events, WC_TRACK_DESIGN_PLACE, 0);
w->widgets = window_track_place_widgets;
w->enabled_widgets = 1 << WIDX_CLOSE | 1 << WIDX_ROTATE | 1 << WIDX_MIRROR | 1 << WIDX_SELECT_DIFFERENT_DESIGN;
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
tool_set(w, WIDX_PRICE, TOOL_CROSSHAIR);
input_set_flag(INPUT_FLAG_6, true);
window_push_others_right(w);
@ -479,7 +479,7 @@ static void window_track_place_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
auto ft = Formatter::Common();
ft.Add<char*>(_trackDesign->name.c_str());
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw mini tile preview
rct_drawpixelinfo clippedDpi;

6
src/openrct2-ui/windows/TrackList.cpp
View File

@ -120,14 +120,14 @@ rct_window* window_track_list_open(RideSelection item)
screenPos = { 0, TOP_TOOLBAR_HEIGHT + 2 };
}
rct_window* w = window_create(screenPos, 600, 432, &window_track_list_events, WC_TRACK_DESIGN_LIST, 0);
rct_window* w = WindowCreate(screenPos, 600, 432, &window_track_list_events, WC_TRACK_DESIGN_LIST, 0);
window_track_list_widgets[WIDX_FILTER_STRING].string = _filterString;
w->widgets = window_track_list_widgets;
w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BACK) | (1ULL << WIDX_FILTER_STRING) | (1ULL << WIDX_FILTER_CLEAR)
| (1ULL << WIDX_ROTATE) | (1ULL << WIDX_TOGGLE_SCENERY);
window_init_scroll_widgets(w);
WindowInitScrollWidgets(w);
w->track_list.track_list_being_updated = false;
w->track_list.reload_track_designs = false;
@ -478,7 +478,7 @@ static void window_track_list_invalidate(rct_window* w)
*/
static void window_track_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
int32_t listItemIndex = w->selected_list_item;
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)

6
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -130,14 +130,14 @@ rct_window* window_view_clipping_open()
}
// Window is not open - create it.
window = window_create(ScreenCoordsXY(32, 32), WW, WH, &window_view_clipping_events, WC_VIEW_CLIPPING, 0);
window = WindowCreate(ScreenCoordsXY(32, 32), WW, WH, &window_view_clipping_events, WC_VIEW_CLIPPING, 0);
window->widgets = window_view_clipping_widgets;
window->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_CLIP_CHECKBOX_ENABLE) | (1ULL << WIDX_CLIP_HEIGHT_VALUE)
| (1ULL << WIDX_CLIP_HEIGHT_INCREASE) | (1ULL << WIDX_CLIP_HEIGHT_DECREASE) | (1ULL << WIDX_CLIP_HEIGHT_SLIDER)
| (1ULL << WIDX_CLIP_SELECTOR) | (1ULL << WIDX_CLIP_CLEAR);
window->hold_down_widgets = (1ULL << WIDX_CLIP_HEIGHT_INCREASE) | (1UL << WIDX_CLIP_HEIGHT_DECREASE);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
// Initialise the clip height slider from the current clip height value.
window_view_clipping_set_clipheight(window, gClipHeight);
@ -377,7 +377,7 @@ static void window_view_clipping_invalidate(rct_window* w)
static void window_view_clipping_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Clip height value
auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, w->widgets[WIDX_CLIP_HEIGHT_VALUE].top };

4
src/openrct2-ui/windows/Viewport.cpp
View File

@ -64,7 +64,7 @@ static int32_t _viewportNumber = 1;
*/
rct_window* window_viewport_open()
{
rct_window* w = window_create_auto_pos(WW, WH, &window_viewport_events, WC_VIEWPORT, WF_RESIZABLE);
rct_window* w = WindowCreateAutoPos(WW, WH, &window_viewport_events, WC_VIEWPORT, WF_RESIZABLE);
w->widgets = window_viewport_widgets;
w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_ZOOM_IN) | (1 << WIDX_ZOOM_OUT) | (1 << WIDX_LOCATE);
w->number = _viewportNumber++;
@ -193,7 +193,7 @@ static void window_viewport_invalidate(rct_window* w)
static void window_viewport_paint(rct_window* w, rct_drawpixelinfo* dpi)
{
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw viewport
if (w->viewport != nullptr)

6
src/openrct2-ui/windows/Water.cpp
View File

@ -72,11 +72,11 @@ rct_window* window_water_open()
if (window != nullptr)
return window;
window = window_create(ScreenCoordsXY(context_get_width() - 76, 29), 76, 77, &window_water_events, WC_WATER, 0);
window = WindowCreate(ScreenCoordsXY(context_get_width() - 76, 29), 76, 77, &window_water_events, WC_WATER, 0);
window->widgets = window_water_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_DECREMENT) | (1 << WIDX_INCREMENT) | (1 << WIDX_PREVIEW);
window->hold_down_widgets = (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT);
window_init_scroll_widgets(window);
WindowInitScrollWidgets(window);
window_push_others_below(window);
gLandToolSize = 1;
@ -194,7 +194,7 @@ static void window_water_paint(rct_window* w, rct_drawpixelinfo* dpi)
auto screenCoords = ScreenCoordsXY{ w->windowPos.x + window_water_widgets[WIDX_PREVIEW].midX(),
w->windowPos.y + window_water_widgets[WIDX_PREVIEW].midY() };
window_draw_widgets(w, dpi);
WindowDrawWidgets(w, dpi);
// Draw number for tool sizes bigger than 7
if (gLandToolSize > MAX_TOOL_SIZE_WITH_SPRITE)
{

12
src/openrct2/interface/Window.h
View File

@ -707,12 +707,12 @@ void window_update_all();
void window_set_window_limit(int32_t value);
rct_window* window_create(
rct_window* WindowCreate(
const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, rct_window_event_list* event_handlers,
rct_windowclass cls, uint16_t flags);
rct_window* window_create_auto_pos(
rct_window* WindowCreateAutoPos(
int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls, uint16_t flags);
rct_window* window_create_centred(
rct_window* WindowCreateCentred(
int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls, uint16_t flags);
void window_close(rct_window* window);
void window_close_by_class(rct_windowclass cls);
@ -731,7 +731,7 @@ void window_invalidate_all();
void widget_invalidate(rct_window* w, rct_widgetindex widgetIndex);
void widget_invalidate_by_class(rct_windowclass cls, rct_widgetindex widgetIndex);
void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, rct_widgetindex widgetIndex);
void window_init_scroll_widgets(rct_window* w);
void WindowInitScrollWidgets(rct_window* w);
void window_update_scroll_widgets(rct_window* w);
int32_t window_get_scroll_data_index(rct_window* w, rct_widgetindex widget_index);
@ -760,7 +760,7 @@ void window_show_textinput(rct_window* w, rct_widgetindex widgetIndex, uint16_t
void window_draw_all(rct_drawpixelinfo* dpi, int16_t left, int16_t top, int16_t right, int16_t bottom);
void window_draw(rct_drawpixelinfo* dpi, rct_window* w, int32_t left, int32_t top, int32_t right, int32_t bottom);
void window_draw_widgets(rct_window* w, rct_drawpixelinfo* dpi);
void WindowDrawWidgets(rct_window* w, rct_drawpixelinfo* dpi);
void window_draw_viewport(rct_drawpixelinfo* dpi, rct_window* w);
void window_set_position(rct_window* w, const ScreenCoordsXY& screenCoords);
@ -821,7 +821,7 @@ void window_event_invalidate_call(rct_window* w);
void window_event_paint_call(rct_window* w, rct_drawpixelinfo* dpi);
void window_event_scroll_paint_call(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex);
void invalidate_all_windows_after_input();
void InvalidateAllWindowsAfterInput();
void textinput_cancel();
void window_move_and_snap(rct_window* w, ScreenCoordsXY newWindowCoords, int32_t snapProximity);