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

Fix WW and WH for some windows

Browse Source
This commit is contained in:
Gymnasiast
2020-05-09 18:02:16 +02:00
parent 6fd83fd006
commit b942d24bcf
8 changed files with 82 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,8 @@ enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
};
static constexpr const rct_string_id WINDOW_TITLE = STR_CLEAR_SCENERY;
static constexpr const int32_t WW = 102;
static constexpr const int32_t WH = 93;
static constexpr const int32_t WW = 98;
static constexpr const int32_t WH = 94;
static rct_widget window_clear_scenery_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
@@ -99,7 +99,7 @@ rct_window* window_clear_scenery_open()
return window;
window = window_create(
ScreenCoordsXY(context_get_width() - 102, 29), 98, 94, &window_clear_scenery_events, WC_CLEAR_SCENERY, 0);
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);

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

@@ -27,9 +27,12 @@
#include <openrct2/sprites.h>
#include <openrct2/world/Park.h>
static constexpr const rct_string_id WINDOW_TITLE = 0;
static constexpr const int32_t WH = 0;
static constexpr const int32_t WW = 0;
static constexpr const rct_string_id WINDOW_TITLE = STR_NONE;
static constexpr const int32_t WH_SUMMARY = 309;
static constexpr const int32_t WH_RESEARCH = 207;
static constexpr const int32_t WH_OTHER_TABS = 257;
static constexpr const int32_t WW_RESEARCH = 320;
static constexpr const int32_t WW_OTHER_TABS = 530;
// clang-format off
enum
@@ -93,8 +96,8 @@ enum
static rct_widget _windowFinancesSummaryWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 529, 43, 309, 0xFFFFFFFF, STR_NONE },
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_SUMMARY),
{ WWT_RESIZE, 1, 0, 529, 43, WH_SUMMARY - 1, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WWT_SCROLL, 1, 130, 520, 50, 260, SCROLL_HORIZONTAL, STR_NONE },
SPINNER_WIDGETS (1, 64, 160, 279, 292, STR_FINANCES_SUMMARY_LOAN_VALUE, STR_NONE), // NB: 3 widgets.
@@ -103,32 +106,32 @@ static rct_widget _windowFinancesSummaryWidgets[] =
static rct_widget _windowFinancesCashWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WIDGETS_END },
};
static rct_widget _windowFinancesParkValueWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WIDGETS_END },
};
static rct_widget _windowFinancesProfitWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WIDGETS_END },
};
static rct_widget _windowFinancesMarketingWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WWT_GROUPBOX, 2, 3, 526, 47, 91, STR_MARKETING_CAMPAIGNS_IN_OPERATION, STR_NONE },
{ WWT_GROUPBOX, 2, 3, 526, 47, 252, STR_MARKETING_CAMPAIGNS_AVAILABLE, STR_NONE },
@@ -143,7 +146,7 @@ static rct_widget _windowFinancesMarketingWidgets[] =
static rct_widget _windowFinancesResearchWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
WINDOW_SHIM(WINDOW_TITLE, WW_RESEARCH, WH_RESEARCH),
{ WWT_RESIZE, 1, 0, 319, 43, 206, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE },
@@ -520,7 +523,7 @@ rct_window* window_finances_open()
w = window_bring_to_front_by_class(WC_FINANCES);
if (w == nullptr)
{
w = window_create_auto_pos(530, 310, _windowFinancesPageEvents[0], WC_FINANCES, WF_10);
w = window_create_auto_pos(WW_OTHER_TABS, WH_SUMMARY, _windowFinancesPageEvents[0], WC_FINANCES, WF_10);
w->number = 0;
w->frame_no = 0;
@@ -529,8 +532,8 @@ rct_window* window_finances_open()
w->page = WINDOW_FINANCES_PAGE_SUMMARY;
w->Invalidate();
w->width = 530;
w->height = 310;
w->width = WW_OTHER_TABS;
w->height = WH_SUMMARY;
w->Invalidate();
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY];
@@ -1241,7 +1244,7 @@ static void window_finances_marketing_paint(rct_window* w, rct_drawpixelinfo* dp
// Draw button text
money32 pricePerWeek = AdvertisingCampaignPricePerWeek[i];
gfx_draw_string_left(dpi, MarketingCampaignNames[i][0], nullptr, COLOUR_BLACK, x + 4, y);
gfx_draw_string_left(dpi, STR_MARKETING_PER_WEEK, &pricePerWeek, COLOUR_BLACK, x + 310, y);
gfx_draw_string_left(dpi, STR_MARKETING_PER_WEEK, &pricePerWeek, COLOUR_BLACK, x + WH_SUMMARY, y);
y += BUTTON_FACE_HEIGHT + 2;
}
@@ -1437,18 +1440,18 @@ static void window_finances_set_page(rct_window* w, int32_t page)
w->Invalidate();
if (w->page == WINDOW_FINANCES_PAGE_RESEARCH)
{
w->width = 320;
w->height = 207;
w->width = WW_RESEARCH;
w->height = WH_RESEARCH;
}
else if (w->page == WINDOW_FINANCES_PAGE_SUMMARY)
{
w->width = 530;
w->height = 310;
w->width = WW_OTHER_TABS;
w->height = WH_SUMMARY;
}
else
{
w->width = 530;
w->height = 257;
w->width = WW_OTHER_TABS;
w->height = WH_OTHER_TABS;
}
window_event_resize_call(w);
window_event_invalidate_call(w);

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

@@ -1143,16 +1143,8 @@ enum
WIDX_OVERWRITE_CANCEL
};
// close button on right of window
#define OVERWRITE_WINDOW_SHIM \
{ \
WWT_CLOSEBOX, 0, OVERWRITE_WW - 13, OVERWRITE_WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP \
}
static rct_widget window_overwrite_prompt_widgets[] = {
{ WWT_FRAME, 0, 0, OVERWRITE_WW - 1, 0, OVERWRITE_WH - 1, STR_NONE, STR_NONE },
{ WWT_CAPTION, 0, 1, OVERWRITE_WW - 2, 1, 14, STR_FILEBROWSER_OVERWRITE_TITLE, STR_WINDOW_TITLE_TIP },
OVERWRITE_WINDOW_SHIM,
WINDOW_SHIM_WHITE(STR_FILEBROWSER_OVERWRITE_TITLE, OVERWRITE_WW, OVERWRITE_WH),
{ WWT_BUTTON, 0, 10, 94, OVERWRITE_WH - 20, OVERWRITE_WH - 9, STR_FILEBROWSER_OVERWRITE_TITLE, STR_NONE },
{ WWT_BUTTON, 0, OVERWRITE_WW - 95, OVERWRITE_WW - 11, OVERWRITE_WH - 20, OVERWRITE_WH - 9, STR_SAVE_PROMPT_CANCEL,
STR_NONE },

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

@@ -20,7 +20,7 @@
#include <openrct2/ride/RideData.h>
#include <openrct2/ride/ShopItem.h>
static constexpr const rct_string_id WINDOW_TITLE = 0;
static constexpr const rct_string_id WINDOW_TITLE = STR_NONE;
static constexpr const int32_t WH = 107;
static constexpr const int32_t WW = 350;
constexpr uint16_t SELECTED_RIDE_UNDEFINED = 0xFFFF;

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

@@ -20,9 +20,11 @@
#include <openrct2/world/Park.h>
#include <openrct2/world/Scenery.h>
static constexpr const rct_string_id WINDOW_TITLE = 0;
static constexpr const int32_t WH = 0;
static constexpr const int32_t WW = 0;
static constexpr const rct_string_id WINDOW_TITLE = STR_NONE;
static constexpr const int32_t WH_DEVELOPMENT = 196;
static constexpr const int32_t WW_DEVELOPMENT = 300;
static constexpr const int32_t WH_FUNDING = 207;
static constexpr const int32_t WW_FUNDING = 320;
// clang-format off
enum {
@@ -59,32 +61,32 @@ enum {
#pragma region Widgets
static rct_widget window_research_development_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 299, 43, 195, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP },
{ WWT_GROUPBOX, 2, 3, 292, 47, 116, STR_CURRENTLY_IN_DEVELOPMENT, STR_NONE },
{ WWT_GROUPBOX, 2, 3, 292, 124, 188, STR_LAST_DEVELOPMENT, STR_NONE },
{ WWT_FLATBTN, 2, 265, 288, 161, 184, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP },
WINDOW_SHIM(WINDOW_TITLE, WW_DEVELOPMENT, WH_DEVELOPMENT),
{ WWT_RESIZE, 1, 0, 299, 43, WH_DEVELOPMENT - 1, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP },
{ WWT_GROUPBOX, 2, 3, 292, 47, 116, STR_CURRENTLY_IN_DEVELOPMENT, STR_NONE },
{ WWT_GROUPBOX, 2, 3, 292, 124, 188, STR_LAST_DEVELOPMENT, STR_NONE },
{ WWT_FLATBTN, 2, 265, 288, 161, 184, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP },
{ WIDGETS_END },
};
static rct_widget window_research_funding_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 319, 43, 206, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP },
{ WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE },
{ WWT_DROPDOWN, 2, 8, 167, 59, 72, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_BUTTON, 2, 156, 166, 60, 71, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_GROUPBOX, 2, 3, 316, 96, 202, STR_RESEARCH_PRIORITIES, STR_NONE },
{ WWT_CHECKBOX, 2, 8, 311, 108, 119, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 121, 132, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 134, 145, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 147, 158, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 160, 171, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 173, 184, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 186, 197, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP },
WINDOW_SHIM(WINDOW_TITLE, WW_FUNDING, WH_FUNDING),
{ WWT_RESIZE, 1, 0, 319, 43, WH_FUNDING - 1, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP },
{ WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE },
{ WWT_DROPDOWN, 2, 8, 167, 59, 72, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_BUTTON, 2, 156, 166, 60, 71, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_GROUPBOX, 2, 3, 316, 96, 202, STR_RESEARCH_PRIORITIES, STR_NONE },
{ WWT_CHECKBOX, 2, 8, 311, 108, 119, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 121, 132, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 134, 145, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 147, 158, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 160, 171, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 173, 184, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 186, 197, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP },
{ WIDGETS_END },
};
@@ -235,7 +237,7 @@ rct_window* window_research_open()
w = window_bring_to_front_by_class(WC_RESEARCH);
if (w == nullptr)
{
w = window_create_auto_pos(530, 257, window_research_page_events[0], WC_RESEARCH, WF_10);
w = window_create_auto_pos(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;
@@ -247,8 +249,8 @@ rct_window* window_research_open()
w->page = 0;
w->Invalidate();
w->width = 300;
w->height = 196;
w->width = WW_DEVELOPMENT;
w->height = WH_DEVELOPMENT;
w->Invalidate();
w->widgets = window_research_page_widgets[0];
@@ -603,13 +605,13 @@ static void window_research_set_page(rct_window* w, int32_t page)
w->Invalidate();
if (w->page == WINDOW_RESEARCH_PAGE_DEVELOPMENT)
{
w->width = 300;
w->height = 196;
w->width = WW_DEVELOPMENT;
w->height = WH_DEVELOPMENT;
}
else
{
w->width = 320;
w->height = 207;
w->width = WW_FUNDING;
w->height = WH_FUNDING;
}
window_event_resize_call(w);
window_event_invalidate_call(w);

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

@@ -20,9 +20,10 @@
#include <openrct2/scenario/Scenario.h>
#include <openrct2/windows/Intent.h>
static constexpr const rct_string_id WINDOW_TITLE = 0;
static constexpr const int32_t WH = 54;
static constexpr const int32_t WW = 260;
static constexpr const int32_t WH_SAVE = 54;
static constexpr const int32_t WW_SAVE = 260;
static constexpr const int32_t WH_QUIT = 38;
static constexpr const int32_t WW_QUIT = 177;
// clang-format off
enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
@@ -36,7 +37,7 @@ enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
};
static rct_widget window_save_prompt_widgets[] = {
WINDOW_SHIM_WHITE(WINDOW_TITLE, WW, WH),
WINDOW_SHIM_WHITE(STR_NONE, WW_SAVE, WH_SAVE),
{ WWT_LABEL_CENTRED, 0, 2, 257, 19, 30, 0, STR_NONE }, // question/label
{ WWT_BUTTON, 0, 8, 85, 35, 48, STR_SAVE_PROMPT_SAVE, STR_NONE }, // save
{ WWT_BUTTON, 0, 91, 168, 35, 48, STR_SAVE_PROMPT_DONT_SAVE, STR_NONE }, // don't save
@@ -53,7 +54,7 @@ enum WINDOW_QUIT_PROMPT_WIDGET_IDX {
};
static rct_widget window_quit_prompt_widgets[] = {
WINDOW_SHIM_WHITE(WINDOW_TITLE, WW, WH),
WINDOW_SHIM_WHITE(STR_QUIT_GAME_PROMPT_TITLE, WW_QUIT, WH_QUIT),
{ WWT_BUTTON, 0, 8, 85, 19, 32, STR_OK, STR_NONE }, // ok
{ WWT_BUTTON, 0, 91, 168, 19, 32, STR_CANCEL, STR_NONE }, // cancel
{ WIDGETS_END },
@@ -153,15 +154,15 @@ rct_window* window_save_prompt_open()
{
widgets = window_quit_prompt_widgets;
enabled_widgets = (1 << WQIDX_CLOSE) | (1 << WQIDX_OK) | (1 << WQIDX_CANCEL);
width = 177;
height = 38;
width = WW_QUIT;
height = WH_QUIT;
}
else
{
widgets = window_save_prompt_widgets;
enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_SAVE) | (1 << WIDX_DONT_SAVE) | (1 << WIDX_CANCEL);
width = 260;
height = 54;
width = WW_SAVE;
height = WH_SAVE;
}
if (prompt_mode >= std::size(window_save_prompt_labels))

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

@@ -16,10 +16,8 @@
#include <openrct2/sprites.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_VIEWPORT_NO;
static constexpr const int32_t WH = 0;
static constexpr const int32_t WW = 0;
constexpr int32_t INITIAL_WIDTH = 500;
constexpr int32_t INITIAL_HEIGHT = 350;
static constexpr const int32_t WH = 500;
static constexpr const int32_t WW = 350;
// clang-format off
enum {
@@ -89,7 +87,7 @@ static int32_t _viewportNumber = 1;
*/
rct_window* window_viewport_open()
{
rct_window* w = window_create_auto_pos(INITIAL_WIDTH, INITIAL_HEIGHT, &window_viewport_events, WC_VIEWPORT, WF_RESIZABLE);
rct_window* w = window_create_auto_pos(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++;

6
src/openrct2-ui/windows/Window.h
View File

@@ -197,9 +197,9 @@ rct_window* window_scenery_scatter_open();
// clang-format off
#define WINDOW_SHIM_RAW(TITLE, WIDTH, HEIGHT, CLOSE_STR) \
{ WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT, 0xFFFFFFFF, STR_NONE }, \
{ WWT_CAPTION, 0, 1, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \
{ WWT_CLOSEBOX, 0, WIDTH - 13, WIDTH - 3, 2, 13, CLOSE_STR, STR_CLOSE_WINDOW_TIP }
{ WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT - 1, 0xFFFFFFFF, STR_NONE }, \
{ WWT_CAPTION, 0, 1, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \
{ WWT_CLOSEBOX, 0, WIDTH - 13, WIDTH - 3, 2, 13, CLOSE_STR, STR_CLOSE_WINDOW_TIP }
#define WINDOW_SHIM(TITLE, WIDTH, HEIGHT) WINDOW_SHIM_RAW(TITLE, WIDTH, HEIGHT, STR_CLOSE_X)
#define WINDOW_SHIM_WHITE(TITLE, WIDTH, HEIGHT) WINDOW_SHIM_RAW(TITLE, WIDTH, HEIGHT, STR_CLOSE_X_WHITE)