From 650fa3ae2eaa520f9aaa4365f2c3979cedf0894b Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 10 Jun 2025 19:55:12 +0200 Subject: [PATCH] Rename WindowWidgetType to WidgetType and change for new code style --- src/openrct2-ui/WindowManager.cpp | 4 +- src/openrct2-ui/input/MouseInput.cpp | 68 +-- src/openrct2-ui/input/Shortcuts.cpp | 20 +- src/openrct2-ui/interface/Widget.cpp | 71 ++- src/openrct2-ui/interface/Widget.h | 34 +- src/openrct2-ui/interface/Window.cpp | 28 +- src/openrct2-ui/scripting/CustomListView.cpp | 2 +- src/openrct2-ui/scripting/CustomWindow.cpp | 40 +- src/openrct2-ui/scripting/ScWidget.hpp | 124 ++--- src/openrct2-ui/windows/About.cpp | 24 +- src/openrct2-ui/windows/AssetPacks.cpp | 12 +- src/openrct2-ui/windows/Banner.cpp | 18 +- src/openrct2-ui/windows/Changelog.cpp | 8 +- src/openrct2-ui/windows/Cheats.cpp | 186 +++---- src/openrct2-ui/windows/ClearScenery.cpp | 12 +- src/openrct2-ui/windows/CustomCurrency.cpp | 8 +- src/openrct2-ui/windows/DebugPaint.cpp | 14 +- .../windows/DemolishRidePrompt.cpp | 4 +- src/openrct2-ui/windows/Dropdown.cpp | 2 +- .../windows/EditorBottomToolbar.cpp | 28 +- .../windows/EditorInventionsList.cpp | 19 +- .../windows/EditorObjectSelection.cpp | 60 +- .../windows/EditorParkEntrance.cpp | 6 +- .../windows/EditorScenarioOptions.cpp | 275 +++++---- src/openrct2-ui/windows/Error.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 50 +- src/openrct2-ui/windows/Footpath.cpp | 54 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 60 +- src/openrct2-ui/windows/Guest.cpp | 38 +- src/openrct2-ui/windows/GuestList.cpp | 54 +- src/openrct2-ui/windows/InstallTrack.cpp | 10 +- src/openrct2-ui/windows/Land.cpp | 16 +- src/openrct2-ui/windows/LandRights.cpp | 50 +- src/openrct2-ui/windows/LoadSave.cpp | 56 +- src/openrct2-ui/windows/Main.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 46 +- src/openrct2-ui/windows/MapGen.cpp | 80 +-- src/openrct2-ui/windows/MapTooltip.cpp | 2 +- src/openrct2-ui/windows/MazeConstruction.cpp | 66 +-- src/openrct2-ui/windows/Multiplayer.cpp | 36 +- src/openrct2-ui/windows/NewCampaign.cpp | 32 +- src/openrct2-ui/windows/NewRide.cpp | 56 +- src/openrct2-ui/windows/News.cpp | 4 +- src/openrct2-ui/windows/NewsOptions.cpp | 24 +- src/openrct2-ui/windows/ObjectLoadError.cpp | 14 +- src/openrct2-ui/windows/Options.cpp | 278 ++++----- src/openrct2-ui/windows/OverwritePrompt.cpp | 4 +- src/openrct2-ui/windows/Park.cpp | 62 +-- src/openrct2-ui/windows/PatrolArea.cpp | 6 +- src/openrct2-ui/windows/Player.cpp | 12 +- src/openrct2-ui/windows/ProgressWindow.cpp | 4 +- .../windows/RefurbishRidePrompt.cpp | 4 +- src/openrct2-ui/windows/Research.cpp | 44 +- src/openrct2-ui/windows/Ride.cpp | 522 ++++++++--------- src/openrct2-ui/windows/RideConstruction.cpp | 527 +++++++++--------- src/openrct2-ui/windows/RideList.cpp | 34 +- src/openrct2-ui/windows/SavePrompt.cpp | 12 +- src/openrct2-ui/windows/ScenarioSelect.cpp | 30 +- src/openrct2-ui/windows/Scenery.cpp | 76 +-- src/openrct2-ui/windows/SceneryScatter.cpp | 14 +- src/openrct2-ui/windows/ServerList.cpp | 10 +- src/openrct2-ui/windows/ServerStart.cpp | 18 +- src/openrct2-ui/windows/ShortcutKeys.cpp | 14 +- src/openrct2-ui/windows/Sign.cpp | 26 +- src/openrct2-ui/windows/Staff.cpp | 66 +-- src/openrct2-ui/windows/StaffFirePrompt.cpp | 4 +- src/openrct2-ui/windows/StaffList.cpp | 20 +- src/openrct2-ui/windows/TextInput.cpp | 4 +- src/openrct2-ui/windows/Themes.cpp | 116 ++-- src/openrct2-ui/windows/TileInspector.cpp | 144 ++--- src/openrct2-ui/windows/TitleExit.cpp | 2 +- src/openrct2-ui/windows/TitleLogo.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 16 +- src/openrct2-ui/windows/TitleOptions.cpp | 2 +- src/openrct2-ui/windows/Tooltip.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 207 ++++--- src/openrct2-ui/windows/TrackDesignManage.cpp | 8 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 8 +- src/openrct2-ui/windows/TrackList.cpp | 22 +- src/openrct2-ui/windows/Transparency.cpp | 28 +- src/openrct2-ui/windows/ViewClipping.cpp | 16 +- src/openrct2-ui/windows/Viewport.cpp | 12 +- src/openrct2-ui/windows/Water.cpp | 6 +- src/openrct2/interface/Widget.h | 54 +- src/openrct2/interface/Window.cpp | 4 +- src/openrct2/interface/WindowBase.cpp | 8 +- 86 files changed, 2114 insertions(+), 2153 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 8b9168273a..49dc6820a9 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -1184,7 +1184,7 @@ public: { const auto& widget = w.widgets[i]; - if (widget.type != WindowWidgetType::Empty && widget.IsVisible()) + if (widget.type != WidgetType::empty && widget.IsVisible()) { if (screenCoords.x >= w.windowPos.x + widget.left && screenCoords.x <= w.windowPos.x + widget.right && screenCoords.y >= w.windowPos.y + widget.top && screenCoords.y <= w.windowPos.y + widget.bottom) @@ -1198,7 +1198,7 @@ public: if (widget_index != kWidgetIndexNull) { const auto& widget = w.widgets[widget_index]; - if (widget.type == WindowWidgetType::DropdownMenu) + if (widget.type == WidgetType::dropdownMenu) widget_index++; } diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 235c7fc951..d3e4b8145b 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -318,14 +318,14 @@ namespace OpenRCT2 { switch (widget->type) { - case WindowWidgetType::Viewport: + case WidgetType::viewport: if (!(gLegacyScene == LegacyScene::trackDesignsManager || gLegacyScene == LegacyScene::titleSequence)) { InputViewportDragBegin(*w); } break; - case WindowWidgetType::Scroll: + case WidgetType::scroll: InputScrollDragBegin(screenCoords, w, widgetIndex); break; default: @@ -968,7 +968,7 @@ namespace OpenRCT2 InputWidgetOverChangeCheck(windowClass, windowNumber, widgetIndex); - if (w != nullptr && widgetIndex != kWidgetIndexNull && widget->type == WindowWidgetType::Scroll) + if (w != nullptr && widgetIndex != kWidgetIndexNull && widget->type == WidgetType::scroll) { int32_t scroll_part, scrollId; ScreenCoordsXY newScreenCoords; @@ -1027,7 +1027,7 @@ namespace OpenRCT2 if (w != nullptr) { w->OnPrepareDraw(); - if (w->widgets[gHoverWidget.widget_index].type == WindowWidgetType::FlatBtn) + if (w->widgets[gHoverWidget.widget_index].type == WidgetType::flatBtn) { windowMgr->InvalidateWidgetByNumber( gHoverWidget.window_classification, gHoverWidget.window_number, gHoverWidget.widget_index); @@ -1073,13 +1073,13 @@ namespace OpenRCT2 switch (widget.type) { - case WindowWidgetType::Frame: - case WindowWidgetType::Resize: + case WidgetType::frame: + case WidgetType::resize: if (WindowCanResize(*w) && (screenCoords.x >= w->windowPos.x + w->width - 19 && screenCoords.y >= w->windowPos.y + w->height - 19)) InputWindowResizeBegin(*w, widgetIndex, screenCoords); break; - case WindowWidgetType::Viewport: + case WidgetType::viewport: _inputState = InputState::ViewportLeft; gInputDragLast = screenCoords; _dragWidget.window_classification = windowClass; @@ -1094,34 +1094,34 @@ namespace OpenRCT2 } } break; - case WindowWidgetType::Caption: + case WidgetType::caption: InputWindowPositionBegin(*w, widgetIndex, screenCoords); break; - case WindowWidgetType::Scroll: + case WidgetType::scroll: InputScrollBegin(*w, widgetIndex, screenCoords); break; - case WindowWidgetType::Empty: - case WindowWidgetType::LabelCentred: - case WindowWidgetType::Label: - case WindowWidgetType::Groupbox: - case WindowWidgetType::ProgressBar: - case WindowWidgetType::Placeholder: - case WindowWidgetType::HorizontalSeparator: + case WidgetType::empty: + case WidgetType::labelCentred: + case WidgetType::label: + case WidgetType::groupbox: + case WidgetType::progressBar: + case WidgetType::placeholder: + case WidgetType::horizontalSeparator: // Non-interactive widget type break; - case WindowWidgetType::ImgBtn: - case WindowWidgetType::ColourBtn: - case WindowWidgetType::TrnBtn: - case WindowWidgetType::Tab: - case WindowWidgetType::FlatBtn: - case WindowWidgetType::Button: - case WindowWidgetType::TableHeader: - case WindowWidgetType::Spinner: - case WindowWidgetType::DropdownMenu: - case WindowWidgetType::CloseBox: - case WindowWidgetType::Checkbox: - case WindowWidgetType::TextBox: - case WindowWidgetType::Custom: + case WidgetType::imgBtn: + case WidgetType::colourBtn: + case WidgetType::trnBtn: + case WidgetType::tab: + case WidgetType::flatBtn: + case WidgetType::button: + case WidgetType::tableHeader: + case WidgetType::spinner: + case WidgetType::dropdownMenu: + case WidgetType::closeBox: + case WidgetType::checkbox: + case WidgetType::textBox: + case WidgetType::custom: if (!WidgetIsDisabled(*w, widgetIndex)) { OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + widget.midX()); @@ -1162,7 +1162,7 @@ namespace OpenRCT2 { switch (window->widgets[widgetId].type) { - case WindowWidgetType::Viewport: + case WidgetType::viewport: if (!gInputFlags.has(InputFlag::toolActive)) { if (ViewportInteractionLeftOver(screenCoords)) @@ -1175,8 +1175,8 @@ namespace OpenRCT2 cursorId = static_cast(gCurrentToolId); break; - case WindowWidgetType::Frame: - case WindowWidgetType::Resize: + case WidgetType::frame: + case WidgetType::resize: if (!window->canBeResized()) break; @@ -1189,7 +1189,7 @@ namespace OpenRCT2 cursorId = CursorID::DiagonalArrows; break; - case WindowWidgetType::Scroll: + case WidgetType::scroll: { int32_t output_scroll_area, scroll_id; ScreenCoordsXY scrollCoords; @@ -1260,7 +1260,7 @@ namespace OpenRCT2 if (w != nullptr && state == MouseState::LeftRelease) { - if (w->widgets[widgetIndex].type == WindowWidgetType::CloseBox && cursor_w_class == w->classification + if (w->widgets[widgetIndex].type == WidgetType::closeBox && cursor_w_class == w->classification && cursor_w_number == w->number && widgetIndex == cursor_widgetIndex) { auto& im = GetInputManager(); diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 0b40dd0c9c..22e72dce4c 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -92,7 +92,7 @@ static void ShortcutRotateConstructionObject() // Rotate scenery WindowBase* w = windowMgr->FindByClass(WindowClass::Scenery); if (w != nullptr && !WidgetIsDisabled(*w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) - && w->widgets[WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type != WindowWidgetType::Empty) + && w->widgets[WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type != WidgetType::empty) { w->OnMouseUp(WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON); return; @@ -101,7 +101,7 @@ static void ShortcutRotateConstructionObject() // Rotate construction track piece w = windowMgr->FindByClass(WindowClass::RideConstruction); if (w != nullptr && !WidgetIsDisabled(*w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) - && w->widgets[WC_RIDE_CONSTRUCTION__WIDX_ROTATE].type != WindowWidgetType::Empty) + && w->widgets[WC_RIDE_CONSTRUCTION__WIDX_ROTATE].type != WidgetType::empty) { // Check if building a maze... if (w->widgets[WC_RIDE_CONSTRUCTION__WIDX_ROTATE].tooltip != STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP) @@ -114,7 +114,7 @@ static void ShortcutRotateConstructionObject() // Rotate track design preview w = windowMgr->FindByClass(WindowClass::TrackDesignList); if (w != nullptr && !WidgetIsDisabled(*w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE) - && w->widgets[WC_TRACK_DESIGN_LIST__WIDX_ROTATE].type != WindowWidgetType::Empty) + && w->widgets[WC_TRACK_DESIGN_LIST__WIDX_ROTATE].type != WidgetType::empty) { w->OnMouseUp(WC_TRACK_DESIGN_LIST__WIDX_ROTATE); return; @@ -123,7 +123,7 @@ static void ShortcutRotateConstructionObject() // Rotate track design placement w = windowMgr->FindByClass(WindowClass::TrackDesignPlace); if (w != nullptr && !WidgetIsDisabled(*w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE) - && w->widgets[WC_TRACK_DESIGN_PLACE__WIDX_ROTATE].type != WindowWidgetType::Empty) + && w->widgets[WC_TRACK_DESIGN_PLACE__WIDX_ROTATE].type != WidgetType::empty) { w->OnMouseUp(WC_TRACK_DESIGN_PLACE__WIDX_ROTATE); return; @@ -132,7 +132,7 @@ static void ShortcutRotateConstructionObject() // Rotate park entrance w = windowMgr->FindByClass(WindowClass::EditorParkEntrance); if (w != nullptr && !WidgetIsDisabled(*w, WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON) - && w->widgets[WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON].type != WindowWidgetType::Empty) + && w->widgets[WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON].type != WidgetType::empty) { w->OnMouseUp(WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON); return; @@ -141,7 +141,7 @@ static void ShortcutRotateConstructionObject() // Rotate selected element in tile inspector w = windowMgr->FindByClass(WindowClass::TileInspector); if (w != nullptr && !WidgetIsDisabled(*w, WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE) - && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE].type != WindowWidgetType::Empty) + && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE].type != WidgetType::empty) { w->OnMouseUp(WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE); return; @@ -479,7 +479,7 @@ static void TileInspectorMouseUp(WidgetIndex widgetIndex) { auto* windowMgr = GetWindowManager(); auto w = windowMgr->FindByClass(WindowClass::TileInspector); - if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WindowWidgetType::Empty) + if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WidgetType::empty) { w->OnMouseUp(widgetIndex); } @@ -489,7 +489,7 @@ static void TileInspectorMouseDown(WidgetIndex widgetIndex) { auto* windowMgr = GetWindowManager(); auto w = windowMgr->FindByClass(WindowClass::TileInspector); - if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WindowWidgetType::Empty) + if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WidgetType::empty) { w->OnMouseDown(widgetIndex); } @@ -561,7 +561,7 @@ static void ShortcutIncreaseElementHeight() action = WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_INCREASE; break; } - if (action != -1 && !WidgetIsDisabled(*w, action) && w->widgets[action].type != WindowWidgetType::Empty) + if (action != -1 && !WidgetIsDisabled(*w, action) && w->widgets[action].type != WidgetType::empty) w->OnMouseDown(action); return; } @@ -601,7 +601,7 @@ static void ShortcutDecreaseElementHeight() action = WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_DECREASE; break; } - if (action != -1 && !WidgetIsDisabled(*w, action) && w->widgets[action].type != WindowWidgetType::Empty) + if (action != -1 && !WidgetIsDisabled(*w, action) && w->widgets[action].type != WidgetType::empty) w->OnMouseDown(action); return; } diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index e1b4939f7a..9aad6326a6 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -66,60 +66,60 @@ namespace OpenRCT2::Ui switch (widget->type) { - case WindowWidgetType::Frame: + case WidgetType::frame: WidgetFrameDraw(rt, w, widgetIndex); break; - case WindowWidgetType::Resize: + case WidgetType::resize: WidgetResizeDraw(rt, w, widgetIndex); break; - case WindowWidgetType::ImgBtn: + case WidgetType::imgBtn: WidgetButtonDraw(rt, w, widgetIndex); break; - case WindowWidgetType::ColourBtn: - case WindowWidgetType::TrnBtn: - case WindowWidgetType::Tab: + case WidgetType::colourBtn: + case WidgetType::trnBtn: + case WidgetType::tab: WidgetTabDraw(rt, w, widgetIndex); break; - case WindowWidgetType::FlatBtn: + case WidgetType::flatBtn: WidgetFlatButtonDraw(rt, w, widgetIndex); break; - case WindowWidgetType::Button: - case WindowWidgetType::TableHeader: + case WidgetType::button: + case WidgetType::tableHeader: WidgetTextButton(rt, w, widgetIndex); break; - case WindowWidgetType::LabelCentred: + case WidgetType::labelCentred: WidgetTextCentred(rt, w, widgetIndex); break; - case WindowWidgetType::Label: + case WidgetType::label: WidgetText(rt, w, widgetIndex); break; - case WindowWidgetType::Spinner: - case WindowWidgetType::DropdownMenu: - case WindowWidgetType::Viewport: + case WidgetType::spinner: + case WidgetType::dropdownMenu: + case WidgetType::viewport: WidgetTextInset(rt, w, widgetIndex); break; - case WindowWidgetType::Groupbox: + case WidgetType::groupbox: WidgetGroupboxDraw(rt, w, widgetIndex); break; - case WindowWidgetType::Caption: + case WidgetType::caption: WidgetCaptionDraw(rt, w, widgetIndex); break; - case WindowWidgetType::CloseBox: + case WidgetType::closeBox: WidgetCloseboxDraw(rt, w, widgetIndex); break; - case WindowWidgetType::Scroll: + case WidgetType::scroll: WidgetScrollDraw(rt, w, widgetIndex); break; - case WindowWidgetType::Checkbox: + case WidgetType::checkbox: WidgetCheckboxDraw(rt, w, widgetIndex); break; - case WindowWidgetType::TextBox: + case WidgetType::textBox: WidgetTextBoxDraw(rt, w, widgetIndex); break; - case WindowWidgetType::ProgressBar: + case WidgetType::progressBar: WidgetProgressBarDraw(rt, w, widgetIndex); break; - case WindowWidgetType::HorizontalSeparator: + case WidgetType::horizontalSeparator: WidgetHorizontalSeparatorDraw(rt, w, *widget); break; default: @@ -225,10 +225,10 @@ namespace OpenRCT2::Ui // Get the widget auto& widget = w.widgets[widgetIndex]; - if (widget.type != WindowWidgetType::Tab && widget.image.GetIndex() == kImageIndexUndefined) + if (widget.type != WidgetType::tab && widget.image.GetIndex() == kImageIndexUndefined) return; - if (widget.type == WindowWidgetType::Tab) + if (widget.type == WidgetType::tab) { if (WidgetIsDisabled(w, widgetIndex)) return; @@ -247,7 +247,7 @@ namespace OpenRCT2::Ui return; } - if (widget.type != WindowWidgetType::TrnBtn) + if (widget.type != WidgetType::trnBtn) { WidgetDrawImage(rt, w, widgetIndex); return; @@ -325,7 +325,7 @@ namespace OpenRCT2::Ui GfxFillRectInset(rt, rect, colour, press); // Button caption - if (widget.type != WindowWidgetType::TableHeader) + if (widget.type != WidgetType::tableHeader) { WidgetTextCentred(rt, w, widgetIndex); } @@ -356,7 +356,7 @@ namespace OpenRCT2::Ui auto topLeft = w.windowPos + ScreenCoordsXY{ widget.left, 0 }; int32_t r = w.windowPos.x + widget.right; - if (widget.type == WindowWidgetType::Button || widget.type == WindowWidgetType::TableHeader) + if (widget.type == WidgetType::button || widget.type == WidgetType::tableHeader) topLeft.y += widget.textTop(); else topLeft.y += widget.top; @@ -370,7 +370,7 @@ namespace OpenRCT2::Ui } ScreenCoordsXY coords = { (topLeft.x + r + 1) / 2 - 1, topLeft.y }; - if (widget.type == WindowWidgetType::LabelCentred) + if (widget.type == WidgetType::labelCentred) { DrawTextWrapped(rt, coords, widget.width() - 2, stringId, ft, { colour, TextAlignment::CENTRE }); } @@ -401,8 +401,8 @@ namespace OpenRCT2::Ui int32_t r = w.windowPos.x + widget.right; int32_t t; - if (widget.type == WindowWidgetType::Button || widget.type == WindowWidgetType::DropdownMenu - || widget.type == WindowWidgetType::Spinner || widget.type == WindowWidgetType::TableHeader) + if (widget.type == WidgetType::button || widget.type == WidgetType::dropdownMenu || widget.type == WidgetType::spinner + || widget.type == WidgetType::tableHeader) { t = w.windowPos.y + widget.textTop(); } @@ -418,7 +418,7 @@ namespace OpenRCT2::Ui } ScreenCoordsXY coords = { l + 1, t }; - if (widget.type == WindowWidgetType::LabelCentred) + if (widget.type == WidgetType::labelCentred) { DrawTextWrapped(rt, coords, r - l, stringId, ft, { colour, TextAlignment::CENTRE }); } @@ -559,10 +559,10 @@ namespace OpenRCT2::Ui topLeft = w.windowPos + ScreenCoordsXY{ widget->left + 2, widget->top + 1 }; int32_t width = widget->width() - 4; - if ((widget + 1)->type == WindowWidgetType::CloseBox) + if ((widget + 1)->type == WidgetType::closeBox) { width -= kCloseButtonSize; - if ((widget + 2)->type == WindowWidgetType::CloseBox) + if ((widget + 2)->type == WidgetType::closeBox) width -= kCloseButtonSize; } topLeft.x += width / 2; @@ -829,8 +829,7 @@ namespace OpenRCT2::Ui // Resolve the absolute ltrb auto screenCoords = w.windowPos + ScreenCoordsXY{ widget.left, widget.top }; - if (widget.type == WindowWidgetType::ColourBtn || widget.type == WindowWidgetType::TrnBtn - || widget.type == WindowWidgetType::Tab) + if (widget.type == WidgetType::colourBtn || widget.type == WidgetType::trnBtn || widget.type == WidgetType::tab) if (WidgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) image = image.WithIndexOffset(1); @@ -942,7 +941,7 @@ namespace OpenRCT2::Ui w.widgets.begin(), w.widgets.end(), [&](auto& otherWidget) { return &otherWidget == widget; }); for (auto it = w.widgets.begin(); it != itLast; it++) { - if (it->type == WindowWidgetType::Scroll) + if (it->type == WidgetType::scroll) { *scroll_id += 1; } diff --git a/src/openrct2-ui/interface/Widget.h b/src/openrct2-ui/interface/Widget.h index fee24210ff..fd0e8774b2 100644 --- a/src/openrct2-ui/interface/Widget.h +++ b/src/openrct2-ui/interface/Widget.h @@ -41,7 +41,7 @@ namespace OpenRCT2::Ui }; constexpr Widget makeWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, WindowWidgetType type, WindowColour colour, + const ScreenCoordsXY& origin, const ScreenSize& size, WidgetType type, WindowColour colour, uint32_t content = kWidgetContentEmpty, StringId tooltip = kStringIdNone) { Widget out = {}; @@ -58,7 +58,7 @@ namespace OpenRCT2::Ui } constexpr Widget makeWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, WindowWidgetType type, WindowColour colour, ImageId image, + const ScreenCoordsXY& origin, const ScreenSize& size, WidgetType type, WindowColour colour, ImageId image, StringId tooltip = kStringIdNone) { Widget out = {}; @@ -75,7 +75,7 @@ namespace OpenRCT2::Ui } constexpr Widget makeRemapWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, WindowWidgetType type, WindowColour colour, ImageIndex content, + const ScreenCoordsXY& origin, const ScreenSize& size, WidgetType type, WindowColour colour, ImageIndex content, StringId tooltip = kStringIdNone) { return makeWidget(origin, size, type, colour, ImageId(content, FilterPaletteID::PaletteNull), tooltip); @@ -84,7 +84,7 @@ namespace OpenRCT2::Ui constexpr Widget makeTab(const ScreenCoordsXY& origin, StringId tooltip = kStringIdNone) { const ScreenSize size = kTabSize; - const WindowWidgetType type = WindowWidgetType::Tab; + const WidgetType type = WidgetType::tab; const WindowColour colour = WindowColour::secondary; const auto content = ImageId(kImageIndexUndefined); @@ -100,7 +100,7 @@ namespace OpenRCT2::Ui out.right = origin.x + size.width - 1; out.top = origin.y; out.bottom = origin.y + size.height - 1; - out.type = WindowWidgetType::ProgressBar; + out.type = WidgetType::progressBar; out.colour = colour; out.content = 0 | (lowerBlinkBound << 8) | (upperBlinkBound << 16); out.tooltip = kStringIdNone; @@ -176,9 +176,9 @@ namespace OpenRCT2::Ui { // clang-format off std::array out = { - makeWidget({ 0, 0 }, { width, height }, WindowWidgetType::Frame, WindowColour::primary), - makeWidget({ 1, 1 }, { width - 1, kTitleHeightNormal }, WindowWidgetType::Caption, WindowColour::primary, title, STR_WINDOW_TITLE_TIP), - makeWidget({ width - 12, 2 }, { 11, 11 }, WindowWidgetType::CloseBox, WindowColour::primary, kWidgetContentEmpty, STR_CLOSE_WINDOW_TIP), + makeWidget({ 0, 0 }, { width, height }, WidgetType::frame, WindowColour::primary), + makeWidget({ 1, 1 }, { width - 1, kTitleHeightNormal }, WidgetType::caption, WindowColour::primary, title, STR_WINDOW_TITLE_TIP), + makeWidget({ width - 12, 2 }, { 11, 11 }, WidgetType::closeBox, WindowColour::primary, kWidgetContentEmpty, STR_CLOSE_WINDOW_TIP), }; // clang-format on @@ -187,7 +187,7 @@ namespace OpenRCT2::Ui } constexpr Widget makeSpinnerDecreaseWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WindowWidgetType type, WindowColour colour, + const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WidgetType type, WindowColour colour, [[maybe_unused]] uint32_t content = kWidgetContentEmpty, StringId tooltip = kStringIdNone) { const int16_t xPos = origin.x + size.width - 26; @@ -195,11 +195,11 @@ namespace OpenRCT2::Ui const uint16_t width = 13; const uint16_t height = size.height - 2; - return makeWidget({ xPos, yPos }, { width, height }, WindowWidgetType::Button, colour, STR_NUMERIC_DOWN, tooltip); + return makeWidget({ xPos, yPos }, { width, height }, WidgetType::button, colour, STR_NUMERIC_DOWN, tooltip); } constexpr Widget makeSpinnerIncreaseWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WindowWidgetType type, WindowColour colour, + const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WidgetType type, WindowColour colour, [[maybe_unused]] uint32_t content = kWidgetContentEmpty, StringId tooltip = kStringIdNone) { const int16_t xPos = origin.x + size.width - 13; @@ -207,11 +207,11 @@ namespace OpenRCT2::Ui const uint16_t width = 12; const uint16_t height = size.height - 2; - return makeWidget({ xPos, yPos }, { width, height }, WindowWidgetType::Button, colour, STR_NUMERIC_UP, tooltip); + return makeWidget({ xPos, yPos }, { width, height }, WidgetType::button, colour, STR_NUMERIC_UP, tooltip); } constexpr std::array makeSpinnerWidgets( - const ScreenCoordsXY& origin, const ScreenSize& size, WindowWidgetType type, WindowColour colour, + const ScreenCoordsXY& origin, const ScreenSize& size, WidgetType type, WindowColour colour, uint32_t content = kWidgetContentEmpty, StringId tooltip = kStringIdNone) { return makeWidgets( @@ -221,14 +221,14 @@ namespace OpenRCT2::Ui }; constexpr Widget makeDropdownBoxWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WindowWidgetType type, WindowColour colour, + const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WidgetType type, WindowColour colour, [[maybe_unused]] uint32_t content = kWidgetContentEmpty, StringId tooltip = kStringIdNone) { return makeWidget(origin, size, type, colour, content); } constexpr Widget makeDropdownButtonWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WindowWidgetType type, WindowColour colour, + const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] WidgetType type, WindowColour colour, [[maybe_unused]] uint32_t content = kWidgetContentEmpty, StringId tooltip = kStringIdNone) { const int16_t xPos = origin.x + size.width - 11; @@ -236,11 +236,11 @@ namespace OpenRCT2::Ui const uint16_t width = 11; const uint16_t height = size.height - 2; - return makeWidget({ xPos, yPos }, { width, height }, WindowWidgetType::Button, colour, STR_DROPDOWN_GLYPH, tooltip); + return makeWidget({ xPos, yPos }, { width, height }, WidgetType::button, colour, STR_DROPDOWN_GLYPH, tooltip); } constexpr std::array makeDropdownWidgets( - const ScreenCoordsXY& origin, const ScreenSize& size, WindowWidgetType type, WindowColour colour, uint32_t content, + const ScreenCoordsXY& origin, const ScreenSize& size, WidgetType type, WindowColour colour, uint32_t content, StringId tooltip = kStringIdNone) { return makeWidgets( diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 85c2ce4565..8074843bb7 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -52,7 +52,7 @@ namespace OpenRCT2 static int32_t WindowGetScrollIndex(const WindowBase& w, int32_t targetWidgetIndex) { - if (w.widgets[targetWidgetIndex].type != WindowWidgetType::Scroll) + if (w.widgets[targetWidgetIndex].type != WidgetType::scroll) return -1; int32_t scrollIndex = 0; @@ -61,7 +61,7 @@ namespace OpenRCT2 if (widgetIndex == targetWidgetIndex) break; auto& widget = w.widgets[widgetIndex]; - if (widget.type == WindowWidgetType::Scroll) + if (widget.type == WidgetType::scroll) scrollIndex++; } @@ -73,7 +73,7 @@ namespace OpenRCT2 for (WidgetIndex widgetIndex = 0; widgetIndex < w.widgets.size(); widgetIndex++) { auto& widget = w.widgets[widgetIndex]; - if (widget.type != WindowWidgetType::Scroll) + if (widget.type != WidgetType::scroll) continue; if (scrollIndex == 0) @@ -127,7 +127,7 @@ namespace OpenRCT2 for (WidgetIndex widgetIndex = 0; widgetIndex < w.widgets.size(); widgetIndex++) { const auto& widget = w.widgets[widgetIndex]; - if (widget.type != WindowWidgetType::Scroll) + if (widget.type != WidgetType::scroll) continue; // Originally always checked first scroll view, bug maybe? @@ -158,11 +158,11 @@ namespace OpenRCT2 Windows::WindowZoomOut(w, true); } - static bool isSpinnerGroup(WindowBase& w, WidgetIndex index, WindowWidgetType buttonType) + static bool isSpinnerGroup(WindowBase& w, WidgetIndex index, WidgetType buttonType) { const auto& widgets = w.widgets; - if (widgets[index].type != WindowWidgetType::Spinner && widgets[index].type != WindowWidgetType::ImgBtn) + if (widgets[index].type != WidgetType::spinner && widgets[index].type != WidgetType::imgBtn) return false; if (static_cast(index + 2) >= widgets.size()) @@ -188,12 +188,12 @@ namespace OpenRCT2 break; } - if (isSpinnerGroup(w, reverseIndex, WindowWidgetType::TrnBtn)) + if (isSpinnerGroup(w, reverseIndex, WidgetType::trnBtn)) { return reverseIndex; } - if (isSpinnerGroup(w, reverseIndex, WindowWidgetType::Button)) + if (isSpinnerGroup(w, reverseIndex, WidgetType::button)) { return reverseIndex; } @@ -217,7 +217,7 @@ namespace OpenRCT2 const auto entryWidgetType = w.widgets[*spinnerGroupIndex].type; auto targetWidgetIndex = *spinnerGroupIndex; - if (entryWidgetType == WindowWidgetType::ImgBtn) + if (entryWidgetType == WidgetType::imgBtn) { auto expectedContent1 = ImageId(SPR_LAND_TOOL_DECREASE, FilterPaletteID::PaletteNull); auto expectedContent2 = ImageId(SPR_LAND_TOOL_INCREASE, FilterPaletteID::PaletteNull); @@ -232,7 +232,7 @@ namespace OpenRCT2 // Expected widget order: decrease, increase targetWidgetIndex += wheel < 0 ? 2 : 1; } - else if (entryWidgetType == WindowWidgetType::Spinner) + else if (entryWidgetType == WidgetType::spinner) { auto button1StringId = w.widgets[*spinnerGroupIndex + 1].text; auto button2StringId = w.widgets[*spinnerGroupIndex + 2].text; @@ -291,7 +291,7 @@ namespace OpenRCT2 if (widgetIndex != kWidgetIndexNull) { const auto& widget = w->widgets[widgetIndex]; - if (widget.type == WindowWidgetType::Scroll) + if (widget.type == WidgetType::scroll) { int32_t scrollIndex = WindowGetScrollIndex(*w, widgetIndex); const auto& scroll = w->scrolls[scrollIndex]; @@ -499,7 +499,7 @@ namespace OpenRCT2 for (i = start_tab_id; i <= end_tab_id; i++) { auto& widget = w->widgets[i]; - assert(widget.type == WindowWidgetType::Tab); + assert(widget.type == WidgetType::tab); if (!WidgetIsDisabled(*w, i)) { @@ -674,7 +674,7 @@ namespace OpenRCT2::Ui::Windows for (WidgetIndex widgetIndex = 0; widgetIndex < w.widgets.size(); widgetIndex++) { auto& widget = w.widgets[widgetIndex]; - if (widget.type != WindowWidgetType::Scroll) + if (widget.type != WidgetType::scroll) continue; auto& scroll = w.scrolls[scrollIndex]; @@ -724,7 +724,7 @@ namespace OpenRCT2::Ui::Windows for (WidgetIndex widgetIndex = 0; widgetIndex < w.widgets.size(); widgetIndex++) { auto& widget = w.widgets[widgetIndex]; - if (widget.type != WindowWidgetType::Scroll) + if (widget.type != WidgetType::scroll) { continue; } diff --git a/src/openrct2-ui/scripting/CustomListView.cpp b/src/openrct2-ui/scripting/CustomListView.cpp index 1d7d541d3c..69a279a692 100644 --- a/src/openrct2-ui/scripting/CustomListView.cpp +++ b/src/openrct2-ui/scripting/CustomListView.cpp @@ -833,7 +833,7 @@ OpenRCT2::Widget* CustomListView::GetWidget() const for (WidgetIndex widgetIndex = 0; widgetIndex < ParentWindow->widgets.size(); widgetIndex++) { auto& widget = ParentWindow->widgets[widgetIndex]; - if (widget.type == WindowWidgetType::Scroll) + if (widget.type == WidgetType::scroll) { if (scrollIndex == ScrollIndex) { diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index b41a1c9280..9c720fccc5 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -47,7 +47,7 @@ namespace OpenRCT2::Ui::Windows static auto CustomDefaultWidgets = makeWidgets( makeWindowShim(STR_STRING, 50, 50), - makeWidget({ 0, 14 }, { 50, 36 }, WindowWidgetType::Resize, WindowColour::secondary) // content panel + makeWidget({ 0, 14 }, { 50, 36 }, WidgetType::resize, WindowColour::secondary) // content panel ); struct CustomWidgetDesc @@ -476,7 +476,7 @@ namespace OpenRCT2::Ui::Windows WidgetIndex widgetIndex = 0; for (auto& widget : widgets) { - if (widget.type == WindowWidgetType::Scroll) + if (widget.type == WidgetType::scroll) { WidgetScrollUpdateThumbs(*this, widgetIndex); } @@ -516,7 +516,7 @@ namespace OpenRCT2::Ui::Windows size_t scrollIndex = 0; for (const auto& widget : widgets) { - if (widget.type == WindowWidgetType::Scroll) + if (widget.type == WidgetType::scroll) { auto& listView = _info.ListViews[scrollIndex]; auto wwidth = widget.width() + 1 - 2; @@ -791,7 +791,7 @@ namespace OpenRCT2::Ui::Windows WidgetIndex widgetIndex = 0; for (auto& widget : widgets) { - if (widget.type == WindowWidgetType::Viewport) + if (widget.type == WidgetType::viewport) { return widgetIndex; } @@ -903,7 +903,7 @@ namespace OpenRCT2::Ui::Windows for (size_t tabDescIndex = 0; tabDescIndex < _info.Desc.Tabs.size(); tabDescIndex++) { Widget widget{}; - widget.type = WindowWidgetType::Tab; + widget.type = WidgetType::tab; widget.colour = 1; widget.left = static_cast(3 + (tabDescIndex * 31)); widget.right = widget.left + 30; @@ -979,12 +979,12 @@ namespace OpenRCT2::Ui::Windows { if (desc.Image.HasValue()) { - widget.type = desc.HasBorder ? WindowWidgetType::ImgBtn : WindowWidgetType::FlatBtn; + widget.type = desc.HasBorder ? WidgetType::imgBtn : WidgetType::flatBtn; widget.image = desc.Image; } else { - widget.type = WindowWidgetType::Button; + widget.type = WidgetType::button; widget.string = const_cast(desc.Text.c_str()); widget.flags |= WIDGET_FLAGS::TEXT_IS_STRING; } @@ -996,7 +996,7 @@ namespace OpenRCT2::Ui::Windows } else if (desc.Type == "checkbox") { - widget.type = WindowWidgetType::Checkbox; + widget.type = WidgetType::checkbox; widget.string = const_cast(desc.Text.c_str()); widget.flags |= WIDGET_FLAGS::TEXT_IS_STRING; if (desc.IsChecked) @@ -1007,18 +1007,18 @@ namespace OpenRCT2::Ui::Windows } else if (desc.Type == "colourpicker") { - widget.type = WindowWidgetType::ColourBtn; + widget.type = WidgetType::colourBtn; widget.image = GetColourButtonImage(desc.Colour); widgetList.push_back(widget); } else if (desc.Type == "custom") { - widget.type = WindowWidgetType::Custom; + widget.type = WidgetType::custom; widgetList.push_back(widget); } else if (desc.Type == "dropdown") { - widget.type = WindowWidgetType::DropdownMenu; + widget.type = WidgetType::dropdownMenu; if (desc.SelectedIndex >= 0 && static_cast(desc.SelectedIndex) < desc.Items.size()) { widget.string = const_cast(desc.Items[desc.SelectedIndex].c_str()); @@ -1032,7 +1032,7 @@ namespace OpenRCT2::Ui::Windows // Add the dropdown button widget = {}; - widget.type = WindowWidgetType::Button; + widget.type = WidgetType::button; widget.colour = 1; widget.left = desc.X + desc.Width - 12; widget.right = desc.X + desc.Width - 2; @@ -1046,25 +1046,25 @@ namespace OpenRCT2::Ui::Windows } else if (desc.Type == "groupbox") { - widget.type = WindowWidgetType::Groupbox; + widget.type = WidgetType::groupbox; widget.string = const_cast(desc.Text.c_str()); widget.flags |= WIDGET_FLAGS::TEXT_IS_STRING; widgetList.push_back(widget); } else if (desc.Type == "label") { - widget.type = WindowWidgetType::Label; + widget.type = WidgetType::label; widget.string = const_cast(desc.Text.c_str()); widget.flags |= WIDGET_FLAGS::TEXT_IS_STRING; if (desc.TextAlign == TextAlignment::CENTRE) { - widget.type = WindowWidgetType::LabelCentred; + widget.type = WidgetType::labelCentred; } widgetList.push_back(widget); } else if (desc.Type == "listview") { - widget.type = WindowWidgetType::Scroll; + widget.type = WidgetType::scroll; widget.content = 0; if (desc.Scrollbars == ScrollbarType::Horizontal) widget.content = SCROLL_HORIZONTAL; @@ -1076,14 +1076,14 @@ namespace OpenRCT2::Ui::Windows } else if (desc.Type == "spinner") { - widget.type = WindowWidgetType::Spinner; + widget.type = WidgetType::spinner; widget.string = const_cast(desc.Text.c_str()); widget.flags |= WIDGET_FLAGS::TEXT_IS_STRING; widgetList.push_back(widget); // Add the increment button widget = {}; - widget.type = WindowWidgetType::Button; + widget.type = WidgetType::button; widget.colour = 1; widget.left = desc.X + desc.Width - 13; widget.right = widget.left + 11; @@ -1104,14 +1104,14 @@ namespace OpenRCT2::Ui::Windows } else if (desc.Type == "textbox") { - widget.type = WindowWidgetType::TextBox; + widget.type = WidgetType::textBox; widget.string = const_cast(desc.Text.c_str()); widget.flags |= WIDGET_FLAGS::TEXT_IS_STRING; widgetList.push_back(widget); } else if (desc.Type == "viewport") { - widget.type = WindowWidgetType::Viewport; + widget.type = WidgetType::viewport; widget.text = kStringIdNone; widgetList.push_back(widget); } diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp index 6e71873ab8..704201a2d4 100644 --- a/src/openrct2-ui/scripting/ScWidget.hpp +++ b/src/openrct2-ui/scripting/ScWidget.hpp @@ -72,50 +72,50 @@ namespace OpenRCT2::Scripting { switch (widget->type) { - case WindowWidgetType::Frame: + case WidgetType::frame: return "frame"; - case WindowWidgetType::Resize: + case WidgetType::resize: return "resize"; - case WindowWidgetType::ImgBtn: - case WindowWidgetType::TrnBtn: - case WindowWidgetType::FlatBtn: - case WindowWidgetType::Button: - case WindowWidgetType::CloseBox: + case WidgetType::imgBtn: + case WidgetType::trnBtn: + case WidgetType::flatBtn: + case WidgetType::button: + case WidgetType::closeBox: return "button"; - case WindowWidgetType::ColourBtn: + case WidgetType::colourBtn: return "colourpicker"; - case WindowWidgetType::Tab: + case WidgetType::tab: return "tab"; - case WindowWidgetType::LabelCentred: - case WindowWidgetType::Label: + case WidgetType::labelCentred: + case WidgetType::label: return "label"; - case WindowWidgetType::TableHeader: + case WidgetType::tableHeader: return "table_header"; - case WindowWidgetType::Spinner: + case WidgetType::spinner: return "spinner"; - case WindowWidgetType::DropdownMenu: + case WidgetType::dropdownMenu: return "dropdown"; - case WindowWidgetType::Viewport: + case WidgetType::viewport: return "viewport"; - case WindowWidgetType::Groupbox: + case WidgetType::groupbox: return "groupbox"; - case WindowWidgetType::Caption: + case WidgetType::caption: return "caption"; - case WindowWidgetType::Scroll: + case WidgetType::scroll: return "listview"; - case WindowWidgetType::Checkbox: + case WidgetType::checkbox: return "checkbox"; - case WindowWidgetType::TextBox: + case WidgetType::textBox: return "textbox"; - case WindowWidgetType::Empty: + case WidgetType::empty: return "empty"; - case WindowWidgetType::Placeholder: + case WidgetType::placeholder: return "placeholder"; - case WindowWidgetType::ProgressBar: + case WidgetType::progressBar: return "progress_bar"; - case WindowWidgetType::HorizontalSeparator: + case WidgetType::horizontalSeparator: return "horizontal_separator"; - case WindowWidgetType::Custom: + case WidgetType::custom: return "custom"; } } @@ -142,13 +142,13 @@ namespace OpenRCT2::Scripting widget->left += delta; widget->right += delta; - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { auto buttonWidget = widget + 1; buttonWidget->left += delta; buttonWidget->right += delta; } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { auto upWidget = widget + 1; upWidget->left += delta; @@ -185,13 +185,13 @@ namespace OpenRCT2::Scripting widget->top += delta; widget->bottom += delta; - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { auto buttonWidget = widget + 1; buttonWidget->top += delta; buttonWidget->bottom += delta; } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { auto upWidget = widget + 1; upWidget->top += delta; @@ -224,13 +224,13 @@ namespace OpenRCT2::Scripting Invalidate(); widget->right += delta; - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { auto buttonWidget = widget + 1; buttonWidget->left += delta; buttonWidget->right += delta; } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { auto upWidget = widget + 1; upWidget->left += delta; @@ -263,12 +263,12 @@ namespace OpenRCT2::Scripting Invalidate(); widget->bottom += delta; - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { auto buttonWidget = widget + 1; buttonWidget->bottom += delta; } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { auto upWidget = widget + 1; upWidget->bottom += delta; @@ -317,11 +317,11 @@ namespace OpenRCT2::Scripting auto widget = GetWidget(); if (widget != nullptr) { - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { Ui::WidgetSetDisabled(*w, _widgetIndex + 1, value); } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { Ui::WidgetSetDisabled(*w, _widgetIndex + 1, value); Ui::WidgetSetDisabled(*w, _widgetIndex + 2, value); @@ -350,11 +350,11 @@ namespace OpenRCT2::Scripting auto widget = GetWidget(); if (widget != nullptr) { - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { Ui::WidgetSetVisible(*w, _widgetIndex + 1, value); } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { Ui::WidgetSetVisible(*w, _widgetIndex + 1, value); Ui::WidgetSetVisible(*w, _widgetIndex + 2, value); @@ -425,11 +425,11 @@ namespace OpenRCT2::Scripting if (widget != nullptr) { auto* windowMgr = Ui::GetWindowManager(); - if (widget->type == WindowWidgetType::DropdownMenu) + if (widget->type == WidgetType::dropdownMenu) { windowMgr->InvalidateWidgetByNumber(_class, _number, _widgetIndex + 1); } - else if (widget->type == WindowWidgetType::Spinner) + else if (widget->type == WidgetType::spinner) { windowMgr->InvalidateWidgetByNumber(_class, _number, _widgetIndex + 1); windowMgr->InvalidateWidgetByNumber(_class, _number, _widgetIndex + 2); @@ -470,19 +470,19 @@ namespace OpenRCT2::Scripting auto widget = GetWidget(); if (widget != nullptr) { - return widget->type == WindowWidgetType::ImgBtn; + return widget->type == WidgetType::imgBtn; } return false; } void border_set(bool value) { auto widget = GetWidget(); - if (widget != nullptr && (widget->type == WindowWidgetType::FlatBtn || widget->type == WindowWidgetType::ImgBtn)) + if (widget != nullptr && (widget->type == WidgetType::flatBtn || widget->type == WidgetType::imgBtn)) { if (value) - widget->type = WindowWidgetType::ImgBtn; + widget->type = WidgetType::imgBtn; else - widget->type = WindowWidgetType::FlatBtn; + widget->type = WidgetType::flatBtn; Invalidate(); } } @@ -509,7 +509,7 @@ namespace OpenRCT2::Scripting uint32_t image_get() const { auto widget = GetWidget(); - if (widget != nullptr && (widget->type == WindowWidgetType::FlatBtn || widget->type == WindowWidgetType::ImgBtn)) + if (widget != nullptr && (widget->type == WidgetType::flatBtn || widget->type == WidgetType::imgBtn)) { if (GetTargetAPIVersion() <= kApiVersionG2Reorder) { @@ -523,7 +523,7 @@ namespace OpenRCT2::Scripting void image_set(DukValue value) { auto widget = GetWidget(); - if (widget != nullptr && (widget->type == WindowWidgetType::FlatBtn || widget->type == WindowWidgetType::ImgBtn)) + if (widget != nullptr && (widget->type == WidgetType::flatBtn || widget->type == WidgetType::imgBtn)) { widget->image = ImageId(ImageFromDuk(value)); Invalidate(); @@ -702,7 +702,7 @@ namespace OpenRCT2::Scripting auto* widget = GetWidget(); if (widget != nullptr) { - if (widget->type == WindowWidgetType::LabelCentred) + if (widget->type == WidgetType::labelCentred) { return "centred"; } @@ -716,9 +716,9 @@ namespace OpenRCT2::Scripting if (widget != nullptr) { if (value == "centred") - widget->type = WindowWidgetType::LabelCentred; + widget->type = WidgetType::labelCentred; else - widget->type = WindowWidgetType::Label; + widget->type = WidgetType::label; } } }; @@ -1000,7 +1000,7 @@ namespace OpenRCT2::Scripting if (w != nullptr && IsCustomWindow()) { auto widget = GetWidget(); - if (widget != nullptr && widget->type == WindowWidgetType::Viewport) + if (widget != nullptr && widget->type == WidgetType::viewport) { return std::make_shared(w->classification, w->number); } @@ -1016,28 +1016,28 @@ namespace OpenRCT2::Scripting auto n = w->number; switch (widget.type) { - case WindowWidgetType::Button: - case WindowWidgetType::FlatBtn: - case WindowWidgetType::ImgBtn: + case WidgetType::button: + case WidgetType::flatBtn: + case WidgetType::imgBtn: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::Checkbox: + case WidgetType::checkbox: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::ColourBtn: + case WidgetType::colourBtn: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::DropdownMenu: + case WidgetType::dropdownMenu: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::Groupbox: + case WidgetType::groupbox: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::Label: - case WindowWidgetType::LabelCentred: + case WidgetType::label: + case WidgetType::labelCentred: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::Scroll: + case WidgetType::scroll: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::Spinner: + case WidgetType::spinner: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::TextBox: + case WidgetType::textBox: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); - case WindowWidgetType::Viewport: + case WidgetType::viewport: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); default: return GetObjectAsDukValue(ctx, std::make_shared(c, n, widgetIndex)); diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index ecbbff4ff5..76db03ca44 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -60,21 +60,21 @@ namespace OpenRCT2::Ui::Windows static constexpr auto kMainWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, TABHEIGHT }, { WW, WH - TABHEIGHT }, WindowWidgetType::Frame, WindowColour::secondary), - makeRemapWidget({ 3, 17 }, { 91, TABHEIGHT - 16 }, WindowWidgetType::Tab, WindowColour::secondary, SPR_TAB_LARGE), - makeRemapWidget({ 94, 17 }, { 91, TABHEIGHT - 16 }, WindowWidgetType::Tab, WindowColour::secondary, SPR_TAB_LARGE)); + makeWidget({ 0, TABHEIGHT }, { WW, WH - TABHEIGHT }, WidgetType::frame, WindowColour::secondary), + makeRemapWidget({ 3, 17 }, { 91, TABHEIGHT - 16 }, WidgetType::tab, WindowColour::secondary, SPR_TAB_LARGE), + makeRemapWidget({ 94, 17 }, { 91, TABHEIGHT - 16 }, WidgetType::tab, WindowColour::secondary, SPR_TAB_LARGE)); // clang-format off static constexpr auto _windowAboutOpenRCT2Widgets = makeWidgets( kMainWidgets, - makeWidget({10, 60}, {WW - 20, 20}, WindowWidgetType::LabelCentred, WindowColour::secondary, STR_ABOUT_OPENRCT2_DESCRIPTION), // Introduction - makeWidget({30, 90}, {128, 128}, WindowWidgetType::Placeholder, WindowColour::secondary, kStringIdNone), // OpenRCT2 Logo - makeWidget({168, 100}, {173, 24}, WindowWidgetType::Placeholder, WindowColour::secondary, kStringIdNone), // Build version - makeWidget({344, 100 }, {24, 24}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_COPY), STR_COPY_BUILD_HASH ), // "Copy build info" button - makeWidget({168, 115 + 20}, {200, 14}, WindowWidgetType::Placeholder, WindowColour::secondary, STR_UPDATE_AVAILABLE ), // "new version" button - makeWidget({168, 115 + 40}, {200, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_CHANGELOG_ELLIPSIS), // changelog button - makeWidget({168, 115 + 60}, {200, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_JOIN_DISCORD ), // "join discord" button - makeWidget({168, 115 + 80}, {200, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_CONTRIBUTORS_WINDOW_BUTTON) // "contributors" button + makeWidget({10, 60}, {WW - 20, 20}, WidgetType::labelCentred, WindowColour::secondary, STR_ABOUT_OPENRCT2_DESCRIPTION), // Introduction + makeWidget({30, 90}, {128, 128}, WidgetType::placeholder, WindowColour::secondary, kStringIdNone), // OpenRCT2 Logo + makeWidget({168, 100}, {173, 24}, WidgetType::placeholder, WindowColour::secondary, kStringIdNone), // Build version + makeWidget({344, 100 }, {24, 24}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_COPY), STR_COPY_BUILD_HASH ), // "Copy build info" button + makeWidget({168, 115 + 20}, {200, 14}, WidgetType::placeholder, WindowColour::secondary, STR_UPDATE_AVAILABLE ), // "new version" button + makeWidget({168, 115 + 40}, {200, 14}, WidgetType::button, WindowColour::secondary, STR_CHANGELOG_ELLIPSIS), // changelog button + makeWidget({168, 115 + 60}, {200, 14}, WidgetType::button, WindowColour::secondary, STR_JOIN_DISCORD ), // "join discord" button + makeWidget({168, 115 + 80}, {200, 14}, WidgetType::button, WindowColour::secondary, STR_CONTRIBUTORS_WINDOW_BUTTON) // "contributors" button ); // clang-format on @@ -239,7 +239,7 @@ namespace OpenRCT2::Ui::Windows // Shows the update available button if (OpenRCT2::GetContext()->HasNewVersionInfo()) { - widgets[WIDX_NEW_VERSION].type = WindowWidgetType::Button; + widgets[WIDX_NEW_VERSION].type = WidgetType::button; } // Draw the rest of the text diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp index de97d15efe..b72e75af2e 100644 --- a/src/openrct2-ui/windows/AssetPacks.cpp +++ b/src/openrct2-ui/windows/AssetPacks.cpp @@ -43,12 +43,12 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowAssetPacksWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::LabelCentred, WindowColour::secondary, STR_HIGH_PRIORITY), - makeWidget({ 0, 0 }, { 0, 147 }, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL), - makeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::LabelCentred, WindowColour::secondary, STR_LOW_PRIORITY), - makeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_ARROW_UP), STR_INCREASE_PRIOTITY_TIP), - makeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_ARROW_DOWN), STR_DECREASE_PRIOTITY_TIP), - makeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_RELOAD), STR_RELOAD_ASSET_PACKS_TIP) + makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::labelCentred, WindowColour::secondary, STR_HIGH_PRIORITY), + makeWidget({ 0, 0 }, { 0, 147 }, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL), + makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::labelCentred, WindowColour::secondary, STR_LOW_PRIORITY), + makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_ARROW_UP), STR_INCREASE_PRIOTITY_TIP), + makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_ARROW_DOWN), STR_DECREASE_PRIOTITY_TIP), + makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_RELOAD), STR_RELOAD_ASSET_PACKS_TIP) ); // clang-format on diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 662342eb4e..aebd176c38 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -67,13 +67,13 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_banner_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 3, 17}, {85, 60}, WindowWidgetType::Viewport, WindowColour::secondary, 0x0FFFFFFFE ), // tab content panel - makeWidget({WW - 25, 19}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_CHANGE_BANNER_TEXT_TIP ), // change banner button - makeWidget({WW - 25, 43}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_NO_ENTRY), STR_SET_AS_NO_ENTRY_BANNER_TIP ), // no entry button - makeWidget({WW - 25, 67}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_BANNER_TIP ), // demolish button - makeWidget({ 5, WH - 16}, {12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // high money - makeWidget({ 43, WH - 16}, {39, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // high money - makeWidget({ 70, WH - 15}, {11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP ) // high money + makeWidget({ 3, 17}, {85, 60}, WidgetType::viewport, WindowColour::secondary, 0x0FFFFFFFE ), // tab content panel + makeWidget({WW - 25, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_CHANGE_BANNER_TEXT_TIP ), // change banner button + makeWidget({WW - 25, 43}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_NO_ENTRY), STR_SET_AS_NO_ENTRY_BANNER_TIP ), // no entry button + makeWidget({WW - 25, 67}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_BANNER_TIP ), // demolish button + makeWidget({ 5, WH - 16}, {12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // high money + makeWidget({ 43, WH - 16}, {39, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // high money + makeWidget({ 70, WH - 15}, {11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP ) // high money ); // clang-format on @@ -283,12 +283,12 @@ namespace OpenRCT2::Ui::Windows } Widget& colourBtn = widgets[WIDX_MAIN_COLOUR]; - colourBtn.type = WindowWidgetType::Empty; + colourBtn.type = WidgetType::empty; auto* bannerEntry = OpenRCT2::ObjectManager::GetObjectEntry(banner->type); if (bannerEntry != nullptr && (bannerEntry->flags & BANNER_ENTRY_FLAG_HAS_PRIMARY_COLOUR)) { - colourBtn.type = WindowWidgetType::ColourBtn; + colourBtn.type = WidgetType::colourBtn; } pressed_widgets &= ~(1uLL << WIDX_BANNER_NO_ENTRY); disabled_widgets &= ~( diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 7589cb41ef..48b9c4db41 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -44,9 +44,9 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _windowChangelogWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({0, 14}, {500, 382}, WindowWidgetType::Resize, WindowColour::secondary ), // content panel - makeWidget({3, 16}, {495, 366}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_BOTH ), // scroll area - makeWidget({3, 473}, {300, 14}, WindowWidgetType::Placeholder, WindowColour::secondary, STR_NEW_RELEASE_DOWNLOAD_PAGE) // changelog button + makeWidget({0, 14}, {500, 382}, WidgetType::resize, WindowColour::secondary ), // content panel + makeWidget({3, 16}, {495, 366}, WidgetType::scroll, WindowColour::secondary, SCROLL_BOTH ), // scroll area + makeWidget({3, 473}, {300, 14}, WidgetType::placeholder, WindowColour::secondary, STR_NEW_RELEASE_DOWNLOAD_PAGE) // changelog button ); // clang-format on @@ -95,7 +95,7 @@ namespace OpenRCT2::Ui::Windows } _personality = WV_NEW_VERSION_INFO; NewVersionProcessInfo(); - widgets[WIDX_OPEN_URL].type = WindowWidgetType::Button; + widgets[WIDX_OPEN_URL].type = WidgetType::button; return true; case WV_CHANGELOG: diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index e33f1052c8..34cd3989b2 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -211,7 +211,7 @@ static constexpr int32_t kTabStart = 3; static constexpr auto kMainCheatWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {WW, 257}, WindowWidgetType::Resize, WindowColour::secondary), /* tab content panel */ + makeWidget({ 0, 43}, {WW, 257}, WidgetType::resize, WindowColour::secondary), /* tab content panel */ makeTab ({ 3, 17}, STR_FINANCIAL_CHEATS_TIP ), /* tab 1 */ makeTab ({ 34, 17}, STR_DATE_CHEATS_TIP ), /* tab 2 */ makeTab ({ 65, 17}, STR_GUEST_CHEATS_TIP ), /* tab 3 */ @@ -223,131 +223,131 @@ static constexpr auto kMainCheatWidgets = makeWidgets( static constexpr auto window_cheats_money_widgets = makeWidgets( kMainCheatWidgets, - makeWidget ({ 11, 48}, CHEAT_BUTTON, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAKE_PARK_NO_MONEY), // No money - makeWidget ({ 5, 69}, {238, 69}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_ADD_SET_MONEY ), // add / set money group frame - makeSpinnerWidgets({ 11, 92}, CHEAT_SPINNER, WindowWidgetType::Spinner, WindowColour::secondary ), // money value - makeWidget ({ 11, 111}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_ADD_MONEY ), // add money - makeWidget ({127, 111}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_SET_MONEY ), // set money - makeWidget ({ 11, 145}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_CLEAR_LOAN ) // Clear loan + makeWidget ({ 11, 48}, CHEAT_BUTTON, WidgetType::checkbox, WindowColour::secondary, STR_MAKE_PARK_NO_MONEY), // No money + makeWidget ({ 5, 69}, {238, 69}, WidgetType::groupbox, WindowColour::secondary, STR_ADD_SET_MONEY ), // add / set money group frame + makeSpinnerWidgets({ 11, 92}, CHEAT_SPINNER, WidgetType::spinner, WindowColour::secondary ), // money value + makeWidget ({ 11, 111}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_ADD_MONEY ), // add money + makeWidget ({127, 111}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_SET_MONEY ), // set money + makeWidget ({ 11, 145}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_CLEAR_LOAN ) // Clear loan ); static constexpr auto window_cheats_date_widgets = makeWidgets( kMainCheatWidgets, - makeWidget ({ 5, 48}, {238, 99} , WindowWidgetType::Groupbox, WindowColour::secondary, STR_DATE_SET ), // Date group - makeSpinnerWidgets({120, 61}, CHEAT_SPINNER, WindowWidgetType::Spinner, WindowColour::secondary ), // Year box - makeSpinnerWidgets({120, 82}, CHEAT_SPINNER, WindowWidgetType::Spinner, WindowColour::secondary ), // Month box - makeSpinnerWidgets({120, 103}, CHEAT_SPINNER, WindowWidgetType::Spinner, WindowColour::secondary ), // Day box - makeWidget ({ 11, 122}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_DATE_SET ), // Set Date - makeWidget ({127, 122}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_DATE_RESET) // Reset Date + makeWidget ({ 5, 48}, {238, 99} , WidgetType::groupbox, WindowColour::secondary, STR_DATE_SET ), // Date group + makeSpinnerWidgets({120, 61}, CHEAT_SPINNER, WidgetType::spinner, WindowColour::secondary ), // Year box + makeSpinnerWidgets({120, 82}, CHEAT_SPINNER, WidgetType::spinner, WindowColour::secondary ), // Month box + makeSpinnerWidgets({120, 103}, CHEAT_SPINNER, WidgetType::spinner, WindowColour::secondary ), // Day box + makeWidget ({ 11, 122}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_DATE_SET ), // Set Date + makeWidget ({127, 122}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_DATE_RESET) // Reset Date ); static constexpr auto window_cheats_guests_widgets = makeWidgets( kMainCheatWidgets, - makeWidget({ 11, 48}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_LARGE_TRAM_GUESTS_TIP), // large tram - makeWidget({127, 48}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_REMOVE_ALL_GUESTS_TIP), // remove all guests + makeWidget({ 11, 48}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_LARGE_TRAM_GUESTS_TIP), // large tram + makeWidget({127, 48}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_REMOVE_ALL_GUESTS_TIP), // remove all guests - makeWidget({ 5, 70}, {238, 206}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_SET_GUESTS_PARAMETERS ), // Guests parameters group frame - makeWidget({183, 84}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // happiness max - makeWidget({127, 84}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // happiness min - makeWidget({183, 105}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // energy max - makeWidget({127, 105}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // energy min - makeWidget({183, 126}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // hunger max - makeWidget({127, 126}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // hunger min - makeWidget({183, 147}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // thirst max - makeWidget({127, 147}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // thirst min - makeWidget({183, 168}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // nausea max - makeWidget({127, 168}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // nausea min - makeWidget({183, 189}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // nausea tolerance max - makeWidget({127, 189}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // nausea tolerance min - makeWidget({183, 210}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MAX ), // toilet max - makeWidget({127, 210}, MINMAX_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_MIN ), // toilet min - makeWidget({127, 251}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_MORE_THAN_1 ), // ride intensity > 1 - makeWidget({ 11, 251}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_LESS_THAN_15 ), // ride intensity < 15 + makeWidget({ 5, 70}, {238, 206}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_SET_GUESTS_PARAMETERS ), // Guests parameters group frame + makeWidget({183, 84}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // happiness max + makeWidget({127, 84}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // happiness min + makeWidget({183, 105}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // energy max + makeWidget({127, 105}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // energy min + makeWidget({183, 126}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // hunger max + makeWidget({127, 126}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // hunger min + makeWidget({183, 147}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // thirst max + makeWidget({127, 147}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // thirst min + makeWidget({183, 168}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // nausea max + makeWidget({127, 168}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // nausea min + makeWidget({183, 189}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // nausea tolerance max + makeWidget({127, 189}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // nausea tolerance min + makeWidget({183, 210}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MAX ), // toilet max + makeWidget({127, 210}, MINMAX_BUTTON, WidgetType::button, WindowColour::secondary, STR_MIN ), // toilet min + makeWidget({127, 251}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_MORE_THAN_1 ), // ride intensity > 1 + makeWidget({ 11, 251}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_LESS_THAN_15 ), // ride intensity < 15 - makeWidget({ 5, 258+15+6+2}, {238, 62}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_GIVE_ALL_GUESTS ), // Guests inventory group frame - makeWidget({ 11, 279+15+6-3}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CURRENCY_FORMAT ), // give guests money - makeWidget({127, 279+15+6-3}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_SHOP_ITEM_PLURAL_PARK_MAP ), // give guests park maps - makeWidget({ 11, 300+15+6-3}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_SHOP_ITEM_PLURAL_BALLOON ), // give guests balloons - makeWidget({127, 300+15+6-3}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_SHOP_ITEM_PLURAL_UMBRELLA ), // give guests umbrellas + makeWidget({ 5, 258+15+6+2}, {238, 62}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_GIVE_ALL_GUESTS ), // Guests inventory group frame + makeWidget({ 11, 279+15+6-3}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CURRENCY_FORMAT ), // give guests money + makeWidget({127, 279+15+6-3}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_SHOP_ITEM_PLURAL_PARK_MAP ), // give guests park maps + makeWidget({ 11, 300+15+6-3}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_SHOP_ITEM_PLURAL_BALLOON ), // give guests balloons + makeWidget({127, 300+15+6-3}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_SHOP_ITEM_PLURAL_UMBRELLA ), // give guests umbrellas - makeWidget({ 5, 342+6}, {238, 85}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GUEST_BEHAVIOUR ), // Guests behaviour group frame - makeWidget({ 11, 363+1}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_IGNORE_INTENSITY_TIP ), // guests ignore intensity - makeWidget({ 11, 380+1}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_IGNORE_PRICE, STR_CHEAT_IGNORE_PRICE_TIP ), // guests ignore price - makeWidget({ 11, 397+1}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_VANDALISM, STR_CHEAT_DISABLE_VANDALISM_TIP), // disable vandalism - makeWidget({ 11, 414+1}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_LITTERING, STR_CHEAT_DISABLE_LITTERING_TIP) // disable littering + makeWidget({ 5, 342+6}, {238, 85}, WidgetType::groupbox, WindowColour::secondary, STR_GUEST_BEHAVIOUR ), // Guests behaviour group frame + makeWidget({ 11, 363+1}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_IGNORE_INTENSITY_TIP ), // guests ignore intensity + makeWidget({ 11, 380+1}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_IGNORE_PRICE, STR_CHEAT_IGNORE_PRICE_TIP ), // guests ignore price + makeWidget({ 11, 397+1}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_VANDALISM, STR_CHEAT_DISABLE_VANDALISM_TIP), // disable vandalism + makeWidget({ 11, 414+1}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_LITTERING, STR_CHEAT_DISABLE_LITTERING_TIP) // disable littering ); static constexpr auto window_cheats_staff_widgets = makeWidgets( kMainCheatWidgets, - makeWidget ({ 5, 357-309}, {238, 35}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_STAFF_GROUP ), // Staff group - makeWidget ({126, 371-309}, {111, 14}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Staff speed - makeWidget ({225, 372-309}, { 11, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // Staff speed + makeWidget ({ 5, 357-309}, {238, 35}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_STAFF_GROUP ), // Staff group + makeWidget ({126, 371-309}, {111, 14}, WidgetType::dropdownMenu, WindowColour::secondary ), // Staff speed + makeWidget ({225, 372-309}, { 11, 12}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // Staff speed - makeWidget ({ 5, 257-168}, {238, 99}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_MAINTENANCE_GROUP ), // Maintenance group - makeWidget ({ 11, 271-168}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_REMOVE_LITTER ), // Remove litter - makeWidget ({127, 271-168}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_FIX_VANDALISM ), // Fix vandalism - makeWidget ({ 11, 292-168}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_CLEAR_GRASS ), // Clear grass - makeWidget ({127, 292-168}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_MOWED_GRASS ), // Mowed grass - makeWidget ({ 11, 313-168}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_WATER_PLANTS ), // Water plants - makeWidget ({ 11, 334-164}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_PLANT_AGING, STR_CHEAT_DISABLE_PLANT_AGING_TIP ) // Disable plant ageing + makeWidget ({ 5, 257-168}, {238, 99}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_MAINTENANCE_GROUP ), // Maintenance group + makeWidget ({ 11, 271-168}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_REMOVE_LITTER ), // Remove litter + makeWidget ({127, 271-168}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_FIX_VANDALISM ), // Fix vandalism + makeWidget ({ 11, 292-168}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_CLEAR_GRASS ), // Clear grass + makeWidget ({127, 292-168}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_MOWED_GRASS ), // Mowed grass + makeWidget ({ 11, 313-168}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_WATER_PLANTS ), // Water plants + makeWidget ({ 11, 334-164}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_PLANT_AGING, STR_CHEAT_DISABLE_PLANT_AGING_TIP ) // Disable plant ageing ); static constexpr auto window_cheats_park_widgets = makeWidgets( kMainCheatWidgets, - makeWidget ({ 5, 48}, {238, 60}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_GENERAL_GROUP ), // General group - makeWidget ({ 11, 62}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_OWN_ALL_LAND, STR_CHEAT_OWN_ALL_LAND_TIP ), // Own all land - makeWidget ({127, 62}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_REMOVE_PARK_FENCES, STR_CHEAT_REMOVE_PARK_FENCES_TIP ), // Remove park fences - makeWidget ({ 11, 83}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_OPEN_PARK, STR_CHEAT_OPEN_PARK_TIP ), // open / close park + makeWidget ({ 5, 48}, {238, 60}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_GENERAL_GROUP ), // General group + makeWidget ({ 11, 62}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_OWN_ALL_LAND, STR_CHEAT_OWN_ALL_LAND_TIP ), // Own all land + makeWidget ({127, 62}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_REMOVE_PARK_FENCES, STR_CHEAT_REMOVE_PARK_FENCES_TIP ), // Remove park fences + makeWidget ({ 11, 83}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_OPEN_PARK, STR_CHEAT_OPEN_PARK_TIP ), // open / close park - makeWidget ({ 5, 113}, {238, 75}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_OBJECTIVE_GROUP ), // Objective group - makeWidget ({ 11, 128}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP), // never ending marketing campaigns - makeWidget ({ 11, 145}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_FORCE_PARK_RATING ), // Force park rating - makeSpinnerWidgets({156, 143}, { 81, 14}, WindowWidgetType::Spinner, WindowColour::secondary ), // park rating (3 widgets) - makeWidget ({ 11, 163}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_WIN_SCENARIO ), // Win scenario - makeWidget ({127, 163}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_HAVE_FUN ), // Have fun! + makeWidget ({ 5, 113}, {238, 75}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_OBJECTIVE_GROUP ), // Objective group + makeWidget ({ 11, 128}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP), // never ending marketing campaigns + makeWidget ({ 11, 145}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_FORCE_PARK_RATING ), // Force park rating + makeSpinnerWidgets({156, 143}, { 81, 14}, WidgetType::spinner, WindowColour::secondary ), // park rating (3 widgets) + makeWidget ({ 11, 163}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_WIN_SCENARIO ), // Win scenario + makeWidget ({127, 163}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_HAVE_FUN ), // Have fun! - makeWidget ({ 5, 192}, {238, 68}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_GROUP_CONSTRUCTION ), // Construction group - makeWidget ({ 11, 207}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP ), // Build in pause mode - makeWidget ({ 11, 224}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_PATH_AS_QUEUE, STR_CHEAT_ALLOW_PATH_AS_QUEUE_TIP ), // Allow regular footpaths as queue path - makeWidget ({ 11, 241}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_SPECIAL_COLOUR_SCHEMES, STR_CHEAT_ALLOW_SPECIAL_COLOUR_SCHEMES_TIP) // Allow special colours in dropdown + makeWidget ({ 5, 192}, {238, 68}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_GROUP_CONSTRUCTION ), // Construction group + makeWidget ({ 11, 207}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP ), // Build in pause mode + makeWidget ({ 11, 224}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_PATH_AS_QUEUE, STR_CHEAT_ALLOW_PATH_AS_QUEUE_TIP ), // Allow regular footpaths as queue path + makeWidget ({ 11, 241}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_SPECIAL_COLOUR_SCHEMES, STR_CHEAT_ALLOW_SPECIAL_COLOUR_SCHEMES_TIP) // Allow special colours in dropdown ); static constexpr auto window_cheats_rides_widgets = makeWidgets( kMainCheatWidgets, - makeWidget({ 11, 48}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_FIX_ALL_RIDES_TIP ), // Fix all rides - makeWidget({127, 48}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_RENEW_RIDES, STR_CHEAT_RENEW_RIDES_TIP ), // Renew rides - makeWidget({127, 69}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_RESET_CRASH_STATUS, STR_CHEAT_RESET_CRASH_STATUS_TIP ), // Reset crash status - makeWidget({ 11, 69}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CHEAT_10_MINUTE_INSPECTIONS, STR_CHEAT_10_MINUTE_INSPECTIONS_TIP ), // 10 minute inspections + makeWidget({ 11, 48}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_FIX_ALL_RIDES_TIP ), // Fix all rides + makeWidget({127, 48}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_RENEW_RIDES, STR_CHEAT_RENEW_RIDES_TIP ), // Renew rides + makeWidget({127, 69}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_RESET_CRASH_STATUS, STR_CHEAT_RESET_CRASH_STATUS_TIP ), // Reset crash status + makeWidget({ 11, 69}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CHEAT_10_MINUTE_INSPECTIONS, STR_CHEAT_10_MINUTE_INSPECTIONS_TIP ), // 10 minute inspections - makeWidget({ 5, 95}, {238, 87}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_GROUP_CONSTRUCTION ), // Construction group - makeWidget({ 11, 111}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES_TIP ), // Show all drawable track pieces - makeWidget({ 11, 128}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK_TIP ), // Enable chain lift on all track - makeWidget({ 11, 145}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS_TIP), // Allow track place at invalid heights - makeWidget({ 11, 162}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP ), // All destructible + makeWidget({ 5, 95}, {238, 87}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_GROUP_CONSTRUCTION ), // Construction group + makeWidget({ 11, 111}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES_TIP ), // Show all drawable track pieces + makeWidget({ 11, 128}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK_TIP ), // Enable chain lift on all track + makeWidget({ 11, 145}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS_TIP), // Allow track place at invalid heights + makeWidget({ 11, 162}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP ), // All destructible - makeWidget({ 5, 186}, {238, 102}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_GROUP_OPERATION ), // Operation group - makeWidget({ 11, 201}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_SHOW_ALL_OPERATING_MODES ), // Show all operating modes - makeWidget({ 11, 218}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_UNLOCK_OPERATING_LIMITS, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP ), // 410 km/h lift hill etc. - makeWidget({ 11, 235}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP ), // Disable brakes failure - makeWidget({ 11, 252}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_BREAKDOWNS, STR_CHEAT_DISABLE_BREAKDOWNS_TIP ), // Disable all breakdowns - makeWidget({ 11, 269}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_RIDE_VALUE_AGING, STR_CHEAT_DISABLE_RIDE_VALUE_AGING_TIP ), // Disable ride ageing + makeWidget({ 5, 186}, {238, 102}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_GROUP_OPERATION ), // Operation group + makeWidget({ 11, 201}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_SHOW_ALL_OPERATING_MODES ), // Show all operating modes + makeWidget({ 11, 218}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_UNLOCK_OPERATING_LIMITS, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP ), // 410 km/h lift hill etc. + makeWidget({ 11, 235}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP ), // Disable brakes failure + makeWidget({ 11, 252}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_BREAKDOWNS, STR_CHEAT_DISABLE_BREAKDOWNS_TIP ), // Disable all breakdowns + makeWidget({ 11, 269}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_RIDE_VALUE_AGING, STR_CHEAT_DISABLE_RIDE_VALUE_AGING_TIP ), // Disable ride ageing - makeWidget({ 5, 292}, {238, 86}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_GROUP_AVAILABILITY ), // Availability group - makeWidget({ 11, 308}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES_TIP), // Allow arbitrary ride type changes - makeWidget({ 11, 325}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES ), // Show vehicles from other track types - makeWidget({ 11, 342}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT_TIP ), // Disable train length limits - makeWidget({ 11, 359}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_IGNORE_RESEARCH_STATUS, STR_CHEAT_IGNORE_RESEARCH_STATUS_TIP ) // Ignore Research Status + makeWidget({ 5, 292}, {238, 86}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_GROUP_AVAILABILITY ), // Availability group + makeWidget({ 11, 308}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES_TIP), // Allow arbitrary ride type changes + makeWidget({ 11, 325}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES ), // Show vehicles from other track types + makeWidget({ 11, 342}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT_TIP ), // Disable train length limits + makeWidget({ 11, 359}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_IGNORE_RESEARCH_STATUS, STR_CHEAT_IGNORE_RESEARCH_STATUS_TIP ) // Ignore Research Status ); static constexpr auto window_cheats_weather_widgets = makeWidgets( kMainCheatWidgets, - makeWidget ({ 5, 48}, {238, 50}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CHEAT_WEATHER_GROUP ), // Weather group - makeWidget ({126, 62}, {111, 14}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdNone, STR_CHANGE_WEATHER_TOOLTIP ), // Force weather - makeWidget ({225, 63}, { 11, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_CHANGE_WEATHER_TOOLTIP ), // Force weather - makeWidget ({ 11, 80}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CHEAT_FREEZE_WEATHER, STR_CHEAT_FREEZE_WEATHER_TIP), // Freeze weather - makeWidget ({ 5, 102}, {238, 37}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_FAUNA ), // Fauna group - makeWidget ({ 11, 115}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_CREATE_DUCKS, STR_CREATE_DUCKS_TIP ), // Create ducks - makeWidget ({127, 115}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::secondary, STR_REMOVE_DUCKS, STR_REMOVE_DUCKS_TIP ) // Remove ducks + makeWidget ({ 5, 48}, {238, 50}, WidgetType::groupbox, WindowColour::secondary, STR_CHEAT_WEATHER_GROUP ), // Weather group + makeWidget ({126, 62}, {111, 14}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdNone, STR_CHANGE_WEATHER_TOOLTIP ), // Force weather + makeWidget ({225, 63}, { 11, 12}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_CHANGE_WEATHER_TOOLTIP ), // Force weather + makeWidget ({ 11, 80}, CHEAT_CHECK, WidgetType::checkbox, WindowColour::secondary, STR_CHEAT_FREEZE_WEATHER, STR_CHEAT_FREEZE_WEATHER_TIP), // Freeze weather + makeWidget ({ 5, 102}, {238, 37}, WidgetType::groupbox, WindowColour::secondary, STR_FAUNA ), // Fauna group + makeWidget ({ 11, 115}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_CREATE_DUCKS, STR_CREATE_DUCKS_TIP ), // Create ducks + makeWidget ({127, 115}, CHEAT_BUTTON, WidgetType::button, WindowColour::secondary, STR_REMOVE_DUCKS, STR_REMOVE_DUCKS_TIP ) // Remove ducks ); static constexpr std::span window_cheats_page_widgets[] = diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 26aee03fe4..107f53d510 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -46,12 +46,12 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_clear_scenery_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({ 27, 17 }, { 44, 32 }, WindowWidgetType::ImgBtn, WindowColour::primary, SPR_LAND_TOOL_SIZE_0, kStringIdNone ), // preview box - makeRemapWidget({ 28, 18 }, { 16, 16 }, WindowWidgetType::TrnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size - makeRemapWidget({ 54, 32 }, { 16, 16 }, WindowWidgetType::TrnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size - makeRemapWidget({ 7, 53 }, CLEAR_SCENERY_BUTTON, WindowWidgetType::FlatBtn, WindowColour::secondary, SPR_G2_BUTTON_TREES, STR_CLEAR_SCENERY_REMOVE_SMALL_SCENERY_TIP), // small scenery - makeRemapWidget({ 37, 53 }, CLEAR_SCENERY_BUTTON, WindowWidgetType::FlatBtn, WindowColour::secondary, SPR_G2_BUTTON_LARGE_SCENERY, STR_CLEAR_SCENERY_REMOVE_LARGE_SCENERY_TIP), // large scenery - makeRemapWidget({ 67, 53 }, CLEAR_SCENERY_BUTTON, WindowWidgetType::FlatBtn, WindowColour::secondary, SPR_G2_BUTTON_FOOTPATH, STR_CLEAR_SCENERY_REMOVE_FOOTPATHS_TIP ) // footpaths + makeWidget ({ 27, 17 }, { 44, 32 }, WidgetType::imgBtn, WindowColour::primary, SPR_LAND_TOOL_SIZE_0, kStringIdNone ), // preview box + makeRemapWidget({ 28, 18 }, { 16, 16 }, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size + makeRemapWidget({ 54, 32 }, { 16, 16 }, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size + makeRemapWidget({ 7, 53 }, CLEAR_SCENERY_BUTTON, WidgetType::flatBtn, WindowColour::secondary, SPR_G2_BUTTON_TREES, STR_CLEAR_SCENERY_REMOVE_SMALL_SCENERY_TIP), // small scenery + makeRemapWidget({ 37, 53 }, CLEAR_SCENERY_BUTTON, WidgetType::flatBtn, WindowColour::secondary, SPR_G2_BUTTON_LARGE_SCENERY, STR_CLEAR_SCENERY_REMOVE_LARGE_SCENERY_TIP), // large scenery + makeRemapWidget({ 67, 53 }, CLEAR_SCENERY_BUTTON, WidgetType::flatBtn, WindowColour::secondary, SPR_G2_BUTTON_FOOTPATH, STR_CLEAR_SCENERY_REMOVE_FOOTPATHS_TIP ) // footpaths ); // clang-format on diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 64a7e72772..4684a69671 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -42,10 +42,10 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_custom_currency_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeSpinnerWidgets({100, 30}, {101, 11}, WindowWidgetType::Spinner, WindowColour::secondary, STR_CURRENCY_FORMAT), // NB: 3 widgets - makeWidget ({120, 50}, { 81, 11}, WindowWidgetType::Button, WindowColour::secondary, kStringIdEmpty ), - makeWidget ({220, 50}, {131, 11}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget ({339, 51}, { 11, 9}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ) + makeSpinnerWidgets({100, 30}, {101, 11}, WidgetType::spinner, WindowColour::secondary, STR_CURRENCY_FORMAT), // NB: 3 widgets + makeWidget ({120, 50}, { 81, 11}, WidgetType::button, WindowColour::secondary, kStringIdEmpty ), + makeWidget ({220, 50}, {131, 11}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget ({339, 51}, { 11, 9}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ) ); // clang-format on diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 2a92ee1d93..99d08fba08 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -36,13 +36,13 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr Widget window_debug_paint_widgets[] = { - makeWidget({0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT}, WindowWidgetType::Frame, WindowColour::primary ), - makeWidget({8, 8 + 15 * 0}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_WIDE_PATHS ), - makeWidget({8, 8 + 15 * 1}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_BLOCKED_TILES ), - makeWidget({8, 8 + 15 * 2}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS), - makeWidget({8, 8 + 15 * 3}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_BOUND_BOXES ), - makeWidget({8, 8 + 15 * 4}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS ), - makeWidget({8, 8 + 15 * 5}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DEBUG_PAINT_STABLE_SORT ), + makeWidget({0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT}, WidgetType::frame, WindowColour::primary ), + makeWidget({8, 8 + 15 * 0}, { 185, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_WIDE_PATHS ), + makeWidget({8, 8 + 15 * 1}, { 185, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_BLOCKED_TILES ), + makeWidget({8, 8 + 15 * 2}, { 185, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS), + makeWidget({8, 8 + 15 * 3}, { 185, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_BOUND_BOXES ), + makeWidget({8, 8 + 15 * 4}, { 185, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS ), + makeWidget({8, 8 + 15 * 5}, { 185, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DEBUG_PAINT_STABLE_SORT ), }; // clang-format on diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 4441bf2923..41a3f2d15b 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -35,8 +35,8 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_ride_demolish_widgets = makeWidgets( makeWindowShim(STR_DEMOLISH_RIDE, WW, WH), - makeWidget({ 10, WH - 22}, {85, 14}, WindowWidgetType::Button, WindowColour::primary, STR_DEMOLISH ), - makeWidget({WW - 95, WH - 22}, {85, 14}, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) + makeWidget({ 10, WH - 22}, {85, 14}, WidgetType::button, WindowColour::primary, STR_DEMOLISH ), + makeWidget({WW - 95, WH - 22}, {85, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); // clang-format on diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index af755e3e33..4b50a771d1 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -43,7 +43,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr Widget kWindowDropdownWidgets[] = { - makeWidget({ 0, 0 }, { 1, 1 }, WindowWidgetType::ImgBtn, WindowColour::primary), + makeWidget({ 0, 0 }, { 1, 1 }, WidgetType::imgBtn, WindowColour::primary), }; std::array gDropdownItems; diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index b2a29b52ce..0c22222bd0 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -41,10 +41,10 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr Widget kEditorBottomToolbarWidgets[] = { - makeWidget({ 0, 0}, {200, 34}, WindowWidgetType::ImgBtn, WindowColour::primary), - makeWidget({ 2, 2}, {196, 30}, WindowWidgetType::FlatBtn, WindowColour::primary), - makeWidget({440, 0}, {200, 34}, WindowWidgetType::ImgBtn, WindowColour::primary), - makeWidget({442, 2}, {196, 30}, WindowWidgetType::FlatBtn, WindowColour::primary), + makeWidget({ 0, 0}, {200, 34}, WidgetType::imgBtn, WindowColour::primary), + makeWidget({ 2, 2}, {196, 30}, WidgetType::flatBtn, WindowColour::primary), + makeWidget({440, 0}, {200, 34}, WidgetType::imgBtn, WindowColour::primary), + makeWidget({442, 2}, {196, 30}, WidgetType::flatBtn, WindowColour::primary), }; // clang-format on @@ -92,10 +92,10 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_NEXT_STEP_BUTTON].left = screenWidth - 198; widgets[WIDX_NEXT_STEP_BUTTON].right = screenWidth - 3; - widgets[WIDX_PREVIOUS_STEP_BUTTON].type = WindowWidgetType::FlatBtn; - widgets[WIDX_NEXT_STEP_BUTTON].type = WindowWidgetType::FlatBtn; - widgets[WIDX_PREVIOUS_IMAGE].type = WindowWidgetType::ImgBtn; - widgets[WIDX_NEXT_IMAGE].type = WindowWidgetType::ImgBtn; + widgets[WIDX_PREVIOUS_STEP_BUTTON].type = WidgetType::flatBtn; + widgets[WIDX_NEXT_STEP_BUTTON].type = WidgetType::flatBtn; + widgets[WIDX_PREVIOUS_IMAGE].type = WidgetType::imgBtn; + widgets[WIDX_NEXT_IMAGE].type = WidgetType::imgBtn; auto& gameState = getGameState(); if (gLegacyScene == LegacyScene::trackDesignsManager || gameState.editorStep == EditorStep::SaveScenario) @@ -119,8 +119,8 @@ namespace OpenRCT2::Ui::Windows void OnDraw(RenderTarget& rt) override { - auto drawPreviousButton = widgets[WIDX_PREVIOUS_STEP_BUTTON].type != WindowWidgetType::Empty; - auto drawNextButton = widgets[WIDX_NEXT_STEP_BUTTON].type != WindowWidgetType::Empty; + auto drawPreviousButton = widgets[WIDX_PREVIOUS_STEP_BUTTON].type != WidgetType::empty; + auto drawNextButton = widgets[WIDX_NEXT_STEP_BUTTON].type != WidgetType::empty; if (drawPreviousButton) DrawLeftButtonBack(rt); @@ -316,14 +316,14 @@ namespace OpenRCT2::Ui::Windows void HidePreviousStepButton() { - widgets[WIDX_PREVIOUS_STEP_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_PREVIOUS_IMAGE].type = WindowWidgetType::Empty; + widgets[WIDX_PREVIOUS_STEP_BUTTON].type = WidgetType::empty; + widgets[WIDX_PREVIOUS_IMAGE].type = WidgetType::empty; } void HideNextStepButton() { - widgets[WIDX_NEXT_STEP_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_NEXT_IMAGE].type = WindowWidgetType::Empty; + widgets[WIDX_NEXT_STEP_BUTTON].type = WidgetType::empty; + widgets[WIDX_NEXT_IMAGE].type = WidgetType::empty; } void DrawLeftButtonBack(RenderTarget& rt) diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index a9b76522df..c779d21c5a 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -54,18 +54,18 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _inventionListWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {600, 357}, WindowWidgetType::Resize, WindowColour::secondary ), + makeWidget({ 0, 43}, {600, 357}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17} ), - makeWidget({ 4, 56}, {368, 161}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), - makeWidget({ 4, 231}, {368, 157}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), - makeWidget({431, 106}, {114, 114}, WindowWidgetType::FlatBtn, WindowColour::secondary ), - makeWidget({375, 343}, {220, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_MOVE_ALL_TOP ), - makeWidget({375, 358}, {220, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_MOVE_ALL_BOTTOM ), - makeWidget({375, 373}, {220, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP) + makeWidget({ 4, 56}, {368, 161}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), + makeWidget({ 4, 231}, {368, 157}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), + makeWidget({431, 106}, {114, 114}, WidgetType::flatBtn, WindowColour::secondary ), + makeWidget({375, 343}, {220, 14}, WidgetType::button, WindowColour::secondary, STR_MOVE_ALL_TOP ), + makeWidget({375, 358}, {220, 14}, WidgetType::button, WindowColour::secondary, STR_MOVE_ALL_BOTTOM ), + makeWidget({375, 373}, {220, 14}, WidgetType::button, WindowColour::secondary, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP) ); static constexpr auto _inventionListDragWidgets = makeWidgets( - makeWidget({0, 0}, {150, 14}, WindowWidgetType::ImgBtn, WindowColour::primary) + makeWidget({0, 0}, {150, 14}, WidgetType::imgBtn, WindowColour::primary) ); // clang-format on @@ -445,8 +445,7 @@ namespace OpenRCT2::Ui::Windows pressed_widgets |= 1uLL << WIDX_PREVIEW; pressed_widgets |= 1uLL << WIDX_TAB_1; - widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WindowWidgetType::Empty - : WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; int16_t scrollListHeight = (height - 88) / 2; diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 6ed6f69c3f..b6175dec34 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -219,14 +219,14 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _window_editor_object_selection_widgets = makeWidgets( makeWindowShim (WINDOW_TITLE, WW, WH), - makeWidget ({ 0, 43}, {WW, 357}, WindowWidgetType::Resize, WindowColour::secondary ), - makeWidget ({ 4, 60}, {288, 277}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), - makeWidget ({391, 45}, {114, 114}, WindowWidgetType::FlatBtn, WindowColour::secondary ), - makeWidget ({340, 22}, {122, 14}, WindowWidgetType::Button, WindowColour::primary, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ), - makeDropdownWidgets({470, 22}, {114, 14}, WindowWidgetType::DropdownMenu, WindowColour::primary, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ), - makeWidget ({ 4, 45}, {211, 14}, WindowWidgetType::TextBox, WindowColour::secondary ), - makeWidget ({218, 45}, { 70, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_OBJECT_SEARCH_CLEAR ), - makeWidget ({ 3, 73}, {285, 4}, WindowWidgetType::ImgBtn, WindowColour::secondary ), + makeWidget ({ 0, 43}, {WW, 357}, WidgetType::resize, WindowColour::secondary ), + makeWidget ({ 4, 60}, {288, 277}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), + makeWidget ({391, 45}, {114, 114}, WidgetType::flatBtn, WindowColour::secondary ), + makeWidget ({340, 22}, {122, 14}, WidgetType::button, WindowColour::primary, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ), + makeDropdownWidgets({470, 22}, {114, 14}, WidgetType::dropdownMenu, WindowColour::primary, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ), + makeWidget ({ 4, 45}, {211, 14}, WidgetType::textBox, WindowColour::secondary ), + makeWidget ({218, 45}, { 70, 14}, WidgetType::button, WindowColour::secondary, STR_OBJECT_SEARCH_CLEAR ), + makeWidget ({ 3, 73}, {285, 4}, WidgetType::imgBtn, WindowColour::secondary ), makeTab ({ 3, 47}), makeTab ({ 34, 47}), makeTab ({ 65, 47}), @@ -234,9 +234,9 @@ namespace OpenRCT2::Ui::Windows makeTab ({127, 47}), makeTab ({158, 47}), makeTab ({189, 47}), - makeWidget ({ 4, 80}, {145, 14}, WindowWidgetType::TableHeader, WindowColour::secondary ), - makeWidget ({149, 80}, {143, 14}, WindowWidgetType::TableHeader, WindowColour::secondary ), - makeWidget ({700, 50}, { 24, 24}, WindowWidgetType::ImgBtn, WindowColour::secondary, SPR_G2_RELOAD, STR_RELOAD_OBJECT_TIP ), + makeWidget ({ 4, 80}, {145, 14}, WidgetType::tableHeader, WindowColour::secondary ), + makeWidget ({149, 80}, {143, 14}, WidgetType::tableHeader, WindowColour::secondary ), + makeWidget ({700, 50}, { 24, 24}, WidgetType::imgBtn, WindowColour::secondary, SPR_G2_RELOAD, STR_RELOAD_OBJECT_TIP ), makeTab ({ 3, 17}, STR_STRING_DEFINED_TOOLTIP ) // Copied object type times... ); @@ -866,17 +866,17 @@ namespace OpenRCT2::Ui::Windows if (gLegacyScene == LegacyScene::trackDesignsManager) { titleWidget.text = STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE; - installTrackWidget.type = WindowWidgetType::Button; + installTrackWidget.type = WidgetType::button; } else if (gLegacyScene == LegacyScene::trackDesigner) { titleWidget.text = STR_ROLLER_COASTER_DESIGNER_SELECT_RIDE_TYPES_VEHICLES; - installTrackWidget.type = WindowWidgetType::Empty; + installTrackWidget.type = WidgetType::empty; } else { titleWidget.text = STR_OBJECT_SELECTION; - installTrackWidget.type = WindowWidgetType::Empty; + installTrackWidget.type = WidgetType::empty; } // Set title parameters for current page @@ -915,25 +915,25 @@ namespace OpenRCT2::Ui::Windows auto& widget = widgets[WIDX_TAB_1 + i]; if (ObjectSelectionPages[i].Image != kSpriteIdNull) { - widget.type = WindowWidgetType::Tab; + widget.type = WidgetType::tab; widget.left = x; widget.right = x + 30; x += 31; } else - widget.type = WindowWidgetType::Empty; + widget.type = WidgetType::empty; } if (Config::Get().general.DebuggingTools) - widgets[WIDX_RELOAD_OBJECT].type = WindowWidgetType::ImgBtn; + widgets[WIDX_RELOAD_OBJECT].type = WidgetType::imgBtn; else - widgets[WIDX_RELOAD_OBJECT].type = WindowWidgetType::Empty; + widgets[WIDX_RELOAD_OBJECT].type = WidgetType::empty; if (gLegacyScene == LegacyScene::trackDesignsManager || gLegacyScene == LegacyScene::trackDesigner) { for (size_t i = 1; i < std::size(ObjectSelectionPages); i++) { - widgets[WIDX_TAB_1 + i].type = WindowWidgetType::Empty; + widgets[WIDX_TAB_1 + i].type = WidgetType::empty; } } @@ -957,7 +957,7 @@ namespace OpenRCT2::Ui::Windows for (int8_t i = 0; i <= 6; i++) { widgets[WIDX_SUB_TAB_0 + i].tooltip = i < numSubTabs ? currentPage.subTabs[i].tooltip : kStringIdNone; - widgets[WIDX_SUB_TAB_0 + i].type = i < numSubTabs ? WindowWidgetType::Tab : WindowWidgetType::Empty; + widgets[WIDX_SUB_TAB_0 + i].type = i < numSubTabs ? WidgetType::tab : WidgetType::empty; pressed_widgets &= ~(1uLL << (WIDX_SUB_TAB_0 + i)); } @@ -965,10 +965,10 @@ namespace OpenRCT2::Ui::Windows if (hasSubTabs) { pressed_widgets |= (1uLL << (WIDX_SUB_TAB_0 + _selectedSubTab)); - widgets[WIDX_FILTER_RIDE_TAB_FRAME].type = WindowWidgetType::ImgBtn; + widgets[WIDX_FILTER_RIDE_TAB_FRAME].type = WidgetType::imgBtn; } else - widgets[WIDX_FILTER_RIDE_TAB_FRAME].type = WindowWidgetType::Empty; + widgets[WIDX_FILTER_RIDE_TAB_FRAME].type = WidgetType::empty; // The ride tab has two headers for the list bool isRideTab = GetSelectedObjectType() == ObjectType::ride; @@ -976,13 +976,13 @@ namespace OpenRCT2::Ui::Windows { int32_t width_limit = (widgets[WIDX_LIST].width() - 15) / 2; - widgets[WIDX_LIST_SORT_TYPE].type = WindowWidgetType::TableHeader; + widgets[WIDX_LIST_SORT_TYPE].type = WidgetType::tableHeader; widgets[WIDX_LIST_SORT_TYPE].top = widgets[WIDX_FILTER_TEXT_BOX].bottom + 3; widgets[WIDX_LIST_SORT_TYPE].bottom = widgets[WIDX_LIST_SORT_TYPE].top + 13; widgets[WIDX_LIST_SORT_TYPE].left = 4; widgets[WIDX_LIST_SORT_TYPE].right = widgets[WIDX_LIST_SORT_TYPE].left + width_limit; - widgets[WIDX_LIST_SORT_RIDE].type = WindowWidgetType::TableHeader; + widgets[WIDX_LIST_SORT_RIDE].type = WidgetType::tableHeader; widgets[WIDX_LIST_SORT_RIDE].top = widgets[WIDX_LIST_SORT_TYPE].top; widgets[WIDX_LIST_SORT_RIDE].bottom = widgets[WIDX_LIST_SORT_TYPE].bottom; widgets[WIDX_LIST_SORT_RIDE].left = widgets[WIDX_LIST_SORT_TYPE].right + 1; @@ -992,8 +992,8 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_LIST_SORT_TYPE].type = WindowWidgetType::Empty; - widgets[WIDX_LIST_SORT_RIDE].type = WindowWidgetType::Empty; + widgets[WIDX_LIST_SORT_TYPE].type = WidgetType::empty; + widgets[WIDX_LIST_SORT_RIDE].type = WidgetType::empty; widgets[WIDX_LIST].top = widgets[WIDX_FILTER_TEXT_BOX].bottom + 2; } @@ -1012,7 +1012,7 @@ namespace OpenRCT2::Ui::Windows for (size_t i = 0; i < std::size(ObjectSelectionPages); i++) { const auto& widget = widgets[WIDX_TAB_1 + i]; - if (widget.type != WindowWidgetType::Empty) + if (widget.type != WidgetType::empty) { auto image = ImageId(ObjectSelectionPages[i].Image); auto screenPos = windowPos + ScreenCoordsXY{ widget.left, widget.top }; @@ -1031,7 +1031,7 @@ namespace OpenRCT2::Ui::Windows for (auto i = 0u; i < currentPage.subTabs.size(); i++) { const auto& widget = widgets[WIDX_SUB_TAB_0 + i]; - if (widget.type == WindowWidgetType::Empty) + if (widget.type == WidgetType::empty) continue; auto& subTabDef = currentPage.subTabs[i]; @@ -1080,7 +1080,7 @@ namespace OpenRCT2::Ui::Windows // Draw sort button text const auto& listSortTypeWidget = widgets[WIDX_LIST_SORT_TYPE]; - if (listSortTypeWidget.type != WindowWidgetType::Empty) + if (listSortTypeWidget.type != WidgetType::empty) { auto ft = Formatter(); auto stringId = _listSortType == RIDE_SORT_TYPE ? static_cast(_listSortDescending ? STR_DOWN : STR_UP) @@ -1090,7 +1090,7 @@ namespace OpenRCT2::Ui::Windows DrawTextEllipsised(rt, screenPos, listSortTypeWidget.width(), STR_OBJECTS_SORT_TYPE, ft, { colours[1] }); } const auto& listSortRideWidget = widgets[WIDX_LIST_SORT_RIDE]; - if (listSortRideWidget.type != WindowWidgetType::Empty) + if (listSortRideWidget.type != WidgetType::empty) { auto ft = Formatter(); auto stringId = _listSortType == RIDE_SORT_RIDE ? static_cast(_listSortDescending ? STR_DOWN : STR_UP) diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index ddd83f69d1..6db75fe6f5 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -60,10 +60,10 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _widgets = makeWidgets( makeWindowShim(kWindowTitle, kWindowWidth, kWindowHeight), - makeWidget ({ 0, 43 }, { kWindowWidth, kWindowHeight - 43 }, WindowWidgetType::Resize, WindowColour::secondary ), + makeWidget ({ 0, 43 }, { kWindowWidth, kWindowHeight - 43 }, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17 }, kStringIdNone ), - makeWidget ({ 2, 45 }, { kScrollWidth, kScrollHeight }, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), - makeWidget ({ kWindowWidth - 26, 59 }, { 24, 24 }, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_OBJECTS_90 ) + makeWidget ({ 2, 45 }, { kScrollWidth, kScrollHeight }, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), + makeWidget ({ kWindowWidth - 26, 59 }, { 24, 24 }, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_OBJECTS_90 ) ); // clang-format on diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 4f07cee7b3..605277638c 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -199,7 +199,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto makeOptionsWidgets = [](StringId title, ScreenSize size) { return makeWidgets( makeWindowShim(title, size.width, size.height), - makeWidget({ 0, 43}, { size.width, 106 }, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43}, { size.width, 106 }, WidgetType::resize, WindowColour::secondary), makeTab ({ 3, 17}, STR_SCENARIO_OPTIONS_OBJECTIVE_TIP ), makeTab ({ 34, 17}, STR_SCENARIO_OPTIONS_SCENARIO_DETAILS_TIP ), makeTab ({ 65, 17}, STR_SCENARIO_OPTIONS_FINANCIAL_TIP ), @@ -211,75 +211,75 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_editor_scenario_options_objective_widgets = makeWidgets( makeOptionsWidgets(STR_SCENARIO_OPTIONS_OBJECTIVE, kSizeObjective), - makeWidget ({ 98, 48}, {344, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdNone, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), - makeWidget ({430, 49}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), - makeSpinnerWidgets({158, 65}, {120, 12}, WindowWidgetType::Button, WindowColour::secondary ), // NB: 3 widgets - makeSpinnerWidgets({158, 82}, {120, 12}, WindowWidgetType::Button, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 14, 99}, {340, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_HARD_PARK_RATING, STR_HARD_PARK_RATING_TIP ) + makeWidget ({ 98, 48}, {344, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdNone, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), + makeWidget ({430, 49}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), + makeSpinnerWidgets({158, 65}, {120, 12}, WidgetType::button, WindowColour::secondary ), // NB: 3 widgets + makeSpinnerWidgets({158, 82}, {120, 12}, WidgetType::button, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 14, 99}, {340, 12}, WidgetType::checkbox, WindowColour::secondary, STR_HARD_PARK_RATING, STR_HARD_PARK_RATING_TIP ) ); static constexpr auto window_editor_scenario_options_scenario_details_widgets = makeWidgets( makeOptionsWidgets(STR_SCENARIO_OPTIONS_SCENARIO_DETAILS, kSizeScenarioDetails), - makeWidget ({370, 48}, { 75, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP ), - makeWidget ({370, 65}, { 75, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_CHANGE, STR_CHANGE_NAME_OF_SCENARIO_TIP ), - makeWidget ({ 98, 82}, {180, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdNone, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), - makeWidget ({266, 83}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), - makeWidget ({370, 99}, { 75, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_CHANGE, STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP) + makeWidget ({370, 48}, { 75, 12}, WidgetType::button, WindowColour::secondary, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP ), + makeWidget ({370, 65}, { 75, 12}, WidgetType::button, WindowColour::secondary, STR_CHANGE, STR_CHANGE_NAME_OF_SCENARIO_TIP ), + makeWidget ({ 98, 82}, {180, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdNone, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), + makeWidget ({266, 83}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), + makeWidget ({370, 99}, { 75, 12}, WidgetType::button, WindowColour::secondary, STR_CHANGE, STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP) ); static constexpr auto window_editor_scenario_options_financial_widgets = makeWidgets( makeOptionsWidgets(STR_SCENARIO_OPTIONS_FINANCIAL, kSizeFinancial), - makeWidget ({ 8, 48}, {kSizeFinancial.width - 16, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP ), - makeWidget ({ 5, 63}, {kSizeFinancial.width - 10, 67}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_LOAN_OPTIONS ), - makeWidget ({ 9, 77}, { 250, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_INIT_LOAN_LABEL ), - makeSpinnerWidgets({268, 77}, { 100, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 9, 94}, { 250, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_MAX_LOAN_LABEL ), - makeSpinnerWidgets({268, 94}, { 100, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 9, 111}, { 280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_INTEREST_RATE_LABEL ), - makeSpinnerWidgets({298, 111}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 10, 111}, {kSizeFinancial.width - 16, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_RCT1_INTEREST, STR_RCT1_INTEREST_TIP ), - makeWidget ({ 5, 133}, {kSizeFinancial.width - 10, 87}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_BUSINESS_MODEL ), - makeWidget ({ 9, 150}, { 250, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_INIT_CASH_LABEL ), - makeSpinnerWidgets({268, 150}, { 100, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 9, 167}, { 150, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_EARNINGS_LABEL ), - makeWidget ({158, 167}, { 210, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdNone, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), - makeWidget ({356, 168}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), - makeWidget ({ 9, 184}, { 280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_ENTRY_PRICE_LABEL ), - makeSpinnerWidgets({298, 184}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 10, 201}, {kSizeFinancial.width - 16, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP ) + makeWidget ({ 8, 48}, {kSizeFinancial.width - 16, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP ), + makeWidget ({ 5, 63}, {kSizeFinancial.width - 10, 67}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_LOAN_OPTIONS ), + makeWidget ({ 9, 77}, { 250, 12}, WidgetType::label, WindowColour::secondary, STR_INIT_LOAN_LABEL ), + makeSpinnerWidgets({268, 77}, { 100, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 9, 94}, { 250, 12}, WidgetType::label, WindowColour::secondary, STR_MAX_LOAN_LABEL ), + makeSpinnerWidgets({268, 94}, { 100, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 9, 111}, { 280, 12}, WidgetType::label, WindowColour::secondary, STR_INTEREST_RATE_LABEL ), + makeSpinnerWidgets({298, 111}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 10, 111}, {kSizeFinancial.width - 16, 12}, WidgetType::checkbox, WindowColour::secondary, STR_RCT1_INTEREST, STR_RCT1_INTEREST_TIP ), + makeWidget ({ 5, 133}, {kSizeFinancial.width - 10, 87}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_BUSINESS_MODEL ), + makeWidget ({ 9, 150}, { 250, 12}, WidgetType::label, WindowColour::secondary, STR_INIT_CASH_LABEL ), + makeSpinnerWidgets({268, 150}, { 100, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 9, 167}, { 150, 12}, WidgetType::label, WindowColour::secondary, STR_EARNINGS_LABEL ), + makeWidget ({158, 167}, { 210, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdNone, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), + makeWidget ({356, 168}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), + makeWidget ({ 9, 184}, { 280, 12}, WidgetType::label, WindowColour::secondary, STR_ENTRY_PRICE_LABEL ), + makeSpinnerWidgets({298, 184}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 10, 201}, {kSizeFinancial.width - 16, 12}, WidgetType::checkbox, WindowColour::secondary, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP ) ); static constexpr auto window_editor_scenario_options_guests_widgets = makeWidgets( makeOptionsWidgets(STR_SCENARIO_OPTIONS_GUESTS, kSizeGuests), - makeWidget ({ 8, 48}, { 280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_CASH_PER_GUEST_LABEL ), - makeSpinnerWidgets({298, 48}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 8, 65}, { 280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_INIT_HAPPINESS ), - makeSpinnerWidgets({298, 65}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 8, 82}, { 280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_INIT_HUNGER ), - makeSpinnerWidgets({298, 82}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 8, 99}, { 280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_INIT_THIRST ), - makeSpinnerWidgets({298, 99}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 8, 116}, { 180, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_GUESTS_PREFER_INTENSITY_LABEL ), - makeWidget ({198, 116}, { 170, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdNone, STR_GUESTS_PREFER_INTENSITY_TIP ), - makeWidget ({357, 117}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_GUESTS_PREFER_INTENSITY_TIP ), - makeWidget ({ 8, 133}, { 350, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_HARD_GUEST_GENERATION, STR_HARD_GUEST_GENERATION_TIP ) + makeWidget ({ 8, 48}, { 280, 12}, WidgetType::label, WindowColour::secondary, STR_CASH_PER_GUEST_LABEL ), + makeSpinnerWidgets({298, 48}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 8, 65}, { 280, 12}, WidgetType::label, WindowColour::secondary, STR_GUEST_INIT_HAPPINESS ), + makeSpinnerWidgets({298, 65}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 8, 82}, { 280, 12}, WidgetType::label, WindowColour::secondary, STR_GUEST_INIT_HUNGER ), + makeSpinnerWidgets({298, 82}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 8, 99}, { 280, 12}, WidgetType::label, WindowColour::secondary, STR_GUEST_INIT_THIRST ), + makeSpinnerWidgets({298, 99}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 8, 116}, { 180, 12}, WidgetType::label, WindowColour::secondary, STR_GUESTS_PREFER_INTENSITY_LABEL ), + makeWidget ({198, 116}, { 170, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdNone, STR_GUESTS_PREFER_INTENSITY_TIP ), + makeWidget ({357, 117}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_GUESTS_PREFER_INTENSITY_TIP ), + makeWidget ({ 8, 133}, { 350, 12}, WidgetType::checkbox, WindowColour::secondary, STR_HARD_GUEST_GENERATION, STR_HARD_GUEST_GENERATION_TIP ) ); static constexpr auto window_editor_scenario_options_land_widgets = makeWidgets( makeOptionsWidgets(STR_SCENARIO_OPTIONS_LAND_RESTRICTIONS, kSizeLand), - makeWidget ({ 8, 48}, { 170, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_LAND_COST_LABEL ), - makeSpinnerWidgets({188, 48}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 8, 65}, { 170, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_RIGHTS_COST_LABEL ), - makeSpinnerWidgets({188, 65}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 8, 82}, {kSizeLand.width - 16, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP ), - makeWidget ({ 8, 99}, {kSizeLand.width - 16, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_FORBID_LANDSCAPE_CHANGES, STR_FORBID_LANDSCAPE_CHANGES_TIP ), - makeWidget ({ 8, 116}, {kSizeLand.width - 16, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP ) + makeWidget ({ 8, 48}, { 170, 12}, WidgetType::label, WindowColour::secondary, STR_LAND_COST_LABEL ), + makeSpinnerWidgets({188, 48}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 8, 65}, { 170, 12}, WidgetType::label, WindowColour::secondary, STR_RIGHTS_COST_LABEL ), + makeSpinnerWidgets({188, 65}, { 70, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 8, 82}, {kSizeLand.width - 16, 12}, WidgetType::checkbox, WindowColour::secondary, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP ), + makeWidget ({ 8, 99}, {kSizeLand.width - 16, 12}, WidgetType::checkbox, WindowColour::secondary, STR_FORBID_LANDSCAPE_CHANGES, STR_FORBID_LANDSCAPE_CHANGES_TIP ), + makeWidget ({ 8, 116}, {kSizeLand.width - 16, 12}, WidgetType::checkbox, WindowColour::secondary, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP ) ); static constexpr auto window_editor_scenario_options_rides_widgets = makeWidgets( makeOptionsWidgets(STR_SCENARIO_OPTIONS_PRESERVED_RIDES, kSizeRides), - makeWidget({ 6, 46}, {kSizeRides.width - 12, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_WINDOW_PRESERVATION_ORDER), - makeWidget({ 3, 60}, { 374, 161}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ) + makeWidget({ 6, 46}, {kSizeRides.width - 12, 12}, WidgetType::label, WindowColour::secondary, STR_WINDOW_PRESERVATION_ORDER), + makeWidget({ 3, 60}, { 374, 161}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ) ); static constexpr std::span window_editor_scenario_options_widgets[] = { @@ -1050,12 +1050,12 @@ namespace OpenRCT2::Ui::Windows { case OBJECTIVE_GUESTS_BY: case OBJECTIVE_PARK_VALUE_BY: - widgets[WIDX_OBJECTIVE_ARG_1].type = WindowWidgetType::Spinner; - widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_OBJECTIVE_ARG_2].type = WindowWidgetType::Spinner; - widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_OBJECTIVE_ARG_1].type = WidgetType::spinner; + widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WidgetType::button; + widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WidgetType::button; + widgets[WIDX_OBJECTIVE_ARG_2].type = WidgetType::spinner; + widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WidgetType::button; + widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WidgetType::button; break; case OBJECTIVE_GUESTS_AND_RATING: case OBJECTIVE_MONTHLY_RIDE_INCOME: @@ -1063,25 +1063,24 @@ namespace OpenRCT2::Ui::Windows case OBJECTIVE_FINISH_5_ROLLERCOASTERS: case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: case OBJECTIVE_MONTHLY_FOOD_INCOME: - widgets[WIDX_OBJECTIVE_ARG_1].type = WindowWidgetType::Spinner; - widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_OBJECTIVE_ARG_2].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_OBJECTIVE_ARG_1].type = WidgetType::spinner; + widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WidgetType::button; + widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WidgetType::button; + widgets[WIDX_OBJECTIVE_ARG_2].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WidgetType::empty; break; default: - widgets[WIDX_OBJECTIVE_ARG_1].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_2].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_OBJECTIVE_ARG_1].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_2].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WidgetType::empty; + widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WidgetType::empty; break; } - widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WindowWidgetType::Empty - : WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; SetWidgetPressed(WIDX_HARD_PARK_RATING, gameState.park.Flags & PARK_FLAGS_DIFFICULT_PARK_RATING); } @@ -1108,7 +1107,7 @@ namespace OpenRCT2::Ui::Windows ft.Add(ObjectiveDropdownOptionNames[gameState.scenarioObjective.Type]); DrawTextBasic(rt, screenCoords, STR_WINDOW_COLOUR_2_STRINGID, ft); - if (widgets[WIDX_OBJECTIVE_ARG_1].type != WindowWidgetType::Empty) + if (widgets[WIDX_OBJECTIVE_ARG_1].type != WidgetType::empty) { // Objective argument 1 label screenCoords = windowPos + ScreenCoordsXY{ 28, widgets[WIDX_OBJECTIVE_ARG_1].top }; @@ -1171,7 +1170,7 @@ namespace OpenRCT2::Ui::Windows DrawTextBasic(rt, screenCoords, stringId, ft, { COLOUR_BLACK }); } - if (widgets[WIDX_OBJECTIVE_ARG_2].type != WindowWidgetType::Empty) + if (widgets[WIDX_OBJECTIVE_ARG_2].type != WidgetType::empty) { // Objective argument 2 label screenCoords = windowPos + ScreenCoordsXY{ 28, widgets[WIDX_OBJECTIVE_ARG_2].top }; @@ -1596,67 +1595,66 @@ namespace OpenRCT2::Ui::Windows { SetWidgetPressed(WIDX_NO_MONEY, true); for (int32_t i = WIDX_GROUP_LOAN; i <= WIDX_FORBID_MARKETING; i++) - widgets[i].type = WindowWidgetType::Empty; + widgets[i].type = WidgetType::empty; } else { SetWidgetPressed(WIDX_NO_MONEY, false); - widgets[WIDX_GROUP_LOAN].type = WindowWidgetType::Groupbox; - widgets[WIDX_INITIAL_LOAN_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_INITIAL_LOAN].type = WindowWidgetType::Spinner; - widgets[WIDX_INITIAL_LOAN_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_INITIAL_LOAN_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_MAXIMUM_LOAN_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_MAXIMUM_LOAN].type = WindowWidgetType::Spinner; - widgets[WIDX_MAXIMUM_LOAN_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_MAXIMUM_LOAN_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_GROUP_LOAN].type = WidgetType::groupbox; + widgets[WIDX_INITIAL_LOAN_LABEL].type = WidgetType::label; + widgets[WIDX_INITIAL_LOAN].type = WidgetType::spinner; + widgets[WIDX_INITIAL_LOAN_INCREASE].type = WidgetType::button; + widgets[WIDX_INITIAL_LOAN_DECREASE].type = WidgetType::button; + widgets[WIDX_MAXIMUM_LOAN_LABEL].type = WidgetType::label; + widgets[WIDX_MAXIMUM_LOAN].type = WidgetType::spinner; + widgets[WIDX_MAXIMUM_LOAN_INCREASE].type = WidgetType::button; + widgets[WIDX_MAXIMUM_LOAN_DECREASE].type = WidgetType::button; if (gameState.park.Flags & PARK_FLAGS_RCT1_INTEREST) { - widgets[WIDX_INTEREST_RATE_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_INTEREST_RATE].type = WindowWidgetType::Empty; - widgets[WIDX_INTEREST_RATE_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_INTEREST_RATE_DECREASE].type = WindowWidgetType::Empty; - widgets[WIDX_RCT1_INTEREST].type = WindowWidgetType::Checkbox; + widgets[WIDX_INTEREST_RATE_LABEL].type = WidgetType::empty; + widgets[WIDX_INTEREST_RATE].type = WidgetType::empty; + widgets[WIDX_INTEREST_RATE_INCREASE].type = WidgetType::empty; + widgets[WIDX_INTEREST_RATE_DECREASE].type = WidgetType::empty; + widgets[WIDX_RCT1_INTEREST].type = WidgetType::checkbox; SetWidgetPressed(WIDX_RCT1_INTEREST, true); } else { - widgets[WIDX_INTEREST_RATE_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_INTEREST_RATE].type = WindowWidgetType::Spinner; - widgets[WIDX_INTEREST_RATE_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_INTEREST_RATE_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_RCT1_INTEREST].type = WindowWidgetType::Empty; + widgets[WIDX_INTEREST_RATE_LABEL].type = WidgetType::label; + widgets[WIDX_INTEREST_RATE].type = WidgetType::spinner; + widgets[WIDX_INTEREST_RATE_INCREASE].type = WidgetType::button; + widgets[WIDX_INTEREST_RATE_DECREASE].type = WidgetType::button; + widgets[WIDX_RCT1_INTEREST].type = WidgetType::empty; } - widgets[WIDX_GROUP_BUSINESS_MODEL].type = WindowWidgetType::Groupbox; - widgets[WIDX_INITIAL_CASH_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_INITIAL_CASH].type = WindowWidgetType::Spinner; - widgets[WIDX_INITIAL_CASH_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_INITIAL_CASH_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_PAY_FOR_PARK_OR_RIDES_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_PAY_FOR_PARK_OR_RIDES].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN].type = WindowWidgetType::Button; - widgets[WIDX_ENTRY_PRICE_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_ENTRY_PRICE].type = WindowWidgetType::Spinner; - widgets[WIDX_ENTRY_PRICE_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_ENTRY_PRICE_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_FORBID_MARKETING].type = WindowWidgetType::Checkbox; + widgets[WIDX_GROUP_BUSINESS_MODEL].type = WidgetType::groupbox; + widgets[WIDX_INITIAL_CASH_LABEL].type = WidgetType::label; + widgets[WIDX_INITIAL_CASH].type = WidgetType::spinner; + widgets[WIDX_INITIAL_CASH_INCREASE].type = WidgetType::button; + widgets[WIDX_INITIAL_CASH_DECREASE].type = WidgetType::button; + widgets[WIDX_PAY_FOR_PARK_OR_RIDES_LABEL].type = WidgetType::label; + widgets[WIDX_PAY_FOR_PARK_OR_RIDES].type = WidgetType::dropdownMenu; + widgets[WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN].type = WidgetType::button; + widgets[WIDX_ENTRY_PRICE_LABEL].type = WidgetType::label; + widgets[WIDX_ENTRY_PRICE].type = WidgetType::spinner; + widgets[WIDX_ENTRY_PRICE_INCREASE].type = WidgetType::button; + widgets[WIDX_ENTRY_PRICE_DECREASE].type = WidgetType::button; + widgets[WIDX_FORBID_MARKETING].type = WidgetType::checkbox; if (!Park::EntranceFeeUnlocked()) { - widgets[WIDX_ENTRY_PRICE_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_ENTRY_PRICE].type = WindowWidgetType::Empty; - widgets[WIDX_ENTRY_PRICE_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_ENTRY_PRICE_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_ENTRY_PRICE_LABEL].type = WidgetType::empty; + widgets[WIDX_ENTRY_PRICE].type = WidgetType::empty; + widgets[WIDX_ENTRY_PRICE_INCREASE].type = WidgetType::empty; + widgets[WIDX_ENTRY_PRICE_DECREASE].type = WidgetType::empty; } } SetWidgetPressed(WIDX_FORBID_MARKETING, gameState.park.Flags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN); - widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WindowWidgetType::Empty - : WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; } void FinancialDraw(RenderTarget& rt) @@ -1669,7 +1667,7 @@ namespace OpenRCT2::Ui::Windows auto& gameState = getGameState(); const auto& initialCashWidget = widgets[WIDX_INITIAL_CASH]; - if (initialCashWidget.type != WindowWidgetType::Empty) + if (initialCashWidget.type != WidgetType::empty) { screenCoords = windowPos + ScreenCoordsXY{ initialCashWidget.left + 1, initialCashWidget.top }; auto ft = Formatter(); @@ -1678,7 +1676,7 @@ namespace OpenRCT2::Ui::Windows } const auto& initialLoanWidget = widgets[WIDX_INITIAL_LOAN]; - if (initialLoanWidget.type != WindowWidgetType::Empty) + if (initialLoanWidget.type != WidgetType::empty) { screenCoords = windowPos + ScreenCoordsXY{ initialLoanWidget.left + 1, initialLoanWidget.top }; auto ft = Formatter(); @@ -1687,7 +1685,7 @@ namespace OpenRCT2::Ui::Windows } const auto& maximumLoanWidget = widgets[WIDX_MAXIMUM_LOAN]; - if (maximumLoanWidget.type != WindowWidgetType::Empty) + if (maximumLoanWidget.type != WidgetType::empty) { screenCoords = windowPos + ScreenCoordsXY{ maximumLoanWidget.left + 1, maximumLoanWidget.top }; auto ft = Formatter(); @@ -1696,7 +1694,7 @@ namespace OpenRCT2::Ui::Windows } const auto& interestRateWidget = widgets[WIDX_INTEREST_RATE]; - if (interestRateWidget.type != WindowWidgetType::Empty) + if (interestRateWidget.type != WidgetType::empty) { screenCoords = windowPos + ScreenCoordsXY{ interestRateWidget.left + 1, interestRateWidget.top }; @@ -1707,7 +1705,7 @@ namespace OpenRCT2::Ui::Windows } const auto& payForParkOrRidesWidget = widgets[WIDX_PAY_FOR_PARK_OR_RIDES]; - if (payForParkOrRidesWidget.type != WindowWidgetType::Empty) + if (payForParkOrRidesWidget.type != WidgetType::empty) { // Pay for park or rides label screenCoords = windowPos + ScreenCoordsXY{ payForParkOrRidesWidget.left + 1, payForParkOrRidesWidget.top }; @@ -1725,7 +1723,7 @@ namespace OpenRCT2::Ui::Windows } const auto& entryPriceWidget = widgets[WIDX_ENTRY_PRICE]; - if (entryPriceWidget.type != WindowWidgetType::Empty) + if (entryPriceWidget.type != WidgetType::empty) { // Entry price value screenCoords = windowPos + ScreenCoordsXY{ entryPriceWidget.left + 1, entryPriceWidget.top }; @@ -1929,19 +1927,18 @@ namespace OpenRCT2::Ui::Windows auto& gameState = getGameState(); if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) { - widgets[WIDX_CASH_PER_GUEST].type = WindowWidgetType::Empty; - widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_CASH_PER_GUEST].type = WidgetType::empty; + widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WidgetType::empty; + widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WidgetType::empty; } else { - widgets[WIDX_CASH_PER_GUEST].type = WindowWidgetType::Spinner; - widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_CASH_PER_GUEST].type = WidgetType::spinner; + widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WidgetType::button; + widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WidgetType::button; } - widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WindowWidgetType::Empty - : WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; SetWidgetPressed(WIDX_HARD_GUEST_GENERATION, gameState.park.Flags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION); } @@ -1955,7 +1952,7 @@ namespace OpenRCT2::Ui::Windows auto& gameState = getGameState(); const auto& cashPerGuestWidget = widgets[WIDX_CASH_PER_GUEST]; - if (cashPerGuestWidget.type != WindowWidgetType::Empty) + if (cashPerGuestWidget.type != WidgetType::empty) { // Cash per guest value screenCoords = windowPos + ScreenCoordsXY{ cashPerGuestWidget.left + 1, cashPerGuestWidget.top }; @@ -2124,25 +2121,24 @@ namespace OpenRCT2::Ui::Windows if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) { for (int32_t i = WIDX_LAND_COST_LABEL; i <= WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE; i++) - widgets[i].type = WindowWidgetType::Empty; + widgets[i].type = WidgetType::empty; } else { - widgets[WIDX_LAND_COST_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_LAND_COST].type = WindowWidgetType::Spinner; - widgets[WIDX_LAND_COST_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_LAND_COST_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_CONSTRUCTION_RIGHTS_COST].type = WindowWidgetType::Spinner; - widgets[WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_LAND_COST_LABEL].type = WidgetType::label; + widgets[WIDX_LAND_COST].type = WidgetType::spinner; + widgets[WIDX_LAND_COST_INCREASE].type = WidgetType::button; + widgets[WIDX_LAND_COST_DECREASE].type = WidgetType::button; + widgets[WIDX_CONSTRUCTION_RIGHTS_COST].type = WidgetType::spinner; + widgets[WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE].type = WidgetType::button; + widgets[WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE].type = WidgetType::button; } SetWidgetPressed(WIDX_FORBID_TREE_REMOVAL, gameState.park.Flags & PARK_FLAGS_FORBID_TREE_REMOVAL); SetWidgetPressed(WIDX_FORBID_LANDSCAPE_CHANGES, gameState.park.Flags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES); SetWidgetPressed(WIDX_FORBID_HIGH_CONSTRUCTION, gameState.park.Flags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION); - widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WindowWidgetType::Empty - : WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; } void LandDraw(RenderTarget& rt) @@ -2154,7 +2150,7 @@ namespace OpenRCT2::Ui::Windows const auto& gameState = getGameState(); const auto& landCostWidget = widgets[WIDX_LAND_COST]; - if (landCostWidget.type != WindowWidgetType::Empty) + if (landCostWidget.type != WidgetType::empty) { // Cost to buy land value screenCoords = windowPos + ScreenCoordsXY{ landCostWidget.left + 1, landCostWidget.top }; @@ -2164,7 +2160,7 @@ namespace OpenRCT2::Ui::Windows } const auto& constructionRightsCostWidget = widgets[WIDX_CONSTRUCTION_RIGHTS_COST]; - if (constructionRightsCostWidget.type != WindowWidgetType::Empty) + if (constructionRightsCostWidget.type != WidgetType::empty) { // Cost to buy construction rights value screenCoords = windowPos @@ -2285,8 +2281,7 @@ namespace OpenRCT2::Ui::Windows { SetPressedTab(); - widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WindowWidgetType::Empty - : WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = gLegacyScene == LegacyScene::scenarioEditor ? WidgetType::empty : WidgetType::closeBox; } /** diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 803d138807..83406e94b6 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -32,7 +32,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto kPadding = 4; static constexpr Widget window_error_widgets[] = { - makeWidget({ 0, 0 }, { 200, 42 }, WindowWidgetType::Frame, WindowColour::primary), + makeWidget({ 0, 0 }, { 200, 42 }, WidgetType::frame, WindowColour::primary), }; class ErrorWindow final : public Window diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index a3d1285267..4992684454 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -101,7 +101,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto makeFinancesWidgets = [](StringId title, ScreenSize resizeSize, ScreenSize frameSize) { return makeWidgets( makeWindowShim(title, frameSize.width, frameSize.height), - makeWidget({ 0, 43 }, resizeSize, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43 }, resizeSize, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_FINANCES_SHOW_SUMMARY_TAB_TIP), makeTab({ 34, 17 }, STR_FINANCES_SHOW_CASH_TAB_TIP), makeTab({ 65, 17 }, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP), @@ -113,8 +113,8 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _windowFinancesSummaryWidgets = makeWidgets( makeFinancesWidgets(STR_FINANCIAL_SUMMARY,{ RSW_OTHER_TABS, RSH_SUMMARY }, { WW_OTHER_TABS, kHeightSummary }), - makeWidget ({130, 50}, {391, 211}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_HORIZONTAL ), - makeSpinnerWidgets({ 64, 279}, { 97, 14}, WindowWidgetType::Spinner, WindowColour::secondary, STR_FINANCES_SUMMARY_LOAN_VALUE) // NB: 3 widgets + makeWidget ({130, 50}, {391, 211}, WidgetType::scroll, WindowColour::secondary, SCROLL_HORIZONTAL ), + makeSpinnerWidgets({ 64, 279}, { 97, 14}, WidgetType::spinner, WindowColour::secondary, STR_FINANCES_SUMMARY_LOAN_VALUE) // NB: 3 widgets ); static constexpr auto _windowFinancesCashWidgets = makeWidgets( @@ -131,29 +131,29 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _windowFinancesMarketingWidgets = makeWidgets( makeFinancesWidgets(STR_MARKETING, { RSW_OTHER_TABS, RSH_OTHER_TABS }, { WW_OTHER_TABS, kHeightOtherTabs }), - makeWidget({3, 47}, { WW_OTHER_TABS - 6, 45}, WindowWidgetType::Groupbox, WindowColour::tertiary , STR_MARKETING_CAMPAIGNS_IN_OPERATION ), - makeWidget({3, 47}, { WW_OTHER_TABS - 6, 206}, WindowWidgetType::Groupbox, WindowColour::tertiary , STR_MARKETING_CAMPAIGNS_AVAILABLE ), - makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), - makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), - makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), - makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), - makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), - makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN) + makeWidget({3, 47}, { WW_OTHER_TABS - 6, 45}, WidgetType::groupbox, WindowColour::tertiary , STR_MARKETING_CAMPAIGNS_IN_OPERATION ), + makeWidget({3, 47}, { WW_OTHER_TABS - 6, 206}, WidgetType::groupbox, WindowColour::tertiary , STR_MARKETING_CAMPAIGNS_AVAILABLE ), + makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + makeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN) ); static constexpr auto _windowFinancesResearchWidgets = makeWidgets( makeFinancesWidgets(STR_RESEARCH_FUNDING, { RSW_RESEARCH, RSH_RESEARCH }, { WW_RESEARCH, kHeightResearch }), - makeWidget({ 3, 47}, { WW_RESEARCH - 6, 45}, WindowWidgetType::Groupbox, WindowColour::tertiary, STR_RESEARCH_FUNDING_ ), - makeWidget({ 8, 59}, { 160, 14}, WindowWidgetType::DropdownMenu, WindowColour::tertiary, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), - makeWidget({156, 60}, { 11, 12}, WindowWidgetType::Button, WindowColour::tertiary, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), - makeWidget({ 3, 96}, { WW_RESEARCH - 6, 107}, WindowWidgetType::Groupbox, WindowColour::tertiary, STR_RESEARCH_PRIORITIES ), - makeWidget({ 8, 108}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), - makeWidget({ 8, 121}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), - makeWidget({ 8, 134}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), - makeWidget({ 8, 147}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), - makeWidget({ 8, 160}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), - makeWidget({ 8, 173}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), - makeWidget({ 8, 186}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ) + makeWidget({ 3, 47}, { WW_RESEARCH - 6, 45}, WidgetType::groupbox, WindowColour::tertiary, STR_RESEARCH_FUNDING_ ), + makeWidget({ 8, 59}, { 160, 14}, WidgetType::dropdownMenu, WindowColour::tertiary, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + makeWidget({156, 60}, { 11, 12}, WidgetType::button, WindowColour::tertiary, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + makeWidget({ 3, 96}, { WW_RESEARCH - 6, 107}, WidgetType::groupbox, WindowColour::tertiary, STR_RESEARCH_PRIORITIES ), + makeWidget({ 8, 108}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), + makeWidget({ 8, 121}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), + makeWidget({ 8, 134}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), + makeWidget({ 8, 147}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), + makeWidget({ 8, 160}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), + makeWidget({ 8, 173}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), + makeWidget({ 8, 186}, {WW_RESEARCH - 14, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ) ); // clang-format on @@ -693,14 +693,14 @@ namespace OpenRCT2::Ui::Windows auto marketingCampaign = MarketingGetCampaign(i); if (marketingCampaign == nullptr && MarketingIsCampaignTypeApplicable(i)) { - campaignButton->type = WindowWidgetType::Button; + campaignButton->type = WidgetType::button; campaignButton->top = y; campaignButton->bottom = y + kButtonFaceHeight + 1; y += kButtonFaceHeight + 2; } else { - campaignButton->type = WindowWidgetType::Empty; + campaignButton->type = WidgetType::empty; } } } @@ -768,7 +768,7 @@ namespace OpenRCT2::Ui::Windows for (int32_t i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { auto campaignButton = &widgets[WIDX_CAMPAIGN_1 + i]; - if (campaignButton->type != WindowWidgetType::Empty) + if (campaignButton->type != WidgetType::empty) { // Draw button text screenCoords = windowPos + ScreenCoordsXY{ campaignButton->left, campaignButton->textTop() }; diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index dc3f7640cc..3fd357bcab 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -127,30 +127,30 @@ namespace OpenRCT2::Ui::Windows makeWindowShim(WINDOW_TITLE, WW_WINDOW, WH_WINDOW), // Type group - makeWidget({ 3, 17}, {100, 95}, WindowWidgetType::Groupbox, WindowColour::primary , STR_TYPE ), - makeWidget({ 6, 30}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_FOOTPATH_TIP ), - makeWidget({53, 30}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_QUEUE_LINE_PATH_TIP ), - makeWidget({29, 69}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_OBJECT_SELECTION_FOOTPATH_RAILINGS ), + makeWidget({ 3, 17}, {100, 95}, WidgetType::groupbox, WindowColour::primary , STR_TYPE ), + makeWidget({ 6, 30}, { 47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_FOOTPATH_TIP ), + makeWidget({53, 30}, { 47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_QUEUE_LINE_PATH_TIP ), + makeWidget({29, 69}, { 47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_OBJECT_SELECTION_FOOTPATH_RAILINGS ), // Direction group - makeWidget({ 3, 115}, {100, 77}, WindowWidgetType::Groupbox, WindowColour::primary , STR_DIRECTION ), - makeWidget({53, 127}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NE), STR_DIRECTION_TIP ), - makeWidget({53, 156}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SE), STR_DIRECTION_TIP ), - makeWidget({ 8, 156}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SW), STR_DIRECTION_TIP ), - makeWidget({ 8, 127}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NW), STR_DIRECTION_TIP ), + makeWidget({ 3, 115}, {100, 77}, WidgetType::groupbox, WindowColour::primary , STR_DIRECTION ), + makeWidget({53, 127}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NE), STR_DIRECTION_TIP ), + makeWidget({53, 156}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SE), STR_DIRECTION_TIP ), + makeWidget({ 8, 156}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SW), STR_DIRECTION_TIP ), + makeWidget({ 8, 127}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NW), STR_DIRECTION_TIP ), // Slope group - makeWidget({ 3, 195}, {100, 41}, WindowWidgetType::Groupbox, WindowColour::primary , STR_SLOPE ), - makeWidget({17, 207}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN), STR_SLOPE_DOWN_TIP ), - makeWidget({41, 207}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL), STR_LEVEL_TIP ), - makeWidget({65, 207}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_SLOPE_UP_TIP ), - makeWidget({ 8, 242}, { 90, 90}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP), - makeWidget({30, 335}, { 46, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH_CURRENT_SECTION), STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP ), + makeWidget({ 3, 195}, {100, 41}, WidgetType::groupbox, WindowColour::primary , STR_SLOPE ), + makeWidget({17, 207}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN), STR_SLOPE_DOWN_TIP ), + makeWidget({41, 207}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL), STR_LEVEL_TIP ), + makeWidget({65, 207}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_SLOPE_UP_TIP ), + makeWidget({ 8, 242}, { 90, 90}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP), + makeWidget({30, 335}, { 46, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH_CURRENT_SECTION), STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP ), // Mode group - makeWidget({ 3, 361}, {100, 54}, WindowWidgetType::Groupbox, WindowColour::primary ), - makeWidget({13, 372}, { 36, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_FOOTPATH_LAND), STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP ), - makeWidget({57, 372}, { 36, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_FOOTPATH_BRIDGE), STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP ) + makeWidget({ 3, 361}, {100, 54}, WidgetType::groupbox, WindowColour::primary ), + makeWidget({13, 372}, { 36, 36}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_FOOTPATH_LAND), STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP ), + makeWidget({57, 372}, { 36, 36}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_FOOTPATH_BRIDGE), STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP ) ); #pragma endregion @@ -452,16 +452,16 @@ namespace OpenRCT2::Ui::Windows // Enable / disable construct button widgets[WIDX_CONSTRUCT].type = _footpathConstructionMode == PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL - ? WindowWidgetType::ImgBtn - : WindowWidgetType::Empty; + ? WidgetType::imgBtn + : WidgetType::empty; if (gFootpathSelection.LegacyPath == kObjectEntryIndexNull) { - widgets[WIDX_RAILINGS_TYPE].type = WindowWidgetType::FlatBtn; + widgets[WIDX_RAILINGS_TYPE].type = WidgetType::flatBtn; } else { - widgets[WIDX_RAILINGS_TYPE].type = WindowWidgetType::Empty; + widgets[WIDX_RAILINGS_TYPE].type = WidgetType::empty; } } @@ -1545,7 +1545,7 @@ namespace OpenRCT2::Ui::Windows void KeyboardShortcutShortcutSlopeDown() { if (IsWidgetDisabled(WIDX_SLOPEDOWN) || IsWidgetDisabled(WIDX_LEVEL) || IsWidgetDisabled(WIDX_SLOPEUP) - || widgets[WIDX_LEVEL].type == WindowWidgetType::Empty) + || widgets[WIDX_LEVEL].type == WidgetType::empty) { return; } @@ -1567,7 +1567,7 @@ namespace OpenRCT2::Ui::Windows void KeyboardShortcutSlopeUp() { if (IsWidgetDisabled(WIDX_SLOPEDOWN) || IsWidgetDisabled(WIDX_LEVEL) || IsWidgetDisabled(WIDX_SLOPEUP) - || widgets[WIDX_LEVEL].type == WindowWidgetType::Empty) + || widgets[WIDX_LEVEL].type == WidgetType::empty) { return; } @@ -1589,7 +1589,7 @@ namespace OpenRCT2::Ui::Windows void KeyboardShortcutSlopeLevel() { if (IsWidgetDisabled(WIDX_SLOPEDOWN) || IsWidgetDisabled(WIDX_LEVEL) || IsWidgetDisabled(WIDX_SLOPEUP) - || widgets[WIDX_LEVEL].type == WindowWidgetType::Empty || gFootpathConstructSlope == 0) + || widgets[WIDX_LEVEL].type == WidgetType::empty || gFootpathConstructSlope == 0) { return; } @@ -1599,7 +1599,7 @@ namespace OpenRCT2::Ui::Windows void KeyboardShortcutDemolishCurrent() { - if (IsWidgetDisabled(WIDX_REMOVE) || widgets[WIDX_REMOVE].type == WindowWidgetType::Empty + if (IsWidgetDisabled(WIDX_REMOVE) || widgets[WIDX_REMOVE].type == WidgetType::empty || (!getGameState().cheats.buildInPauseMode && GameIsPaused())) { return; @@ -1610,7 +1610,7 @@ namespace OpenRCT2::Ui::Windows void KeyboardShortcutBuildCurrent() { - if (IsWidgetDisabled(WIDX_CONSTRUCT) || widgets[WIDX_CONSTRUCT].type == WindowWidgetType::Empty) + if (IsWidgetDisabled(WIDX_CONSTRUCT) || widgets[WIDX_CONSTRUCT].type == WidgetType::empty) { return; } diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 393619f868..e09829b0e8 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -55,20 +55,20 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr Widget window_game_bottom_toolbar_widgets[] = { - makeWidget({ 0, 0}, {142, 34}, WindowWidgetType::ImgBtn, WindowColour::primary ), // Left outset panel - makeWidget({ 2, 2}, {138, 30}, WindowWidgetType::ImgBtn, WindowColour::primary ), // Left inset panel - makeWidget({ 2, 1}, {138, 12}, WindowWidgetType::FlatBtn, WindowColour::primary , 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP), // Money window - makeWidget({ 2, 11}, {138, 12}, WindowWidgetType::FlatBtn, WindowColour::primary ), // Guests window - makeWidget({ 2, 21}, {138, 11}, WindowWidgetType::FlatBtn, WindowColour::primary , 0xFFFFFFFF, STR_PARK_RATING_TIP ), // Park rating window + makeWidget({ 0, 0}, {142, 34}, WidgetType::imgBtn, WindowColour::primary ), // Left outset panel + makeWidget({ 2, 2}, {138, 30}, WidgetType::imgBtn, WindowColour::primary ), // Left inset panel + makeWidget({ 2, 1}, {138, 12}, WidgetType::flatBtn, WindowColour::primary , 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP), // Money window + makeWidget({ 2, 11}, {138, 12}, WidgetType::flatBtn, WindowColour::primary ), // Guests window + makeWidget({ 2, 21}, {138, 11}, WidgetType::flatBtn, WindowColour::primary , 0xFFFFFFFF, STR_PARK_RATING_TIP ), // Park rating window - makeWidget({142, 0}, {356, 34}, WindowWidgetType::ImgBtn, WindowColour::tertiary ), // Middle outset panel - makeWidget({144, 2}, {352, 30}, WindowWidgetType::FlatBtn, WindowColour::tertiary ), // Middle inset panel - makeWidget({147, 5}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::tertiary, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP ), // Associated news item window - makeWidget({469, 5}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::tertiary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), // Scroll to news item target + makeWidget({142, 0}, {356, 34}, WidgetType::imgBtn, WindowColour::tertiary ), // Middle outset panel + makeWidget({144, 2}, {352, 30}, WidgetType::flatBtn, WindowColour::tertiary ), // Middle inset panel + makeWidget({147, 5}, { 24, 24}, WidgetType::flatBtn, WindowColour::tertiary, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP ), // Associated news item window + makeWidget({469, 5}, { 24, 24}, WidgetType::flatBtn, WindowColour::tertiary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), // Scroll to news item target - makeWidget({498, 0}, {142, 34}, WindowWidgetType::ImgBtn, WindowColour::primary ), // Right outset panel - makeWidget({500, 2}, {138, 30}, WindowWidgetType::ImgBtn, WindowColour::primary ), // Right inset panel - makeWidget({500, 2}, {138, 12}, WindowWidgetType::FlatBtn, WindowColour::primary ), // Date + makeWidget({498, 0}, {142, 34}, WidgetType::imgBtn, WindowColour::primary ), // Right outset panel + makeWidget({500, 2}, {138, 30}, WidgetType::imgBtn, WindowColour::primary ), // Right inset panel + makeWidget({500, 2}, {138, 12}, WidgetType::flatBtn, WindowColour::primary ), // Date }; // clang-format on @@ -420,7 +420,7 @@ namespace OpenRCT2::Ui::Windows // Reset the middle widget to not show by default. // If it is required to be shown news_update will reshow it. - widgets[WIDX_MIDDLE_OUTSET].type = WindowWidgetType::Empty; + widgets[WIDX_MIDDLE_OUTSET].type = WidgetType::empty; } void OnMouseUp(WidgetIndex widgetIndex) override @@ -515,7 +515,7 @@ namespace OpenRCT2::Ui::Windows // Reposition left widgets in accordance with line height... depending on whether there is money in play. if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) { - widgets[WIDX_MONEY].type = WindowWidgetType::Empty; + widgets[WIDX_MONEY].type = WidgetType::empty; widgets[WIDX_GUESTS].top = 1; widgets[WIDX_GUESTS].bottom = line_height + 7; widgets[WIDX_PARK_RATING].top = line_height + 8; @@ -523,7 +523,7 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_MONEY].type = WindowWidgetType::FlatBtn; + widgets[WIDX_MONEY].type = WidgetType::flatBtn; widgets[WIDX_MONEY].bottom = widgets[WIDX_MONEY].top + line_height; widgets[WIDX_GUESTS].top = widgets[WIDX_MONEY].bottom + 1; widgets[WIDX_GUESTS].bottom = widgets[WIDX_GUESTS].top + line_height; @@ -556,24 +556,24 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_DATE].left = widgets[WIDX_RIGHT_OUTSET].left + 2; widgets[WIDX_DATE].right = widgets[WIDX_RIGHT_OUTSET].right - 2; - widgets[WIDX_LEFT_INSET].type = WindowWidgetType::Empty; - widgets[WIDX_RIGHT_INSET].type = WindowWidgetType::Empty; + widgets[WIDX_LEFT_INSET].type = WidgetType::empty; + widgets[WIDX_RIGHT_INSET].type = WidgetType::empty; if (News::IsQueueEmpty()) { if (!(ThemeGetFlags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR)) { - widgets[WIDX_MIDDLE_OUTSET].type = WindowWidgetType::Empty; - widgets[WIDX_MIDDLE_INSET].type = WindowWidgetType::Empty; - widgets[WIDX_NEWS_SUBJECT].type = WindowWidgetType::Empty; - widgets[WIDX_NEWS_LOCATE].type = WindowWidgetType::Empty; + widgets[WIDX_MIDDLE_OUTSET].type = WidgetType::empty; + widgets[WIDX_MIDDLE_INSET].type = WidgetType::empty; + widgets[WIDX_NEWS_SUBJECT].type = WidgetType::empty; + widgets[WIDX_NEWS_LOCATE].type = WidgetType::empty; } else { - widgets[WIDX_MIDDLE_OUTSET].type = WindowWidgetType::ImgBtn; - widgets[WIDX_MIDDLE_INSET].type = WindowWidgetType::FlatBtn; - widgets[WIDX_NEWS_SUBJECT].type = WindowWidgetType::Empty; - widgets[WIDX_NEWS_LOCATE].type = WindowWidgetType::Empty; + widgets[WIDX_MIDDLE_OUTSET].type = WidgetType::imgBtn; + widgets[WIDX_MIDDLE_INSET].type = WidgetType::flatBtn; + widgets[WIDX_NEWS_SUBJECT].type = WidgetType::empty; + widgets[WIDX_NEWS_LOCATE].type = WidgetType::empty; widgets[WIDX_MIDDLE_OUTSET].colour = 0; widgets[WIDX_MIDDLE_INSET].colour = 0; } @@ -581,10 +581,10 @@ namespace OpenRCT2::Ui::Windows else { News::Item* newsItem = News::GetItem(0); - widgets[WIDX_MIDDLE_OUTSET].type = WindowWidgetType::ImgBtn; - widgets[WIDX_MIDDLE_INSET].type = WindowWidgetType::FlatBtn; - widgets[WIDX_NEWS_SUBJECT].type = WindowWidgetType::FlatBtn; - widgets[WIDX_NEWS_LOCATE].type = WindowWidgetType::FlatBtn; + widgets[WIDX_MIDDLE_OUTSET].type = WidgetType::imgBtn; + widgets[WIDX_MIDDLE_INSET].type = WidgetType::flatBtn; + widgets[WIDX_NEWS_SUBJECT].type = WidgetType::flatBtn; + widgets[WIDX_NEWS_LOCATE].type = WidgetType::flatBtn; widgets[WIDX_MIDDLE_OUTSET].colour = 2; widgets[WIDX_MIDDLE_INSET].colour = 2; disabled_widgets &= ~(1uLL << WIDX_NEWS_SUBJECT); @@ -599,7 +599,7 @@ namespace OpenRCT2::Ui::Windows if (!(newsItem->typeHasSubject())) { disabled_widgets |= (1uLL << WIDX_NEWS_SUBJECT); - widgets[WIDX_NEWS_SUBJECT].type = WindowWidgetType::Empty; + widgets[WIDX_NEWS_SUBJECT].type = WidgetType::empty; } if (newsItem->hasButton()) diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 5ec8c14348..1d40b545ed 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -114,7 +114,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kMainGuestWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), \ - makeWidget({ 0, 43 }, { 192, 114 }, WindowWidgetType::Resize, WindowColour::secondary), /* Resize */ + makeWidget({ 0, 43 }, { 192, 114 }, WidgetType::resize, WindowColour::secondary), /* Resize */ makeTab({ 3, 17 }, STR_SHOW_GUEST_VIEW_TIP), /* Tab 1 */ makeTab({ 34, 17 }, STR_SHOW_GUEST_NEEDS_TIP), /* Tab 2 */ makeTab({ 65, 17 }, STR_SHOW_GUEST_VISITED_RIDES_TIP), /* Tab 3 */ @@ -126,36 +126,36 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _guestWindowWidgetsOverview = makeWidgets( kMainGuestWidgets, - makeWidget({ 3, 45}, {164, 12}, WindowWidgetType::LabelCentred, WindowColour::secondary ), // Label Thought marquee - makeWidget({ 3, 57}, {164, 87}, WindowWidgetType::Viewport, WindowColour::secondary ), // Viewport - makeWidget({ 3, 144}, {164, 11}, WindowWidgetType::LabelCentred, WindowColour::secondary ), // Label Action - makeWidget({167, 45}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PICKUP_BTN), STR_PICKUP_TIP ), // Pickup Button - makeWidget({167, 69}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_GUEST_TIP ), // Rename Button - makeWidget({167, 93}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), // Locate Button - makeWidget({167, 117}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_TRACK_PEEP), STR_TOGGLE_GUEST_TRACKING_TIP) // Track Button + makeWidget({ 3, 45}, {164, 12}, WidgetType::labelCentred, WindowColour::secondary ), // Label Thought marquee + makeWidget({ 3, 57}, {164, 87}, WidgetType::viewport, WindowColour::secondary ), // Viewport + makeWidget({ 3, 144}, {164, 11}, WidgetType::labelCentred, WindowColour::secondary ), // Label Action + makeWidget({167, 45}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PICKUP_BTN), STR_PICKUP_TIP ), // Pickup Button + makeWidget({167, 69}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_GUEST_TIP ), // Rename Button + makeWidget({167, 93}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), // Locate Button + makeWidget({167, 117}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_TRACK_PEEP), STR_TOGGLE_GUEST_TRACKING_TIP) // Track Button ); static constexpr auto _guestWindowWidgetsStats = makeWidgets( kMainGuestWidgets, - makeWidget ({ 3, (kListRowHeight * 0) + 4 + 43 }, { 62, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_STAT_HAPPINESS_LABEL), + makeWidget ({ 3, (kListRowHeight * 0) + 4 + 43 }, { 62, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_STAT_HAPPINESS_LABEL), makeProgressBar({ 65, (kListRowHeight * 0) + 4 + 43 }, { 119, 10 }, COLOUR_BRIGHT_GREEN, 0, 19), - makeWidget ({ 3, (kListRowHeight * 1) + 4 + 43 }, { 62, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_STAT_ENERGY_LABEL), + makeWidget ({ 3, (kListRowHeight * 1) + 4 + 43 }, { 62, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_STAT_ENERGY_LABEL), makeProgressBar({ 65, (kListRowHeight * 1) + 4 + 43 }, { 119, 10 }, COLOUR_BRIGHT_GREEN, 0, 19), - makeWidget ({ 3, (kListRowHeight * 2) + 4 + 43 }, { 62, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_STAT_HUNGER_LABEL), + makeWidget ({ 3, (kListRowHeight * 2) + 4 + 43 }, { 62, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_STAT_HUNGER_LABEL), makeProgressBar({ 65, (kListRowHeight * 2) + 4 + 43 }, { 119, 10 }, COLOUR_BRIGHT_RED, 67, 100), - makeWidget ({ 3, (kListRowHeight * 3) + 4 + 43 }, { 62, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_STAT_THIRST_LABEL), + makeWidget ({ 3, (kListRowHeight * 3) + 4 + 43 }, { 62, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_STAT_THIRST_LABEL), makeProgressBar({ 65, (kListRowHeight * 3) + 4 + 43 }, { 119, 10 }, COLOUR_BRIGHT_RED, 67, 100), - makeWidget ({ 3, (kListRowHeight * 4) + 4 + 43 }, { 62, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_STAT_NAUSEA_LABEL), + makeWidget ({ 3, (kListRowHeight * 4) + 4 + 43 }, { 62, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_STAT_NAUSEA_LABEL), makeProgressBar({ 65, (kListRowHeight * 4) + 4 + 43 }, { 119, 10 }, COLOUR_BRIGHT_RED, 47, 100), - makeWidget ({ 3, (kListRowHeight * 5) + 4 + 43 }, { 62, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_STAT_TOILET_LABEL), + makeWidget ({ 3, (kListRowHeight * 5) + 4 + 43 }, { 62, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_STAT_TOILET_LABEL), makeProgressBar({ 65, (kListRowHeight * 5) + 4 + 43 }, { 119, 10 }, COLOUR_BRIGHT_RED, 62, 100), - makeWidget ({ 3, (kListRowHeight * 7) + 9 + 43 }, { 180, 2 }, WindowWidgetType::HorizontalSeparator, WindowColour::secondary) + makeWidget ({ 3, (kListRowHeight * 7) + 9 + 43 }, { 180, 2 }, WidgetType::horizontalSeparator, WindowColour::secondary) ); static constexpr auto _guestWindowWidgetsRides = makeWidgets( kMainGuestWidgets, - makeWidget({ 3, 45 }, { 186, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_LABEL_RIDES_BEEN_ON), - makeWidget({ 3, 57 }, { 186, 87 }, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL) + makeWidget({ 3, 45 }, { 186, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_LABEL_RIDES_BEEN_ON), + makeWidget({ 3, 57 }, { 186, 87 }, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL) ); static constexpr auto _guestWindowWidgetsFinance = makeWidgets( @@ -164,12 +164,12 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _guestWindowWidgetsThoughts = makeWidgets( kMainGuestWidgets, - makeWidget({ 3, 45 }, { 186, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_GUEST_RECENT_THOUGHTS_LABEL) + makeWidget({ 3, 45 }, { 186, 10 }, WidgetType::label, WindowColour::secondary, STR_GUEST_RECENT_THOUGHTS_LABEL) ); static constexpr auto _guestWindowWidgetsInventory = makeWidgets( kMainGuestWidgets, - makeWidget({ 3, 45 }, { 186, 10 }, WindowWidgetType::Label, WindowColour::secondary, STR_CARRYING) + makeWidget({ 3, 45 }, { 186, 10 }, WidgetType::label, WindowColour::secondary, STR_CARRYING) ); static constexpr auto _guestWindowWidgetsDebug = makeWidgets( diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 9e7391df87..465525550a 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -59,17 +59,17 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_guest_list_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {350, 287}, WindowWidgetType::Resize, WindowColour::secondary ), // tab content panel - makeWidget({ 5, 59}, { 80, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_ARG_4_PAGE_X ), // page dropdown - makeWidget({ 73, 60}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // page dropdown button - makeWidget({120, 59}, {142, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown - makeWidget({250, 60}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button - makeWidget({273, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_MAP), STR_SHOW_GUESTS_ON_MAP_TIP ), // map - makeWidget({297, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_SEARCH), STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name - makeWidget({321, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_TRACK_PEEP), STR_TRACKED_GUESTS_ONLY_TIP ), // tracking + makeWidget({ 0, 43}, {350, 287}, WidgetType::resize, WindowColour::secondary ), // tab content panel + makeWidget({ 5, 59}, { 80, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_ARG_4_PAGE_X ), // page dropdown + makeWidget({ 73, 60}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // page dropdown button + makeWidget({120, 59}, {142, 12}, WidgetType::dropdownMenu, WindowColour::secondary, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown + makeWidget({250, 60}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button + makeWidget({273, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_MAP), STR_SHOW_GUESTS_ON_MAP_TIP ), // map + makeWidget({297, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_SEARCH), STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name + makeWidget({321, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_TRACK_PEEP), STR_TRACKED_GUESTS_ONLY_TIP ), // tracking makeTab ({ 3, 17}, STR_INDIVIDUAL_GUESTS_TIP ), // tab 1 makeTab ({ 34, 17}, STR_SUMMARISED_GUESTS_TIP ), // tab 2 - makeWidget({ 3, 72}, {344, 255}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_BOTH ) // guest list + makeWidget({ 3, 72}, {344, 255}, WidgetType::scroll, WindowColour::secondary, SCROLL_BOTH ) // guest list ); // clang-format on @@ -165,10 +165,10 @@ namespace OpenRCT2::Ui::Windows _selectedTab = TabId::Summarised; _selectedView = GuestViewType::Thoughts; _numPages = 1; - widgets[WIDX_TRACKING].type = WindowWidgetType::FlatBtn; - widgets[WIDX_FILTER_BY_NAME].type = WindowWidgetType::FlatBtn; - widgets[WIDX_PAGE_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_TRACKING].type = WidgetType::flatBtn; + widgets[WIDX_FILTER_BY_NAME].type = WidgetType::flatBtn; + widgets[WIDX_PAGE_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WidgetType::empty; WindowSetResize(*this, { 350, 330 }, { 500, 450 }); @@ -308,20 +308,20 @@ namespace OpenRCT2::Ui::Windows _selectedTab = static_cast(widgetIndex - WIDX_TAB_1); _selectedPage = 0; _numPages = 1; - widgets[WIDX_TRACKING].type = WindowWidgetType::Empty; + widgets[WIDX_TRACKING].type = WidgetType::empty; if (_selectedTab == TabId::Summarised) { - widgets[WIDX_FILTER_BY_NAME].type = WindowWidgetType::Empty; + widgets[WIDX_FILTER_BY_NAME].type = WidgetType::empty; SetWidgetPressed(WIDX_FILTER_BY_NAME, false); _filterName.clear(); } else if (_selectedTab == TabId::Individual) { - widgets[WIDX_TRACKING].type = WindowWidgetType::FlatBtn; - widgets[WIDX_FILTER_BY_NAME].type = WindowWidgetType::FlatBtn; + widgets[WIDX_TRACKING].type = WidgetType::flatBtn; + widgets[WIDX_FILTER_BY_NAME].type = WidgetType::flatBtn; } - widgets[WIDX_PAGE_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_PAGE_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WidgetType::empty; _tabAnimationIndex = 0; _selectedFilter = {}; Invalidate(); @@ -401,9 +401,9 @@ namespace OpenRCT2::Ui::Windows SetWidgetPressed(WIDX_TAB_1 + static_cast(_selectedTab), true); widgets[WIDX_INFO_TYPE_DROPDOWN].text = GetViewName(_selectedView); - widgets[WIDX_MAP].type = WindowWidgetType::Empty; + widgets[WIDX_MAP].type = WidgetType::empty; if (_selectedTab == TabId::Individual && _selectedFilter) - widgets[WIDX_MAP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_MAP].type = WidgetType::flatBtn; widgets[WIDX_GUEST_LIST].right = width - 4; widgets[WIDX_GUEST_LIST].bottom = height - 15; @@ -416,16 +416,16 @@ namespace OpenRCT2::Ui::Windows if (_numPages > 1) { - widgets[WIDX_PAGE_DROPDOWN].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WindowWidgetType::Button; + widgets[WIDX_PAGE_DROPDOWN].type = WidgetType::dropdownMenu; + widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WidgetType::button; auto ft = Formatter::Common(); ft.Increment(4); ft.Add(_selectedPage + 1); } else { - widgets[WIDX_PAGE_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_PAGE_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WidgetType::empty; } } @@ -564,9 +564,9 @@ namespace OpenRCT2::Ui::Windows _selectedFilter = _selectedView == GuestViewType::Actions ? GuestFilterType::Guests : GuestFilterType::GuestsThinking; _selectedTab = TabId::Individual; - widgets[WIDX_TRACKING].type = WindowWidgetType::FlatBtn; + widgets[WIDX_TRACKING].type = WidgetType::flatBtn; Invalidate(); - widgets[WIDX_FILTER_BY_NAME].type = WindowWidgetType::FlatBtn; + widgets[WIDX_FILTER_BY_NAME].type = WidgetType::flatBtn; scrolls[0].contentOffsetY = 0; RefreshList(); } diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 5fe47afee6..5f0d07db54 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -53,11 +53,11 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_install_track_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 4, 18}, {372, 219}, WindowWidgetType::FlatBtn, WindowColour::primary ), - makeWidget({PREVIEW_BUTTONS_LEFT, 422}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), - makeWidget({PREVIEW_BUTTONS_LEFT, 398}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_SCENERY), STR_TOGGLE_SCENERY_TIP), - makeWidget({ ACTION_BUTTONS_LEFT, 241}, { 97, 15}, WindowWidgetType::Button, WindowColour::primary, STR_INSTALL_NEW_TRACK_DESIGN_INSTALL ), - makeWidget({ ACTION_BUTTONS_LEFT, 259}, { 97, 15}, WindowWidgetType::Button, WindowColour::primary, STR_INSTALL_NEW_TRACK_DESIGN_CANCEL ) + makeWidget({ 4, 18}, {372, 219}, WidgetType::flatBtn, WindowColour::primary ), + makeWidget({PREVIEW_BUTTONS_LEFT, 422}, { 22, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), + makeWidget({PREVIEW_BUTTONS_LEFT, 398}, { 22, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_SCENERY), STR_TOGGLE_SCENERY_TIP), + makeWidget({ ACTION_BUTTONS_LEFT, 241}, { 97, 15}, WidgetType::button, WindowColour::primary, STR_INSTALL_NEW_TRACK_DESIGN_INSTALL ), + makeWidget({ ACTION_BUTTONS_LEFT, 259}, { 97, 15}, WidgetType::button, WindowColour::primary, STR_INSTALL_NEW_TRACK_DESIGN_CANCEL ) ); // clang-format on diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index d6b000eb49..2ee39d67e7 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -54,13 +54,13 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_land_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({19, 19}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_ENABLE_MOUNTAIN_TOOL_TIP), // mountain mode - makeWidget ({55, 19}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_DISABLE_ELEVATION), // paint mode - makeWidget ({27, 48}, {44, 32}, WindowWidgetType::ImgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0), kStringIdNone), // preview box - makeRemapWidget({28, 49}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP), // decrement size - makeRemapWidget({54, 63}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size - makeWidget ({ 2, 106}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP), // floor texture - makeWidget ({49, 106}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP) // wall texture + makeWidget ({19, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_ENABLE_MOUNTAIN_TOOL_TIP), // mountain mode + makeWidget ({55, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_DISABLE_ELEVATION), // paint mode + makeWidget ({27, 48}, {44, 32}, WidgetType::imgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0), kStringIdNone), // preview box + makeRemapWidget({28, 49}, {16, 16}, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP), // decrement size + makeRemapWidget({54, 63}, {16, 16}, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size + makeWidget ({ 2, 106}, {47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP), // floor texture + makeWidget ({49, 106}, {47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP) // wall texture ); // clang-format on @@ -405,7 +405,7 @@ namespace OpenRCT2::Ui::Windows return; const auto& widget = window->widgets[widget_index]; - if (widget.type != WindowWidgetType::Viewport) + if (widget.type != WidgetType::viewport) return; const auto* selectedViewport = window->viewport; diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index e2cca8ba67..dba503751e 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -60,16 +60,16 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_land_rights_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({ 27, 17}, { 44, 32}, WindowWidgetType::ImgBtn, WindowColour::primary, ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box - makeRemapWidget({ 28, 18}, { 16, 16}, WindowWidgetType::TrnBtn, WindowColour::primary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_RIGHTS_TIP ), // decrement size - makeRemapWidget({ 54, 32}, { 16, 16}, WindowWidgetType::TrnBtn, WindowColour::primary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size - makeRemapWidget({ 22, 53}, { 24, 24}, WindowWidgetType::ImgBtn, WindowColour::primary, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_RIGHTS_TIP ), // land rights - makeRemapWidget({ 52, 53}, { 24, 24}, WindowWidgetType::ImgBtn, WindowColour::primary, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUY_CONSTRUCTION_RIGHTS_TIP ), // construction rights - makeWidget ({100, 22}, {170, 12}, WindowWidgetType::Empty, WindowColour::primary, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP ), - makeWidget ({100, 38}, {170, 12}, WindowWidgetType::Empty, WindowColour::primary, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP ), - makeWidget ({100, 54}, {170, 12}, WindowWidgetType::Empty, WindowColour::primary, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP ), - makeWidget ({100, 70}, {170, 12}, WindowWidgetType::Empty, WindowColour::primary, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP), - makeWidget ({100, 86}, {170, 12}, WindowWidgetType::Empty, WindowColour::primary, STR_LAND_NOT_OWNED, STR_SET_LAND_TO_BE_NOT_OWNED_TIP ) + makeWidget ({ 27, 17}, { 44, 32}, WidgetType::imgBtn, WindowColour::primary, ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box + makeRemapWidget({ 28, 18}, { 16, 16}, WidgetType::trnBtn, WindowColour::primary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_RIGHTS_TIP ), // decrement size + makeRemapWidget({ 54, 32}, { 16, 16}, WidgetType::trnBtn, WindowColour::primary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size + makeRemapWidget({ 22, 53}, { 24, 24}, WidgetType::imgBtn, WindowColour::primary, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_RIGHTS_TIP ), // land rights + makeRemapWidget({ 52, 53}, { 24, 24}, WidgetType::imgBtn, WindowColour::primary, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUY_CONSTRUCTION_RIGHTS_TIP ), // construction rights + makeWidget ({100, 22}, {170, 12}, WidgetType::empty, WindowColour::primary, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP ), + makeWidget ({100, 38}, {170, 12}, WidgetType::empty, WindowColour::primary, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP ), + makeWidget ({100, 54}, {170, 12}, WidgetType::empty, WindowColour::primary, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP ), + makeWidget ({100, 70}, {170, 12}, WidgetType::empty, WindowColour::primary, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP), + makeWidget ({100, 86}, {170, 12}, WidgetType::empty, WindowColour::primary, STR_LAND_NOT_OWNED, STR_SET_LAND_TO_BE_NOT_OWNED_TIP ) ); // clang-format on @@ -317,15 +317,15 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_INCREMENT].bottom = widgets[WIDX_INCREMENT].top + 16; // Show in-game mode widgets - widgets[WIDX_BUY_LAND_RIGHTS].type = WindowWidgetType::ImgBtn; - widgets[WIDX_BUY_CONSTRUCTION_RIGHTS].type = WindowWidgetType::ImgBtn; + widgets[WIDX_BUY_LAND_RIGHTS].type = WidgetType::imgBtn; + widgets[WIDX_BUY_CONSTRUCTION_RIGHTS].type = WidgetType::imgBtn; // Hide editor/sandbox mode widgets - widgets[WIDX_UNOWNED_LAND_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_LAND_OWNED_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_CONSTRUCTION_RIGHTS_OWNED_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_LAND_SALE_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX].type = WindowWidgetType::Empty; + widgets[WIDX_UNOWNED_LAND_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_LAND_OWNED_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_CONSTRUCTION_RIGHTS_OWNED_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_LAND_SALE_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX].type = WidgetType::empty; } void PrepareDrawSandbox() @@ -340,15 +340,15 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_INCREMENT].bottom = widgets[WIDX_INCREMENT].top + 16; // Hide in-game mode widgets - widgets[WIDX_BUY_LAND_RIGHTS].type = WindowWidgetType::Empty; - widgets[WIDX_BUY_CONSTRUCTION_RIGHTS].type = WindowWidgetType::Empty; + widgets[WIDX_BUY_LAND_RIGHTS].type = WidgetType::empty; + widgets[WIDX_BUY_CONSTRUCTION_RIGHTS].type = WidgetType::empty; // Show editor/sandbox mode widgets - widgets[WIDX_UNOWNED_LAND_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_LAND_OWNED_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_CONSTRUCTION_RIGHTS_OWNED_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_LAND_SALE_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX].type = WindowWidgetType::Checkbox; + widgets[WIDX_UNOWNED_LAND_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_LAND_OWNED_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_CONSTRUCTION_RIGHTS_OWNED_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_LAND_SALE_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX].type = WidgetType::checkbox; } ScreenSize GetModeDimensions() const @@ -414,7 +414,7 @@ namespace OpenRCT2::Ui::Windows auto ft = Formatter(); ft.Add(_landRightsCost); - auto offset = widgets[WIDX_BUY_LAND_RIGHTS].type != WindowWidgetType::Empty ? 32 : 8; + auto offset = widgets[WIDX_BUY_LAND_RIGHTS].type != WidgetType::empty ? 32 : 8; screenCoords = { widgets[WIDX_PREVIEW].midX() + windowPos.x, widgets[WIDX_PREVIEW].bottom + windowPos.y + offset }; diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 6e9fc077e0..ba4363c5b3 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -102,18 +102,18 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_loadsave_widgets = makeWidgets( makeWindowShim(kStringIdNone, WW, WH), - makeWidget({ 0, 15 }, { WW, WH - 15 }, WindowWidgetType::Resize, WindowColour::secondary ), // WIDX_RESIZE - makeWidget({ WW - 100 - 4, 20 }, { 20, 20 }, WindowWidgetType::FlatBtn, WindowColour::primary, SPR_G2_FOLDER_PARENT, STR_PARENT_FOLDER_TIP ), // WIDX_PARENT_FOLDER - makeWidget({ WW - 50 - 4, 20 }, { 20, 20 }, WindowWidgetType::FlatBtn, WindowColour::primary, SPR_G2_FOLDER_NEW, STR_FILEBROWSER_ACTION_NEW_FOLDER), // WIDX_NEW_FOLDER - makeWidget({ WW - 75 - 4, 20 }, { 20, 20 }, WindowWidgetType::FlatBtn, WindowColour::primary, SPR_G2_FOLDER_DEFAULT, STR_LOADSAVE_DEFAULT_TIP ), // WIDX_DEFAULT_FOLDER - makeWidget({ WW - 25 - 4, 20 }, { 20, 20 }, WindowWidgetType::FlatBtn, WindowColour::primary, SPR_G2_SYSTEM_BROWSER, STR_FILEBROWSER_USE_SYSTEM_WINDOW), // WIDX_SYSTEM_BROWSER - makeWidget({ 4, 45 }, { 160, 14 }, WindowWidgetType::TableHeader, WindowColour::primary ), // WIDX_SORT_NAME - makeWidget({ (WW - 5) / 3 + 1, 45 }, { 160, 14 }, WindowWidgetType::TableHeader, WindowColour::primary ), // WIDX_SORT_SIZE - makeWidget({ (WW - 5) / 3 + 1, 45 }, { 160, 14 }, WindowWidgetType::TableHeader, WindowColour::primary ), // WIDX_SORT_DATE - makeWidget({ (WW - 19), 45 }, { 14, 14 }, WindowWidgetType::Button, WindowColour::primary, STR_DROPDOWN_GLYPH ), // WIDX_SORT_CUSTOMISE - makeWidget({ 4, 58 }, { 342, 303 }, WindowWidgetType::Scroll, WindowColour::primary, SCROLL_VERTICAL ), // WIDX_SCROLL - makeWidget({ 64, WH - 50 }, { WW - 133, 14 }, WindowWidgetType::TextBox, WindowColour::secondary ), // WIDX_FILENAME_TEXTBOX - makeWidget({ WW - 65, WH - 50 }, { 60, 14 }, WindowWidgetType::Button, WindowColour::secondary, STR_FILEBROWSER_SAVE_BUTTON ) // WIDX_SAVE + makeWidget({ 0, 15 }, { WW, WH - 15 }, WidgetType::resize, WindowColour::secondary ), // WIDX_RESIZE + makeWidget({ WW - 100 - 4, 20 }, { 20, 20 }, WidgetType::flatBtn, WindowColour::primary, SPR_G2_FOLDER_PARENT, STR_PARENT_FOLDER_TIP ), // WIDX_PARENT_FOLDER + makeWidget({ WW - 50 - 4, 20 }, { 20, 20 }, WidgetType::flatBtn, WindowColour::primary, SPR_G2_FOLDER_NEW, STR_FILEBROWSER_ACTION_NEW_FOLDER), // WIDX_NEW_FOLDER + makeWidget({ WW - 75 - 4, 20 }, { 20, 20 }, WidgetType::flatBtn, WindowColour::primary, SPR_G2_FOLDER_DEFAULT, STR_LOADSAVE_DEFAULT_TIP ), // WIDX_DEFAULT_FOLDER + makeWidget({ WW - 25 - 4, 20 }, { 20, 20 }, WidgetType::flatBtn, WindowColour::primary, SPR_G2_SYSTEM_BROWSER, STR_FILEBROWSER_USE_SYSTEM_WINDOW), // WIDX_SYSTEM_BROWSER + makeWidget({ 4, 45 }, { 160, 14 }, WidgetType::tableHeader, WindowColour::primary ), // WIDX_SORT_NAME + makeWidget({ (WW - 5) / 3 + 1, 45 }, { 160, 14 }, WidgetType::tableHeader, WindowColour::primary ), // WIDX_SORT_SIZE + makeWidget({ (WW - 5) / 3 + 1, 45 }, { 160, 14 }, WidgetType::tableHeader, WindowColour::primary ), // WIDX_SORT_DATE + makeWidget({ (WW - 19), 45 }, { 14, 14 }, WidgetType::button, WindowColour::primary, STR_DROPDOWN_GLYPH ), // WIDX_SORT_CUSTOMISE + makeWidget({ 4, 58 }, { 342, 303 }, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL ), // WIDX_SCROLL + makeWidget({ 64, WH - 50 }, { WW - 133, 14 }, WidgetType::textBox, WindowColour::secondary ), // WIDX_FILENAME_TEXTBOX + makeWidget({ WW - 65, WH - 50 }, { 60, 14 }, WidgetType::button, WindowColour::secondary, STR_FILEBROWSER_SAVE_BUTTON ) // WIDX_SAVE ); // clang-format on @@ -500,7 +500,7 @@ namespace OpenRCT2::Ui::Windows if (!uiContext.HasFilePicker()) { disabled_widgets |= (1uLL << WIDX_SYSTEM_BROWSER); - widgets[WIDX_SYSTEM_BROWSER].type = WindowWidgetType::Empty; + widgets[WIDX_SYSTEM_BROWSER].type = WidgetType::empty; } const bool isSave = action == LoadSaveAction::save; @@ -514,9 +514,9 @@ namespace OpenRCT2::Ui::Windows if (isSave) { - widgets[WIDX_FILENAME_TEXTBOX].type = WindowWidgetType::TextBox; + widgets[WIDX_FILENAME_TEXTBOX].type = WidgetType::textBox; widgets[WIDX_FILENAME_TEXTBOX].string = _currentFilename; - widgets[WIDX_SAVE].type = WindowWidgetType::Button; + widgets[WIDX_SAVE].type = WidgetType::button; // Set current filename String::set(_currentFilename, sizeof(_currentFilename), _defaultPath.c_str()); @@ -526,8 +526,8 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_FILENAME_TEXTBOX].type = WindowWidgetType::Empty; - widgets[WIDX_SAVE].type = WindowWidgetType::Empty; + widgets[WIDX_FILENAME_TEXTBOX].type = WidgetType::empty; + widgets[WIDX_SAVE].type = WidgetType::empty; } // Populate file list @@ -608,7 +608,7 @@ namespace OpenRCT2::Ui::Windows { // Date column on the right Widget& dateWidget = widgets[WIDX_SORT_DATE]; - dateWidget.type = WindowWidgetType::TableHeader; + dateWidget.type = WidgetType::tableHeader; dateWidget.right = customiseWidget.left - 1; dateWidget.left = dateWidget.right - (maxDateWidth + maxTimeWidth + (4 * kDateTimeGap) + (kScrollBarWidth + 1)); @@ -616,7 +616,7 @@ namespace OpenRCT2::Ui::Windows { // File size column in the middle Widget& sizeWidget = widgets[WIDX_SORT_SIZE]; - sizeWidget.type = WindowWidgetType::TableHeader; + sizeWidget.type = WidgetType::tableHeader; sizeWidget.right = dateWidget.left - 1; sizeWidget.left = sizeWidget.right - 65; @@ -627,7 +627,7 @@ namespace OpenRCT2::Ui::Windows { // Hide file size header Widget& sizeWidget = widgets[WIDX_SORT_SIZE]; - sizeWidget.type = WindowWidgetType::Empty; + sizeWidget.type = WidgetType::empty; // Name column is next to date column widgets[WIDX_SORT_NAME].right = dateWidget.left - 1; @@ -637,11 +637,11 @@ namespace OpenRCT2::Ui::Windows { // Hide date header Widget& dateWidget = widgets[WIDX_SORT_DATE]; - dateWidget.type = WindowWidgetType::Empty; + dateWidget.type = WidgetType::empty; // File size column on the right Widget& sizeWidget = widgets[WIDX_SORT_SIZE]; - sizeWidget.type = WindowWidgetType::TableHeader; + sizeWidget.type = WidgetType::tableHeader; sizeWidget.right = customiseWidget.left - 1; sizeWidget.left = sizeWidget.right - 65; @@ -654,8 +654,8 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_SORT_NAME].right = customiseWidget.left - 1; // Hide other columns - widgets[WIDX_SORT_SIZE].type = WindowWidgetType::Empty; - widgets[WIDX_SORT_DATE].type = WindowWidgetType::Empty; + widgets[WIDX_SORT_SIZE].type = WidgetType::empty; + widgets[WIDX_SORT_DATE].type = WidgetType::empty; } if (action == LoadSaveAction::save) @@ -666,7 +666,7 @@ namespace OpenRCT2::Ui::Windows auto saveLabel = LanguageGetString(STR_FILEBROWSER_SAVE_BUTTON); auto saveLabelWidth = GfxGetStringWidth(saveLabel, FontStyle::Medium) + 12; - widgets[WIDX_SAVE].type = WindowWidgetType::Button; + widgets[WIDX_SAVE].type = WidgetType::button; widgets[WIDX_SAVE].top = height - paddingBottom - 15; widgets[WIDX_SAVE].bottom = height - paddingBottom - 3; widgets[WIDX_SAVE].right = widgets[WIDX_SCROLL].right; @@ -676,7 +676,7 @@ namespace OpenRCT2::Ui::Windows auto filenameLabel = LanguageGetString(STR_FILENAME_LABEL); auto filenameLabelWidth = GfxGetStringWidth(filenameLabel, FontStyle::Medium); - widgets[WIDX_FILENAME_TEXTBOX].type = WindowWidgetType::TextBox; + widgets[WIDX_FILENAME_TEXTBOX].type = WidgetType::textBox; widgets[WIDX_FILENAME_TEXTBOX].top = height - paddingBottom - 15; widgets[WIDX_FILENAME_TEXTBOX].bottom = height - paddingBottom - 3; widgets[WIDX_FILENAME_TEXTBOX].left = 4 + filenameLabelWidth + 6; @@ -684,8 +684,8 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_SAVE].type = WindowWidgetType::Empty; - widgets[WIDX_FILENAME_TEXTBOX].type = WindowWidgetType::Empty; + widgets[WIDX_SAVE].type = WidgetType::empty; + widgets[WIDX_FILENAME_TEXTBOX].type = WidgetType::empty; } } diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index 6c3aa00bc9..209fd029bd 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -21,7 +21,7 @@ namespace OpenRCT2::Ui::Windows { // clang-format off static constexpr Widget _mainWidgets[] = { - makeWidget({0, 0}, {0, 0}, WindowWidgetType::Viewport, WindowColour::primary), + makeWidget({0, 0}, {0, 0}, WidgetType::viewport, WindowColour::primary), }; // clang-format on diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 67d8462e50..eae1ef6f04 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -133,17 +133,17 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_map_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({ 0, 43}, {245, 215}, WindowWidgetType::Resize, WindowColour::secondary ), - makeRemapWidget ({ 3, 17}, { 31, 27}, WindowWidgetType::ColourBtn, WindowColour::secondary, SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP ), - makeRemapWidget ({ 34, 17}, { 31, 27}, WindowWidgetType::ColourBtn, WindowColour::secondary, SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP), - makeWidget ({ 3, 46}, {239, 180}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_BOTH ), - makeSpinnerWidgets({102, 229}, { 50, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_COMMA16 ), // NB: 3 widgets - makeWidget ({153, 230}, { 20, 12}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_LINK_CHAIN), STR_MAINTAIN_SQUARE_MAP_TOOLTIP ), - makeSpinnerWidgets({174, 229}, { 50, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_POP16_COMMA16 ), // NB: 3 widgets - makeWidget ({ 4, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_BUY_LAND_RIGHTS), STR_SELECT_PARK_OWNED_LAND_TIP ), - makeWidget ({ 4, 70}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_PEEP_SPAWN), STR_SET_STARTING_POSITIONS_TIP ), - makeWidget ({ 28, 94}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PARK_ENTRANCE), STR_BUILD_PARK_ENTRANCE_TIP ), - makeWidget ({110, 118}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_MAP_GEN_BTN), STR_MAP_GENERATOR_TIP ) + makeWidget ({ 0, 43}, {245, 215}, WidgetType::resize, WindowColour::secondary ), + makeRemapWidget ({ 3, 17}, { 31, 27}, WidgetType::colourBtn, WindowColour::secondary, SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP ), + makeRemapWidget ({ 34, 17}, { 31, 27}, WidgetType::colourBtn, WindowColour::secondary, SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP), + makeWidget ({ 3, 46}, {239, 180}, WidgetType::scroll, WindowColour::secondary, SCROLL_BOTH ), + makeSpinnerWidgets({102, 229}, { 50, 12}, WidgetType::spinner, WindowColour::secondary, STR_COMMA16 ), // NB: 3 widgets + makeWidget ({153, 230}, { 20, 12}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_LINK_CHAIN), STR_MAINTAIN_SQUARE_MAP_TOOLTIP ), + makeSpinnerWidgets({174, 229}, { 50, 12}, WidgetType::spinner, WindowColour::secondary, STR_POP16_COMMA16 ), // NB: 3 widgets + makeWidget ({ 4, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_BUY_LAND_RIGHTS), STR_SELECT_PARK_OWNED_LAND_TIP ), + makeWidget ({ 4, 70}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_PEEP_SPAWN), STR_SET_STARTING_POSITIONS_TIP ), + makeWidget ({ 28, 94}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PARK_ENTRANCE), STR_BUILD_PARK_ENTRANCE_TIP ), + makeWidget ({110, 118}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_MAP_GEN_BTN), STR_MAP_GENERATOR_TIP ) ); // clang-format on @@ -647,7 +647,7 @@ namespace OpenRCT2::Ui::Windows // Disable all scenario editor related widgets for (int32_t i = WIDX_MAP_SIZE_SPINNER_Y; i <= WIDX_MAP_GENERATOR; i++) { - widgets[i].type = WindowWidgetType::Empty; + widgets[i].type = WidgetType::empty; } if (isEditorOrSandbox()) @@ -1093,21 +1093,21 @@ namespace OpenRCT2::Ui::Windows void ShowDefaultScenarioEditorButtons() { - widgets[WIDX_SET_LAND_RIGHTS].type = WindowWidgetType::FlatBtn; - widgets[WIDX_BUILD_PARK_ENTRANCE].type = WindowWidgetType::FlatBtn; - widgets[WIDX_PEOPLE_STARTING_POSITION].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SET_LAND_RIGHTS].type = WidgetType::flatBtn; + widgets[WIDX_BUILD_PARK_ENTRANCE].type = WidgetType::flatBtn; + widgets[WIDX_PEOPLE_STARTING_POSITION].type = WidgetType::flatBtn; // Only show this in the scenario editor, even when in sandbox mode. if (gLegacyScene == LegacyScene::scenarioEditor) - widgets[WIDX_MAP_GENERATOR].type = WindowWidgetType::FlatBtn; + widgets[WIDX_MAP_GENERATOR].type = WidgetType::flatBtn; - widgets[WIDX_MAP_SIZE_SPINNER_Y].type = WindowWidgetType::Spinner; - widgets[WIDX_MAP_SIZE_SPINNER_Y_UP].type = WindowWidgetType::Button; - widgets[WIDX_MAP_SIZE_SPINNER_Y_DOWN].type = WindowWidgetType::Button; - widgets[WIDX_MAP_SIZE_LINK].type = WindowWidgetType::FlatBtn; - widgets[WIDX_MAP_SIZE_SPINNER_X].type = WindowWidgetType::Spinner; - widgets[WIDX_MAP_SIZE_SPINNER_X_UP].type = WindowWidgetType::Button; - widgets[WIDX_MAP_SIZE_SPINNER_X_DOWN].type = WindowWidgetType::Button; + widgets[WIDX_MAP_SIZE_SPINNER_Y].type = WidgetType::spinner; + widgets[WIDX_MAP_SIZE_SPINNER_Y_UP].type = WidgetType::button; + widgets[WIDX_MAP_SIZE_SPINNER_Y_DOWN].type = WidgetType::button; + widgets[WIDX_MAP_SIZE_LINK].type = WidgetType::flatBtn; + widgets[WIDX_MAP_SIZE_SPINNER_X].type = WidgetType::spinner; + widgets[WIDX_MAP_SIZE_SPINNER_X_UP].type = WidgetType::button; + widgets[WIDX_MAP_SIZE_SPINNER_X_DOWN].type = WidgetType::button; // Push width (Y) and height (X) to the common formatter arguments for the map size spinners to use auto& gameState = getGameState(); diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 57acd706d3..1b57b889c4 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -118,55 +118,55 @@ namespace OpenRCT2::Ui::Windows static constexpr auto makeMapGenWidgets = [](StringId title) { return makeWidgets( makeWindowShim(title, kWindowSize.width, kWindowSize.height), - makeWidget({ 0, 43 }, { kWindowSize.width, 177 }, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43 }, { kWindowSize.width, 177 }, WidgetType::resize, WindowColour::secondary), makeTab ({ 3, 17 }), makeTab ({ 34, 17 }), makeTab ({ 65, 17 }), makeTab ({ 96, 17 }), - makeWidget({ 185, 200 }, { 109, 14 }, WindowWidgetType::Button, WindowColour::secondary, STR_MAPGEN_ACTION_GENERATE) + makeWidget({ 185, 200 }, { 109, 14 }, WidgetType::button, WindowColour::secondary, STR_MAPGEN_ACTION_GENERATE) ); }; static constexpr auto BaseWidgets = makeWidgets( makeMapGenWidgets(STR_MAPGEN_CAPTION_GENERATOR), - makeSpinnerWidgets ({165, 52}, { 50, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_COMMA16 ), // NB: 3 widgets - makeWidget ({216, 52}, { 21, 12}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_LINK_CHAIN), STR_MAINTAIN_SQUARE_MAP_TOOLTIP), - makeSpinnerWidgets ({238, 52}, { 50, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_POP16_COMMA16 ), // NB: 3 widgets - makeDropdownWidgets({155, 70}, {133, 14}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_HEIGHTMAP_FLATLAND ), + makeSpinnerWidgets ({165, 52}, { 50, 12}, WidgetType::spinner, WindowColour::secondary, STR_COMMA16 ), // NB: 3 widgets + makeWidget ({216, 52}, { 21, 12}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_LINK_CHAIN), STR_MAINTAIN_SQUARE_MAP_TOOLTIP), + makeSpinnerWidgets ({238, 52}, { 50, 12}, WidgetType::spinner, WindowColour::secondary, STR_POP16_COMMA16 ), // NB: 3 widgets + makeDropdownWidgets({155, 70}, {133, 14}, WidgetType::dropdownMenu, WindowColour::secondary, STR_HEIGHTMAP_FLATLAND ), - makeWidget ({ 5, 90}, {290, 55}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_MAPGEN_SIMPLEX_NOISE), // WIDX_SIMPLEX_GROUP - makeSpinnerWidgets({179, 107}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN} - makeSpinnerWidgets({179, 125}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN} + makeWidget ({ 5, 90}, {290, 55}, WidgetType::groupbox, WindowColour::secondary, STR_MAPGEN_SIMPLEX_NOISE), // WIDX_SIMPLEX_GROUP + makeSpinnerWidgets({179, 107}, {109, 12}, WidgetType::spinner, WindowColour::secondary ), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN} + makeSpinnerWidgets({179, 125}, {109, 12}, WidgetType::spinner, WindowColour::secondary ), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN} - makeWidget ({ 5, 90}, {290, 86}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_MAPGEN_SELECT_HEIGHTMAP), // WIDX_HEIGHTMAP_GROUP - makeWidget ({223, 107}, { 65, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_BROWSE ), // WIDX_HEIGHTMAP_BROWSE - makeWidget ({ 10, 125}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAPGEN_NORMALIZE ), // WIDX_HEIGHTMAP_NORMALIZE - makeWidget ({ 10, 141}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAPGEN_SMOOTH_HEIGHTMAP), // WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP - makeSpinnerWidgets({179, 157}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary ) // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN} + makeWidget ({ 5, 90}, {290, 86}, WidgetType::groupbox, WindowColour::secondary, STR_MAPGEN_SELECT_HEIGHTMAP), // WIDX_HEIGHTMAP_GROUP + makeWidget ({223, 107}, { 65, 14}, WidgetType::button, WindowColour::secondary, STR_BROWSE ), // WIDX_HEIGHTMAP_BROWSE + makeWidget ({ 10, 125}, {150, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAPGEN_NORMALIZE ), // WIDX_HEIGHTMAP_NORMALIZE + makeWidget ({ 10, 141}, {150, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAPGEN_SMOOTH_HEIGHTMAP), // WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP + makeSpinnerWidgets({179, 157}, {109, 12}, WidgetType::spinner, WindowColour::secondary ) // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN} ); static constexpr auto TerrainWidgets = makeWidgets( makeMapGenWidgets(STR_MAPGEN_CAPTION_TERRAIN), - makeSpinnerWidgets({179, 52}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN} - makeSpinnerWidgets({179, 70}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN} - makeWidget ({179, 88}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), - makeWidget ({236, 88}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), - makeWidget ({ 10, 106}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAPGEN_OPTION_RANDOM_TERRAIN ), - makeWidget ({ 10, 122}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAPGEN_SMOOTH_TILE) // WIDX_HEIGHTMAP_SMOOTH_TILE_EDGES + makeSpinnerWidgets({179, 52}, {109, 12}, WidgetType::spinner, WindowColour::secondary ), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN} + makeSpinnerWidgets({179, 70}, {109, 12}, WidgetType::spinner, WindowColour::secondary ), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN} + makeWidget ({179, 88}, { 47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), + makeWidget ({236, 88}, { 47, 36}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), + makeWidget ({ 10, 106}, {150, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAPGEN_OPTION_RANDOM_TERRAIN ), + makeWidget ({ 10, 122}, {150, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAPGEN_SMOOTH_TILE) // WIDX_HEIGHTMAP_SMOOTH_TILE_EDGES ); static constexpr auto WaterWidgets = makeWidgets( makeMapGenWidgets(STR_MAPGEN_CAPTION_WATER), - makeSpinnerWidgets({179, 52}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary ), // NB: 3 widgets - makeWidget ({ 10, 70}, {255, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_BEACHES_WATER_BODIES) + makeSpinnerWidgets({179, 52}, {109, 12}, WidgetType::spinner, WindowColour::secondary ), // NB: 3 widgets + makeWidget ({ 10, 70}, {255, 12}, WidgetType::checkbox, WindowColour::secondary, STR_BEACHES_WATER_BODIES) ); static constexpr auto ForestsWidgets = makeWidgets( makeMapGenWidgets(STR_MAPGEN_CAPTION_FORESTS), - makeWidget ({ 10, 52}, {255, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAPGEN_OPTION_PLACE_TREES), - makeSpinnerWidgets({179, 70}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_TREE_LAND_RATIO{,_UP,_DOWN} - makeSpinnerWidgets({179, 88}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_TREE_ALTITUDE_MIN{,_UP,_DOWN} - makeSpinnerWidgets({179, 106}, {109, 12}, WindowWidgetType::Spinner, WindowColour::secondary) // WIDX_TREE_ALTITUDE_MAX{,_UP,_DOWN} + makeWidget ({ 10, 52}, {255, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAPGEN_OPTION_PLACE_TREES), + makeSpinnerWidgets({179, 70}, {109, 12}, WidgetType::spinner, WindowColour::secondary), // WIDX_TREE_LAND_RATIO{,_UP,_DOWN} + makeSpinnerWidgets({179, 88}, {109, 12}, WidgetType::spinner, WindowColour::secondary), // WIDX_TREE_ALTITUDE_MIN{,_UP,_DOWN} + makeSpinnerWidgets({179, 106}, {109, 12}, WidgetType::spinner, WindowColour::secondary) // WIDX_TREE_ALTITUDE_MAX{,_UP,_DOWN} ); static std::span PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = { @@ -575,26 +575,26 @@ namespace OpenRCT2::Ui::Windows void ToggleSimplexWidgets(bool state) { // clang-format off - widgets[WIDX_SIMPLEX_GROUP].type = state ? WindowWidgetType::Groupbox : WindowWidgetType::Empty; - widgets[WIDX_SIMPLEX_BASE_FREQ].type = state ? WindowWidgetType::Spinner : WindowWidgetType::Empty; - widgets[WIDX_SIMPLEX_BASE_FREQ_UP].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; - widgets[WIDX_SIMPLEX_BASE_FREQ_DOWN].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; - widgets[WIDX_SIMPLEX_OCTAVES].type = state ? WindowWidgetType::Spinner : WindowWidgetType::Empty; - widgets[WIDX_SIMPLEX_OCTAVES_UP].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; - widgets[WIDX_SIMPLEX_OCTAVES_DOWN].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; + widgets[WIDX_SIMPLEX_GROUP].type = state ? WidgetType::groupbox : WidgetType::empty; + widgets[WIDX_SIMPLEX_BASE_FREQ].type = state ? WidgetType::spinner : WidgetType::empty; + widgets[WIDX_SIMPLEX_BASE_FREQ_UP].type = state ? WidgetType::button : WidgetType::empty; + widgets[WIDX_SIMPLEX_BASE_FREQ_DOWN].type = state ? WidgetType::button : WidgetType::empty; + widgets[WIDX_SIMPLEX_OCTAVES].type = state ? WidgetType::spinner : WidgetType::empty; + widgets[WIDX_SIMPLEX_OCTAVES_UP].type = state ? WidgetType::button : WidgetType::empty; + widgets[WIDX_SIMPLEX_OCTAVES_DOWN].type = state ? WidgetType::button : WidgetType::empty; // clang-format on } void ToggleHeightmapWidgets(bool state) { // clang-format off - widgets[WIDX_HEIGHTMAP_GROUP].type = state ? WindowWidgetType::Groupbox : WindowWidgetType::Empty; - widgets[WIDX_HEIGHTMAP_BROWSE].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; - widgets[WIDX_HEIGHTMAP_NORMALIZE].type = state ? WindowWidgetType::Checkbox : WindowWidgetType::Empty; - widgets[WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP].type = state ? WindowWidgetType::Checkbox : WindowWidgetType::Empty; - widgets[WIDX_HEIGHTMAP_STRENGTH].type = state ? WindowWidgetType::Spinner : WindowWidgetType::Empty; - widgets[WIDX_HEIGHTMAP_STRENGTH_UP].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; - widgets[WIDX_HEIGHTMAP_STRENGTH_DOWN].type = state ? WindowWidgetType::Button : WindowWidgetType::Empty; + widgets[WIDX_HEIGHTMAP_GROUP].type = state ? WidgetType::groupbox : WidgetType::empty; + widgets[WIDX_HEIGHTMAP_BROWSE].type = state ? WidgetType::button : WidgetType::empty; + widgets[WIDX_HEIGHTMAP_NORMALIZE].type = state ? WidgetType::checkbox : WidgetType::empty; + widgets[WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP].type = state ? WidgetType::checkbox : WidgetType::empty; + widgets[WIDX_HEIGHTMAP_STRENGTH].type = state ? WidgetType::spinner : WidgetType::empty; + widgets[WIDX_HEIGHTMAP_STRENGTH_UP].type = state ? WidgetType::button : WidgetType::empty; + widgets[WIDX_HEIGHTMAP_STRENGTH_DOWN].type = state ? WidgetType::button : WidgetType::empty; // clang-format on } diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index 25de24534d..ecf4029b73 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -22,7 +22,7 @@ namespace OpenRCT2::Ui::Windows { // clang-format off static constexpr Widget window_map_tooltip_widgets[] = { - makeWidget({0, 0}, {200, 30}, WindowWidgetType::ImgBtn, WindowColour::primary), + makeWidget({0, 0}, {200, 30}, WidgetType::imgBtn, WindowColour::primary), }; // clang-format on diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 315f215414..ef8da3de93 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -62,39 +62,39 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_maze_construction_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 3, 17}, {160, 55}, WindowWidgetType::Groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_MODE ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({35, 29}, { 32, 32}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_MAZE_CONSTRUCTION_BUILD), STR_RIDE_CONSTRUCTION_BUILD_MODE ), - makeWidget({67, 29}, { 32, 32}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_MAZE_CONSTRUCTION_MOVE), STR_RIDE_CONSTRUCTION_MOVE_MODE ), - makeWidget({99, 29}, { 32, 32}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_MAZE_CONSTRUCTION_FILL_IN), STR_RIDE_CONSTRUCTION_FILL_IN_MODE ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 3, 168}, {160, 28}, WindowWidgetType::Groupbox, WindowColour::primary ), - makeWidget({ 3, 80}, {160, 87}, WindowWidgetType::Groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_BUILD ), - makeWidget({83, 96}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NE), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - makeWidget({83, 125}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SE), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - makeWidget({38, 125}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SW), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - makeWidget({38, 96}, { 45, 29}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NW), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - makeWidget({ 9, 178}, { 70, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), - makeWidget({87, 178}, { 70, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary ) + makeWidget({ 3, 17}, {160, 55}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_MODE ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({35, 29}, { 32, 32}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_MAZE_CONSTRUCTION_BUILD), STR_RIDE_CONSTRUCTION_BUILD_MODE ), + makeWidget({67, 29}, { 32, 32}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_MAZE_CONSTRUCTION_MOVE), STR_RIDE_CONSTRUCTION_MOVE_MODE ), + makeWidget({99, 29}, { 32, 32}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_MAZE_CONSTRUCTION_FILL_IN), STR_RIDE_CONSTRUCTION_FILL_IN_MODE ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 3, 168}, {160, 28}, WidgetType::groupbox, WindowColour::primary ), + makeWidget({ 3, 80}, {160, 87}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_BUILD ), + makeWidget({83, 96}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NE), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + makeWidget({83, 125}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SE), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + makeWidget({38, 125}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_SW), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + makeWidget({38, 96}, { 45, 29}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION_DIRECTION_NW), STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + makeWidget({ 9, 178}, { 70, 12}, WidgetType::button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), + makeWidget({87, 178}, { 70, 12}, WidgetType::button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ) ); // clang-format on diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index edeffa4bd1..aaafea602c 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -65,7 +65,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto kMainMultiplayerWidgets = makeWidgets( makeWindowShim(kStringIdNone, 340, 240), - makeWidget({ 0, 43}, {340, 197}, WindowWidgetType::Resize, WindowColour::secondary ), + makeWidget({ 0, 43}, {340, 197}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP), makeTab ({ 34, 17}, STR_PLAYERS_TIP ), makeTab ({ 65, 17}, STR_GROUPS_TIP ), @@ -78,30 +78,30 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_multiplayer_players_widgets = makeWidgets( kMainMultiplayerWidgets, - makeWidget({ 3, 46}, {173, 15}, WindowWidgetType::TableHeader, WindowColour::primary , STR_PLAYER ), // Player name - makeWidget({176, 46}, { 83, 15}, WindowWidgetType::TableHeader, WindowColour::primary , STR_GROUP ), // Player name - makeWidget({259, 46}, {100, 15}, WindowWidgetType::TableHeader, WindowColour::primary , STR_LAST_ACTION), // Player name - makeWidget({359, 46}, { 42, 15}, WindowWidgetType::TableHeader, WindowColour::primary , STR_PING ), // Player name - makeWidget({ 3, 60}, {334, 177}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL) // list + makeWidget({ 3, 46}, {173, 15}, WidgetType::tableHeader, WindowColour::primary , STR_PLAYER ), // Player name + makeWidget({176, 46}, { 83, 15}, WidgetType::tableHeader, WindowColour::primary , STR_GROUP ), // Player name + makeWidget({259, 46}, {100, 15}, WidgetType::tableHeader, WindowColour::primary , STR_LAST_ACTION), // Player name + makeWidget({359, 46}, { 42, 15}, WidgetType::tableHeader, WindowColour::primary , STR_PING ), // Player name + makeWidget({ 3, 60}, {334, 177}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL) // list ); static constexpr auto window_multiplayer_groups_widgets = makeWidgets( kMainMultiplayerWidgets, - makeWidget({141, 46}, {175, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // default group - makeWidget({305, 47}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH), - makeWidget({ 11, 65}, { 92, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_ADD_GROUP ), // add group button - makeWidget({113, 65}, { 92, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_REMOVE_GROUP ), // remove group button - makeWidget({215, 65}, { 92, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_RENAME_GROUP ), // rename group button - makeWidget({ 72, 80}, {175, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // selected group - makeWidget({236, 81}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH), - makeWidget({ 3, 94}, {314, 207}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ) // permissions list + makeWidget({141, 46}, {175, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // default group + makeWidget({305, 47}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH), + makeWidget({ 11, 65}, { 92, 12}, WidgetType::button, WindowColour::secondary, STR_ADD_GROUP ), // add group button + makeWidget({113, 65}, { 92, 12}, WidgetType::button, WindowColour::secondary, STR_REMOVE_GROUP ), // remove group button + makeWidget({215, 65}, { 92, 12}, WidgetType::button, WindowColour::secondary, STR_RENAME_GROUP ), // rename group button + makeWidget({ 72, 80}, {175, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // selected group + makeWidget({236, 81}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH), + makeWidget({ 3, 94}, {314, 207}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ) // permissions list ); static constexpr auto window_multiplayer_options_widgets = makeWidgets( kMainMultiplayerWidgets, - makeWidget({3, 50}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_LOG_CHAT, STR_LOG_CHAT_TIP ), - makeWidget({3, 64}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_LOG_SERVER_ACTIONS, STR_LOG_SERVER_ACTIONS_TIP ), - makeWidget({3, 78}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_ALLOW_KNOWN_KEYS_ONLY, STR_ALLOW_KNOWN_KEYS_ONLY_TIP) + makeWidget({3, 50}, {295, 12}, WidgetType::checkbox, WindowColour::secondary, STR_LOG_CHAT, STR_LOG_CHAT_TIP ), + makeWidget({3, 64}, {295, 12}, WidgetType::checkbox, WindowColour::secondary, STR_LOG_SERVER_ACTIONS, STR_LOG_SERVER_ACTIONS_TIP ), + makeWidget({3, 78}, {295, 12}, WidgetType::checkbox, WindowColour::secondary, STR_ALLOW_KNOWN_KEYS_ONLY, STR_ALLOW_KNOWN_KEYS_ONLY_TIP) ); static std::span window_multiplayer_page_widgets[] = { @@ -429,7 +429,7 @@ namespace OpenRCT2::Ui::Windows if (NetworkGetMode() == NETWORK_MODE_CLIENT) { - widgets[WIDX_KNOWN_KEYS_ONLY_CHECKBOX].type = WindowWidgetType::Empty; + widgets[WIDX_KNOWN_KEYS_ONLY_CHECKBOX].type = WidgetType::empty; } SetCheckboxValue(WIDX_LOG_CHAT_CHECKBOX, Config::Get().network.LogChat); diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 810616e14c..e39269614c 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -50,12 +50,12 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_new_campaign_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({ 14, 24}, {126, 12}, WindowWidgetType::Label, WindowColour::primary, kStringIdEmpty ), // ride label - makeWidget ({100, 24}, {242, 12}, WindowWidgetType::DropdownMenu, WindowColour::primary, kStringIdEmpty ), // ride dropdown - makeWidget ({330, 25}, { 11, 10}, WindowWidgetType::Button, WindowColour::primary, STR_DROPDOWN_GLYPH ), // ride dropdown button - makeWidget ({ 14, 41}, {126, 14}, WindowWidgetType::Label, WindowColour::primary, STR_LENGTH_OF_TIME ), // weeks label - makeSpinnerWidgets({120, 41}, {100, 14}, WindowWidgetType::Spinner, WindowColour::primary, kStringIdEmpty ), // weeks (3 widgets) - makeWidget ({ 14, 89}, {322, 14}, WindowWidgetType::Button, WindowColour::primary, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN) // start button + makeWidget ({ 14, 24}, {126, 12}, WidgetType::label, WindowColour::primary, kStringIdEmpty ), // ride label + makeWidget ({100, 24}, {242, 12}, WidgetType::dropdownMenu, WindowColour::primary, kStringIdEmpty ), // ride dropdown + makeWidget ({330, 25}, { 11, 10}, WidgetType::button, WindowColour::primary, STR_DROPDOWN_GLYPH ), // ride dropdown button + makeWidget ({ 14, 41}, {126, 14}, WidgetType::label, WindowColour::primary, STR_LENGTH_OF_TIME ), // weeks label + makeSpinnerWidgets({120, 41}, {100, 14}, WidgetType::spinner, WindowColour::primary, kStringIdEmpty ), // weeks (3 widgets) + makeWidget ({ 14, 89}, {322, 14}, WidgetType::button, WindowColour::primary, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN) // start button ); // clang-format on @@ -317,17 +317,17 @@ namespace OpenRCT2::Ui::Windows void OnPrepareDraw() override { - widgets[WIDX_RIDE_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_RIDE_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_RIDE_LABEL].type = WidgetType::empty; + widgets[WIDX_RIDE_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WidgetType::empty; widgets[WIDX_RIDE_DROPDOWN].text = STR_MARKETING_NOT_SELECTED; switch (Campaign.campaign_type) { case ADVERTISING_CAMPAIGN_RIDE_FREE: case ADVERTISING_CAMPAIGN_RIDE: - widgets[WIDX_RIDE_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_RIDE_DROPDOWN].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WindowWidgetType::Button; + widgets[WIDX_RIDE_LABEL].type = WidgetType::label; + widgets[WIDX_RIDE_DROPDOWN].type = WidgetType::dropdownMenu; + widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WidgetType::button; widgets[WIDX_RIDE_LABEL].text = STR_MARKETING_RIDE; if (Campaign.RideId != RideId::GetNull()) { @@ -342,9 +342,9 @@ namespace OpenRCT2::Ui::Windows } break; case ADVERTISING_CAMPAIGN_FOOD_OR_DRINK_FREE: - widgets[WIDX_RIDE_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_RIDE_DROPDOWN].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WindowWidgetType::Button; + widgets[WIDX_RIDE_LABEL].type = WidgetType::label; + widgets[WIDX_RIDE_DROPDOWN].type = WidgetType::dropdownMenu; + widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WidgetType::button; widgets[WIDX_RIDE_LABEL].text = STR_MARKETING_ITEM; if (Campaign.ShopItemId != SELECTED_ITEM_UNDEFINED) { @@ -358,7 +358,7 @@ namespace OpenRCT2::Ui::Windows // Enable / disable start button based on ride dropdown WidgetSetDisabled(*this, WIDX_START_BUTTON, false); - if (widgets[WIDX_RIDE_DROPDOWN].type == WindowWidgetType::DropdownMenu && Campaign.RideId == RideId::GetNull()) + if (widgets[WIDX_RIDE_DROPDOWN].type == WidgetType::dropdownMenu && Campaign.RideId == RideId::GetNull()) WidgetSetDisabled(*this, WIDX_START_BUTTON, true); } diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 768b2e5ffe..33ff37f04d 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -211,7 +211,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_new_ride_widgets = makeWidgets( makeWindowShim(WindowTitle, WindowWidth, kWindowHeight), - makeWidget({ 0, 43}, {601, 339}, WindowWidgetType::Resize, WindowColour::secondary ), + makeWidget({ 0, 43}, {601, 339}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_TRANSPORT_RIDES_TIP ), makeTab ({ 34, 17}, STR_GENTLE_RIDES_TIP ), makeTab ({ 65, 17}, STR_ROLLER_COASTERS_TIP ), @@ -219,14 +219,14 @@ namespace OpenRCT2::Ui::Windows makeTab ({127, 17}, STR_WATER_RIDES_TIP ), makeTab ({158, 17}, STR_SHOPS_STALLS_TIP ), makeTab ({189, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), - makeWidget({ 3, 62}, {595, 256}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), - makeWidget({ 3, 47}, {290, 70}, WindowWidgetType::Groupbox, WindowColour::tertiary, STR_CURRENTLY_IN_DEVELOPMENT ), - makeWidget({ 3, 124}, {290, 65}, WindowWidgetType::Groupbox, WindowColour::tertiary, STR_LAST_DEVELOPMENT ), - makeWidget({265, 161}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::tertiary, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP), - makeWidget({265, 68}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::tertiary, ImageId(SPR_FINANCE), STR_FINANCES_RESEARCH_TIP ), - makeWidget({ 4, 46}, {211, 14}, WindowWidgetType::TextBox, WindowColour::secondary ), - makeWidget({218, 46}, { 70, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_OBJECT_SEARCH_CLEAR ), - makeWidget(GroupByTrackTypeOrigin, GroupTrackTypeSize, WindowWidgetType::Checkbox, WindowColour::secondary, STR_GROUP_BY_TRACK_TYPE, STR_GROUP_BY_TRACK_TYPE_TIP ) + makeWidget({ 3, 62}, {595, 256}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), + makeWidget({ 3, 47}, {290, 70}, WidgetType::groupbox, WindowColour::tertiary, STR_CURRENTLY_IN_DEVELOPMENT ), + makeWidget({ 3, 124}, {290, 65}, WidgetType::groupbox, WindowColour::tertiary, STR_LAST_DEVELOPMENT ), + makeWidget({265, 161}, { 24, 24}, WidgetType::flatBtn, WindowColour::tertiary, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP), + makeWidget({265, 68}, { 24, 24}, WidgetType::flatBtn, WindowColour::tertiary, ImageId(SPR_FINANCE), STR_FINANCES_RESEARCH_TIP ), + makeWidget({ 4, 46}, {211, 14}, WidgetType::textBox, WindowColour::secondary ), + makeWidget({218, 46}, { 70, 14}, WidgetType::button, WindowColour::secondary, STR_OBJECT_SEARCH_CLEAR ), + makeWidget(GroupByTrackTypeOrigin, GroupTrackTypeSize, WidgetType::checkbox, WindowColour::secondary, STR_GROUP_BY_TRACK_TYPE, STR_GROUP_BY_TRACK_TYPE_TIP ) ); // clang-format on @@ -401,11 +401,11 @@ namespace OpenRCT2::Ui::Windows pressed_widgets &= ~(1LL << WIDX_GROUP_BY_TRACK_TYPE); widgets[WIDX_TITLE].text = RideTitles[_currentTab]; - widgets[WIDX_TAB_7].type = WindowWidgetType::Tab; + widgets[WIDX_TAB_7].type = WidgetType::tab; widgets[WIDX_FILTER_TEXT_BOX].string = _filter.data(); if (gLegacyScene == LegacyScene::trackDesigner) - widgets[WIDX_TAB_7].type = WindowWidgetType::Empty; + widgets[WIDX_TAB_7].type = WidgetType::empty; if (_currentTab == RESEARCH_TAB) { @@ -826,36 +826,36 @@ namespace OpenRCT2::Ui::Windows if (_currentTab < RESEARCH_TAB) { - widgets[WIDX_GROUP_BY_TRACK_TYPE].type = WindowWidgetType::Checkbox; + widgets[WIDX_GROUP_BY_TRACK_TYPE].type = WidgetType::checkbox; } else { - widgets[WIDX_GROUP_BY_TRACK_TYPE].type = WindowWidgetType::Empty; + widgets[WIDX_GROUP_BY_TRACK_TYPE].type = WidgetType::empty; } if (_currentTab != RESEARCH_TAB) { - widgets[WIDX_RIDE_LIST].type = WindowWidgetType::Scroll; - widgets[WIDX_FILTER_TEXT_BOX].type = WindowWidgetType::TextBox; - widgets[WIDX_FILTER_CLEAR_BUTTON].type = WindowWidgetType::Button; - widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP].type = WindowWidgetType::Empty; - widgets[WIDX_LAST_DEVELOPMENT_GROUP].type = WindowWidgetType::Empty; - widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_RESEARCH_FUNDING_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_RIDE_LIST].type = WidgetType::scroll; + widgets[WIDX_FILTER_TEXT_BOX].type = WidgetType::textBox; + widgets[WIDX_FILTER_CLEAR_BUTTON].type = WidgetType::button; + widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP].type = WidgetType::empty; + widgets[WIDX_LAST_DEVELOPMENT_GROUP].type = WidgetType::empty; + widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WidgetType::empty; + widgets[WIDX_RESEARCH_FUNDING_BUTTON].type = WidgetType::empty; newWidth = WindowWidth; newHeight = kWindowHeight; } else { - widgets[WIDX_RIDE_LIST].type = WindowWidgetType::Empty; - widgets[WIDX_FILTER_TEXT_BOX].type = WindowWidgetType::Empty; - widgets[WIDX_FILTER_CLEAR_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP].type = WindowWidgetType::Groupbox; - widgets[WIDX_LAST_DEVELOPMENT_GROUP].type = WindowWidgetType::Groupbox; - widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WindowWidgetType::FlatBtn; + widgets[WIDX_RIDE_LIST].type = WidgetType::empty; + widgets[WIDX_FILTER_TEXT_BOX].type = WidgetType::empty; + widgets[WIDX_FILTER_CLEAR_BUTTON].type = WidgetType::empty; + widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP].type = WidgetType::groupbox; + widgets[WIDX_LAST_DEVELOPMENT_GROUP].type = WidgetType::groupbox; + widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WidgetType::flatBtn; if (!(getGameState().park.Flags & PARK_FLAGS_NO_MONEY)) - widgets[WIDX_RESEARCH_FUNDING_BUTTON].type = WindowWidgetType::FlatBtn; + widgets[WIDX_RESEARCH_FUNDING_BUTTON].type = WidgetType::flatBtn; newWidth = 300; newHeight = kWindowHeightResearch; @@ -1008,7 +1008,7 @@ namespace OpenRCT2::Ui::Windows { WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast(tab); - if (widgets[widgetIndex].type != WindowWidgetType::Empty && !WidgetIsDisabled(*this, widgetIndex)) + if (widgets[widgetIndex].type != WidgetType::empty && !WidgetIsDisabled(*this, widgetIndex)) { int32_t frame = 0; if (_currentTab == tab) diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index f8b3325633..967a733e72 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -42,8 +42,8 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_news_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({372, 18}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_TAB_GEARS_0)), // settings - makeWidget({ 4, 44}, {392, 252}, WindowWidgetType::Scroll, WindowColour::primary, SCROLL_VERTICAL) // scroll + makeWidget({372, 18}, { 24, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_TAB_GEARS_0)), // settings + makeWidget({ 4, 44}, {392, 252}, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL) // scroll ); // clang-format on diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index a893f89960..98f0e6df38 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -75,19 +75,19 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowNewsOptionsWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {400, 257}, WindowWidgetType::Resize, WindowColour::secondary), // Tab content panel + makeWidget({ 0, 43}, {400, 257}, WidgetType::resize, WindowColour::secondary), // Tab content panel makeTab ({ 3, 17} ), // Park tab makeTab ({34, 17} ), // Ride tab makeTab ({65, 17} ), // Guest tab - makeWidget({ 7, 49}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ), - makeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary ) + makeWidget({ 7, 49}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ), + makeWidget({ 0, 0}, {343, 14}, WidgetType::checkbox, WindowColour::tertiary ) ); // clang-format on @@ -169,7 +169,7 @@ namespace OpenRCT2::Ui::Windows if (ndef->category != page) continue; - checkboxWidget->type = WindowWidgetType::Checkbox; + checkboxWidget->type = WidgetType::checkbox; checkboxWidget->left = baseCheckBox.left; checkboxWidget->right = baseCheckBox.right; checkboxWidget->top = y; @@ -187,7 +187,7 @@ namespace OpenRCT2::Ui::Windows // Remove unused checkboxes while (checkboxWidgetIndex < widgets.size()) { - checkboxWidget->type = WindowWidgetType::Empty; + checkboxWidget->type = WidgetType::empty; checkboxWidgetIndex++; checkboxWidget++; } diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index db6d546906..ba619b3d66 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -282,14 +282,14 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_object_load_error_widgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ NAME_COL_LEFT, 57}, {108, 14}, WindowWidgetType::TableHeader, WindowColour::primary, STR_OBJECT_NAME ), // 'Object name' header - makeWidget({SOURCE_COL_LEFT, 57}, {166, 14}, WindowWidgetType::TableHeader, WindowColour::primary, STR_OBJECT_SOURCE ), // 'Object source' header - makeWidget({ TYPE_COL_LEFT, 57}, {166, 14}, WindowWidgetType::TableHeader, WindowColour::primary, STR_OBJECT_TYPE ), // 'Object type' header - makeWidget({ NAME_COL_LEFT, 70}, {442, 298}, WindowWidgetType::Scroll, WindowColour::primary, SCROLL_VERTICAL ), // Scrollable list area - makeWidget({ NAME_COL_LEFT, 377}, {145, 14}, WindowWidgetType::Button, WindowColour::primary, STR_COPY_SELECTED, STR_COPY_SELECTED_TIP), // Copy selected button - makeWidget({ 152, 377}, {145, 14}, WindowWidgetType::Button, WindowColour::primary, STR_COPY_ALL, STR_COPY_ALL_TIP ) // Copy all button + makeWidget({ NAME_COL_LEFT, 57}, {108, 14}, WidgetType::tableHeader, WindowColour::primary, STR_OBJECT_NAME ), // 'Object name' header + makeWidget({SOURCE_COL_LEFT, 57}, {166, 14}, WidgetType::tableHeader, WindowColour::primary, STR_OBJECT_SOURCE ), // 'Object source' header + makeWidget({ TYPE_COL_LEFT, 57}, {166, 14}, WidgetType::tableHeader, WindowColour::primary, STR_OBJECT_TYPE ), // 'Object type' header + makeWidget({ NAME_COL_LEFT, 70}, {442, 298}, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL ), // Scrollable list area + makeWidget({ NAME_COL_LEFT, 377}, {145, 14}, WidgetType::button, WindowColour::primary, STR_COPY_SELECTED, STR_COPY_SELECTED_TIP), // Copy selected button + makeWidget({ 152, 377}, {145, 14}, WidgetType::button, WindowColour::primary, STR_COPY_ALL, STR_COPY_ALL_TIP ) // Copy all button #ifndef DISABLE_HTTP - , makeWidget({ 300, 377}, {146, 14}, WindowWidgetType::Button, WindowColour::primary, STR_DOWNLOAD_ALL, STR_DOWNLOAD_ALL_TIP ) // Download all button + , makeWidget({ 300, 377}, {146, 14}, WidgetType::button, WindowColour::primary, STR_DOWNLOAD_ALL, STR_DOWNLOAD_ALL_TIP ) // Download all button #endif ); // clang-format on diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index b8a1249b2c..f5678b489a 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -257,7 +257,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto kMainOptionsWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43 }, { WW, 289 }, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43 }, { WW, 289 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_OPTIONS_DISPLAY_TIP), makeTab({ 34, 17 }, STR_OPTIONS_RENDERING_TIP), makeTab({ 65, 17 }, STR_OPTIONS_CULTURE_TIP), @@ -270,30 +270,30 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_options_display_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget ({ 5, 53}, {300, 64}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_WINDOW ), // Window group - makeWidget ({ 10, 67}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_FULLSCREEN_MODE, STR_FULLSCREEN_MODE_TIP ), // Fullscreen - makeWidget ({155, 68}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget ({288, 69}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_FULLSCREEN_MODE_TIP ), - makeWidget ({ 24, 82}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_DISPLAY_RESOLUTION, STR_DISPLAY_RESOLUTION_TIP ), // Resolution - makeWidget ({155, 83}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_ARG_16_RESOLUTION_X_BY_Y ), - makeWidget ({288, 84}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DISPLAY_RESOLUTION_TIP ), - makeWidget ({ 10, 98}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_UI_SCALING_DESC, STR_WINDOW_SCALE_TIP ), // Scale - makeSpinnerWidgets({155, 98}, {145, 12}, WindowWidgetType::Spinner, WindowColour::secondary, kStringIdNone, STR_WINDOW_SCALE_TIP ), // Scale spinner (3 widgets) + makeWidget ({ 5, 53}, {300, 64}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_WINDOW ), // Window group + makeWidget ({ 10, 67}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_FULLSCREEN_MODE, STR_FULLSCREEN_MODE_TIP ), // Fullscreen + makeWidget ({155, 68}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget ({288, 69}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_FULLSCREEN_MODE_TIP ), + makeWidget ({ 24, 82}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_DISPLAY_RESOLUTION, STR_DISPLAY_RESOLUTION_TIP ), // Resolution + makeWidget ({155, 83}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_ARG_16_RESOLUTION_X_BY_Y ), + makeWidget ({288, 84}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DISPLAY_RESOLUTION_TIP ), + makeWidget ({ 10, 98}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_UI_SCALING_DESC, STR_WINDOW_SCALE_TIP ), // Scale + makeSpinnerWidgets({155, 98}, {145, 12}, WidgetType::spinner, WindowColour::secondary, kStringIdNone, STR_WINDOW_SCALE_TIP ), // Scale spinner (3 widgets) - makeWidget ({ 5, 121}, {300, 64}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_RENDERING ), // Rendering group - makeWidget ({ 10, 135}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_DRAWING_ENGINE, STR_DRAWING_ENGINE_TIP ), // Drawing engine (label) - makeWidget ({155, 135}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Drawing engine (dropdown label) - makeWidget ({288, 136}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DRAWING_ENGINE_TIP ), // Drawing engine (chevron) - makeWidget ({ 10, 150}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_FRAME_RATE_LIMIT_LABEL ), // Frame rate limit (label) - makeWidget ({155, 150}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Frame rate limit (dropdown label) - makeWidget ({288, 151}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // Frame rate limit (chevron) - makeWidget ({ 10, 166}, {136, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_SHOW_FPS, STR_SHOW_FPS_TIP ), // Show fps - makeWidget ({155, 166}, {136, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MULTITHREADING, STR_MULTITHREADING_TIP ), // Multithreading + makeWidget ({ 5, 121}, {300, 64}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_RENDERING ), // Rendering group + makeWidget ({ 10, 135}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_DRAWING_ENGINE, STR_DRAWING_ENGINE_TIP ), // Drawing engine (label) + makeWidget ({155, 135}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Drawing engine (dropdown label) + makeWidget ({288, 136}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DRAWING_ENGINE_TIP ), // Drawing engine (chevron) + makeWidget ({ 10, 150}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_FRAME_RATE_LIMIT_LABEL ), // Frame rate limit (label) + makeWidget ({155, 150}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Frame rate limit (dropdown label) + makeWidget ({288, 151}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // Frame rate limit (chevron) + makeWidget ({ 10, 166}, {136, 12}, WidgetType::checkbox, WindowColour::secondary, STR_SHOW_FPS, STR_SHOW_FPS_TIP ), // Show fps + makeWidget ({155, 166}, {136, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MULTITHREADING, STR_MULTITHREADING_TIP ), // Multithreading - makeWidget ({ 5, 188}, {300, 64}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_BEHAVIOUR ), // Behaviour group - makeWidget ({ 11, 203}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_STEAM_OVERLAY_PAUSE, STR_STEAM_OVERLAY_PAUSE_TIP ), // Pause on steam overlay - makeWidget ({ 11, 218}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS_TIP), // Minimise fullscreen focus loss - makeWidget ({ 11, 233}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DISABLE_SCREENSAVER, STR_DISABLE_SCREENSAVER_TIP ) // Disable screensaver + makeWidget ({ 5, 188}, {300, 64}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_BEHAVIOUR ), // Behaviour group + makeWidget ({ 11, 203}, {280, 12}, WidgetType::checkbox, WindowColour::secondary, STR_STEAM_OVERLAY_PAUSE, STR_STEAM_OVERLAY_PAUSE_TIP ), // Pause on steam overlay + makeWidget ({ 11, 218}, {280, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS_TIP), // Minimise fullscreen focus loss + makeWidget ({ 11, 233}, {280, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DISABLE_SCREENSAVER, STR_DISABLE_SCREENSAVER_TIP ) // Disable screensaver ); constexpr int32_t kFrameRenderingStart = 53; @@ -301,75 +301,75 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_options_rendering_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget({ 5, kFrameRenderingStart + 0}, {300, 108}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_RENDERING_GROUP ), // Rendering group - makeWidget({ 10, kFrameRenderingStart + 15}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP ), // Landscape smoothing - makeWidget({ 10, kFrameRenderingStart + 30}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_GRIDLINES, STR_GRIDLINES_TIP ), // Gridlines - makeWidget({ 10, kFrameRenderingStart + 45}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_UPPERCASE_BANNERS, STR_UPPERCASE_BANNERS_TIP ), // Uppercase banners - makeWidget({ 10, kFrameRenderingStart + 60}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_SHOW_GUEST_PURCHASES, STR_SHOW_GUEST_PURCHASES_TIP ), // Guest purchases - makeWidget({ 10, kFrameRenderingStart + 75}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TRANSPARENT_SCREENSHOT, STR_TRANSPARENT_SCREENSHOT_TIP), // Transparent screenshot - makeWidget({ 10, kFrameRenderingStart + 90}, {281, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_VIRTUAL_FLOOR_STYLE, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor - makeWidget({155, kFrameRenderingStart + 90}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdNone, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown - makeWidget({288, kFrameRenderingStart + 91}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown + makeWidget({ 5, kFrameRenderingStart + 0}, {300, 108}, WidgetType::groupbox, WindowColour::secondary, STR_RENDERING_GROUP ), // Rendering group + makeWidget({ 10, kFrameRenderingStart + 15}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP ), // Landscape smoothing + makeWidget({ 10, kFrameRenderingStart + 30}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_GRIDLINES, STR_GRIDLINES_TIP ), // Gridlines + makeWidget({ 10, kFrameRenderingStart + 45}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_UPPERCASE_BANNERS, STR_UPPERCASE_BANNERS_TIP ), // Uppercase banners + makeWidget({ 10, kFrameRenderingStart + 60}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_SHOW_GUEST_PURCHASES, STR_SHOW_GUEST_PURCHASES_TIP ), // Guest purchases + makeWidget({ 10, kFrameRenderingStart + 75}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_TRANSPARENT_SCREENSHOT, STR_TRANSPARENT_SCREENSHOT_TIP), // Transparent screenshot + makeWidget({ 10, kFrameRenderingStart + 90}, {281, 12}, WidgetType::label, WindowColour::secondary, STR_VIRTUAL_FLOOR_STYLE, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor + makeWidget({155, kFrameRenderingStart + 90}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdNone, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown + makeWidget({288, kFrameRenderingStart + 91}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown - makeWidget({ 5, kFrameEffectStart + 0}, {300, 94}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_EFFECTS_GROUP ), // Rendering group - makeWidget({10, kFrameEffectStart + 15}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_CYCLE_DAY_NIGHT, STR_CYCLE_DAY_NIGHT_TIP ), // Cycle day-night - makeWidget({25, kFrameEffectStart + 30}, {266, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_ENABLE_LIGHTING_EFFECTS, STR_ENABLE_LIGHTING_EFFECTS_TIP ), // Enable light fx - makeWidget({40, kFrameEffectStart + 45}, {251, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_ENABLE_LIGHTING_VEHICLES, STR_ENABLE_LIGHTING_VEHICLES_TIP), // Enable light fx for vehicles - makeWidget({10, kFrameEffectStart + 60}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_RENDER_WEATHER_EFFECTS, STR_RENDER_WEATHER_EFFECTS_TIP ), // Render weather effects - makeWidget({25, kFrameEffectStart + 75}, {266, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_DISABLE_LIGHTNING_EFFECT, STR_DISABLE_LIGHTNING_EFFECT_TIP) // Disable lightning effect + makeWidget({ 5, kFrameEffectStart + 0}, {300, 94}, WidgetType::groupbox, WindowColour::secondary, STR_EFFECTS_GROUP ), // Rendering group + makeWidget({10, kFrameEffectStart + 15}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_CYCLE_DAY_NIGHT, STR_CYCLE_DAY_NIGHT_TIP ), // Cycle day-night + makeWidget({25, kFrameEffectStart + 30}, {266, 12}, WidgetType::checkbox, WindowColour::secondary, STR_ENABLE_LIGHTING_EFFECTS, STR_ENABLE_LIGHTING_EFFECTS_TIP ), // Enable light fx + makeWidget({40, kFrameEffectStart + 45}, {251, 12}, WidgetType::checkbox, WindowColour::secondary, STR_ENABLE_LIGHTING_VEHICLES, STR_ENABLE_LIGHTING_VEHICLES_TIP), // Enable light fx for vehicles + makeWidget({10, kFrameEffectStart + 60}, {281, 12}, WidgetType::checkbox, WindowColour::secondary, STR_RENDER_WEATHER_EFFECTS, STR_RENDER_WEATHER_EFFECTS_TIP ), // Render weather effects + makeWidget({25, kFrameEffectStart + 75}, {266, 12}, WidgetType::checkbox, WindowColour::secondary, STR_DISABLE_LIGHTNING_EFFECT, STR_DISABLE_LIGHTNING_EFFECT_TIP) // Disable lightning effect ); static constexpr auto window_options_culture_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget({ 10, 53}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_OPTIONS_LANGUAGE, STR_LANGUAGE_TIP ), // language - makeWidget({155, 53}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_STRING ), - makeWidget({288, 54}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_LANGUAGE_TIP ), - makeWidget({ 10, 68}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_CURRENCY, STR_CURRENCY_TIP ), // Currency - makeWidget({155, 68}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({288, 69}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_CURRENCY_TIP ), - makeWidget({ 10, 83}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_DISTANCE_AND_SPEED, STR_DISTANCE_AND_SPEED_TIP ), // Distance and speed - makeWidget({155, 83}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({288, 84}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DISTANCE_AND_SPEED_TIP ), - makeWidget({ 10, 98}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_TEMPERATURE, STR_TEMPERATURE_FORMAT_TIP ), // Temperature - makeWidget({155, 98}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({288, 99}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_TEMPERATURE_FORMAT_TIP ), - makeWidget({ 10, 113}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_HEIGHT_LABELS, STR_HEIGHT_LABELS_UNITS_TIP), // Height labels - makeWidget({155, 113}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({288, 114}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_HEIGHT_LABELS_UNITS_TIP), - makeWidget({ 10, 128}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_DATE_FORMAT, STR_DATE_FORMAT_TIP ), // Date format - makeWidget({155, 128}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({288, 129}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DATE_FORMAT_TIP ) + makeWidget({ 10, 53}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_OPTIONS_LANGUAGE, STR_LANGUAGE_TIP ), // language + makeWidget({155, 53}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_STRING ), + makeWidget({288, 54}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_LANGUAGE_TIP ), + makeWidget({ 10, 68}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_CURRENCY, STR_CURRENCY_TIP ), // Currency + makeWidget({155, 68}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({288, 69}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_CURRENCY_TIP ), + makeWidget({ 10, 83}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_DISTANCE_AND_SPEED, STR_DISTANCE_AND_SPEED_TIP ), // Distance and speed + makeWidget({155, 83}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({288, 84}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DISTANCE_AND_SPEED_TIP ), + makeWidget({ 10, 98}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_TEMPERATURE, STR_TEMPERATURE_FORMAT_TIP ), // Temperature + makeWidget({155, 98}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({288, 99}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_TEMPERATURE_FORMAT_TIP ), + makeWidget({ 10, 113}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_HEIGHT_LABELS, STR_HEIGHT_LABELS_UNITS_TIP), // Height labels + makeWidget({155, 113}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({288, 114}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_HEIGHT_LABELS_UNITS_TIP), + makeWidget({ 10, 128}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_DATE_FORMAT, STR_DATE_FORMAT_TIP ), // Date format + makeWidget({155, 128}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({288, 129}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DATE_FORMAT_TIP ) ); static constexpr auto window_options_audio_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget({ 10, 53}, {290, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Audio device - makeWidget({288, 54}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_AUDIO_DEVICE_TIP ), - makeWidget({ 10, 69}, {220, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MASTER_VOLUME, STR_MASTER_VOLUME_TIP), // Enable / disable master sound - makeWidget({ 10, 84}, {220, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_SOUND_EFFECTS, STR_SOUND_EFFECTS_TIP), // Enable / disable sound effects - makeWidget({ 10, 99}, {220, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_RIDE_MUSIC, STR_RIDE_MUSIC_TIP ), // Enable / disable ride music - makeWidget({ 10, 113}, {290, 13}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_AUDIO_FOCUS, STR_AUDIO_FOCUS_TIP ), // Enable / disable audio disabled on focus lost - makeWidget({ 10, 128}, {145, 13}, WindowWidgetType::Label, WindowColour::secondary, STR_OPTIONS_MUSIC_LABEL, STR_TITLE_MUSIC_TIP ), // Title music label - makeWidget({155, 127}, {145, 13}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Title music - makeWidget({288, 128}, { 11, 11}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_TITLE_MUSIC_TIP ), - makeWidget({155, 68}, {145, 13}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_HORIZONTAL ), // Master volume - makeWidget({155, 83}, {145, 13}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_HORIZONTAL ), // Sound effect volume - makeWidget({155, 98}, {145, 13}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_HORIZONTAL ) // Music volume + makeWidget({ 10, 53}, {290, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Audio device + makeWidget({288, 54}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_AUDIO_DEVICE_TIP ), + makeWidget({ 10, 69}, {220, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MASTER_VOLUME, STR_MASTER_VOLUME_TIP), // Enable / disable master sound + makeWidget({ 10, 84}, {220, 12}, WidgetType::checkbox, WindowColour::secondary, STR_SOUND_EFFECTS, STR_SOUND_EFFECTS_TIP), // Enable / disable sound effects + makeWidget({ 10, 99}, {220, 12}, WidgetType::checkbox, WindowColour::secondary, STR_RIDE_MUSIC, STR_RIDE_MUSIC_TIP ), // Enable / disable ride music + makeWidget({ 10, 113}, {290, 13}, WidgetType::checkbox, WindowColour::secondary, STR_AUDIO_FOCUS, STR_AUDIO_FOCUS_TIP ), // Enable / disable audio disabled on focus lost + makeWidget({ 10, 128}, {145, 13}, WidgetType::label, WindowColour::secondary, STR_OPTIONS_MUSIC_LABEL, STR_TITLE_MUSIC_TIP ), // Title music label + makeWidget({155, 127}, {145, 13}, WidgetType::dropdownMenu, WindowColour::secondary ), // Title music + makeWidget({288, 128}, { 11, 11}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_TITLE_MUSIC_TIP ), + makeWidget({155, 68}, {145, 13}, WidgetType::scroll, WindowColour::secondary, SCROLL_HORIZONTAL ), // Master volume + makeWidget({155, 83}, {145, 13}, WidgetType::scroll, WindowColour::secondary, SCROLL_HORIZONTAL ), // Sound effect volume + makeWidget({155, 98}, {145, 13}, WidgetType::scroll, WindowColour::secondary, SCROLL_HORIZONTAL ) // Music volume ); constexpr int32_t kControlsGroupStart = 53; static constexpr auto window_options_controls_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget({ 5, kControlsGroupStart + 0}, {300,137}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_CONTROLS_GROUP ), // Controls group - makeWidget({ 10, kControlsGroupStart + 13}, {290, 14}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP ), // Edge scrolling - makeWidget({ 10, kControlsGroupStart + 30}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_TRAP_MOUSE, STR_TRAP_MOUSE_TIP ), // Trap mouse - makeWidget({ 10, kControlsGroupStart + 45}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_INVERT_RIGHT_MOUSE_DRAG, STR_INVERT_RIGHT_MOUSE_DRAG_TIP ), // Invert right mouse dragging - makeWidget({ 10, kControlsGroupStart + 60}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_ZOOM_TO_CURSOR, STR_ZOOM_TO_CURSOR_TIP ), // Zoom to cursor - makeWidget({ 10, kControlsGroupStart + 75}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_WINDOW_BUTTONS_ON_THE_LEFT, STR_WINDOW_BUTTONS_ON_THE_LEFT_TIP), // Window buttons on the left - makeWidget({ 10, kControlsGroupStart + 90}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_ENLARGED_UI, STR_ENLARGED_UI_TIP ), - makeWidget({ 25, kControlsGroupStart + 105}, {275, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_TOUCH_ENHANCEMENTS, STR_TOUCH_ENHANCEMENTS_TIP ), - makeWidget({155, kControlsGroupStart + 120}, {145, 13}, WindowWidgetType::Button, WindowColour::secondary, STR_HOTKEY, STR_HOTKEY_TIP ) // Set hotkeys buttons + makeWidget({ 5, kControlsGroupStart + 0}, {300,137}, WidgetType::groupbox, WindowColour::secondary, STR_CONTROLS_GROUP ), // Controls group + makeWidget({ 10, kControlsGroupStart + 13}, {290, 14}, WidgetType::checkbox, WindowColour::tertiary , STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP ), // Edge scrolling + makeWidget({ 10, kControlsGroupStart + 30}, {290, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_TRAP_MOUSE, STR_TRAP_MOUSE_TIP ), // Trap mouse + makeWidget({ 10, kControlsGroupStart + 45}, {290, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_INVERT_RIGHT_MOUSE_DRAG, STR_INVERT_RIGHT_MOUSE_DRAG_TIP ), // Invert right mouse dragging + makeWidget({ 10, kControlsGroupStart + 60}, {290, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_ZOOM_TO_CURSOR, STR_ZOOM_TO_CURSOR_TIP ), // Zoom to cursor + makeWidget({ 10, kControlsGroupStart + 75}, {290, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_WINDOW_BUTTONS_ON_THE_LEFT, STR_WINDOW_BUTTONS_ON_THE_LEFT_TIP), // Window buttons on the left + makeWidget({ 10, kControlsGroupStart + 90}, {290, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_ENLARGED_UI, STR_ENLARGED_UI_TIP ), + makeWidget({ 25, kControlsGroupStart + 105}, {275, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_TOUCH_ENHANCEMENTS, STR_TOUCH_ENHANCEMENTS_TIP ), + makeWidget({155, kControlsGroupStart + 120}, {145, 13}, WidgetType::button, WindowColour::secondary, STR_HOTKEY, STR_HOTKEY_TIP ) // Set hotkeys buttons ); constexpr int32_t kThemesGroupStart = 53; @@ -377,23 +377,23 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_options_interface_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget({ 5, kThemesGroupStart + 0}, {300, 48}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_THEMES_GROUP ), // Themes group - makeWidget({ 10, kThemesGroupStart + 14}, {145, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_THEMES_LABEL_CURRENT_THEME, STR_CURRENT_THEME_TIP ), // Themes - makeWidget({155, kThemesGroupStart + 14}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_STRING ), - makeWidget({288, kThemesGroupStart + 15}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_CURRENT_THEME_TIP ), - makeWidget({155, kThemesGroupStart + 30}, {145, 13}, WindowWidgetType::Button, WindowColour::secondary, STR_EDIT_THEMES_BUTTON, STR_EDIT_THEMES_BUTTON_TIP), // Themes button + makeWidget({ 5, kThemesGroupStart + 0}, {300, 48}, WidgetType::groupbox, WindowColour::secondary, STR_THEMES_GROUP ), // Themes group + makeWidget({ 10, kThemesGroupStart + 14}, {145, 12}, WidgetType::label, WindowColour::secondary, STR_THEMES_LABEL_CURRENT_THEME, STR_CURRENT_THEME_TIP ), // Themes + makeWidget({155, kThemesGroupStart + 14}, {145, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_STRING ), + makeWidget({288, kThemesGroupStart + 15}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_CURRENT_THEME_TIP ), + makeWidget({155, kThemesGroupStart + 30}, {145, 13}, WidgetType::button, WindowColour::secondary, STR_EDIT_THEMES_BUTTON, STR_EDIT_THEMES_BUTTON_TIP), // Themes button - makeWidget({ 5, kToolbarGroupStart + 0}, {300,107}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_TOOLBAR_BUTTONS_GROUP ), // Toolbar buttons group - makeWidget({ 10, kToolbarGroupStart + 14}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED_TIP ), - makeWidget({ 10, kToolbarGroupStart + 31}, {280, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_SHOW_TOOLBAR_BUTTONS_FOR ), - makeWidget({ 24, kToolbarGroupStart + 46}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP ), // Finances - makeWidget({ 24, kToolbarGroupStart + 61}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP ), // Research - makeWidget({155, kToolbarGroupStart + 46}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP ), // Cheats - makeWidget({155, kToolbarGroupStart + 61}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP ), // Recent messages - makeWidget({ 24, kToolbarGroupStart + 76}, {162, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute - makeWidget({155, kToolbarGroupStart + 76}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat - makeWidget({ 24, kToolbarGroupStart + 91}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_ZOOM_BUTTON_ON_TOOLBAR, STR_ZOOM_BUTTON_ON_TOOLBAR_TIP ), // Zoom - makeWidget({155, kToolbarGroupStart + 91}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_ROTATE_ANTI_CLOCKWISE, STR_ROTATE_VIEW_ANTI_CLOCKWISE_IN_TOOLBAR_TIP) // Rotate anti-clockwise + makeWidget({ 5, kToolbarGroupStart + 0}, {300,107}, WidgetType::groupbox, WindowColour::secondary, STR_TOOLBAR_BUTTONS_GROUP ), // Toolbar buttons group + makeWidget({ 10, kToolbarGroupStart + 14}, {280, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED_TIP ), + makeWidget({ 10, kToolbarGroupStart + 31}, {280, 12}, WidgetType::label, WindowColour::secondary, STR_SHOW_TOOLBAR_BUTTONS_FOR ), + makeWidget({ 24, kToolbarGroupStart + 46}, {122, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP ), // Finances + makeWidget({ 24, kToolbarGroupStart + 61}, {122, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP ), // Research + makeWidget({155, kToolbarGroupStart + 46}, {145, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP ), // Cheats + makeWidget({155, kToolbarGroupStart + 61}, {145, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP ), // Recent messages + makeWidget({ 24, kToolbarGroupStart + 76}, {162, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute + makeWidget({155, kToolbarGroupStart + 76}, {145, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat + makeWidget({ 24, kToolbarGroupStart + 91}, {122, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_ZOOM_BUTTON_ON_TOOLBAR, STR_ZOOM_BUTTON_ON_TOOLBAR_TIP ), // Zoom + makeWidget({155, kToolbarGroupStart + 91}, {145, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_ROTATE_ANTI_CLOCKWISE, STR_ROTATE_VIEW_ANTI_CLOCKWISE_IN_TOOLBAR_TIP) // Rotate anti-clockwise ); constexpr int32_t kTitleSequenceStart = 53; @@ -403,29 +403,29 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_options_misc_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget( { 5, kTitleSequenceStart + 0}, {300, 31}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_OPTIONS_TITLE_SEQUENCE ), - makeDropdownWidgets({ 10, kTitleSequenceStart + 15}, {290, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_STRINGID, STR_TITLE_SEQUENCE_TIP), // Title sequence dropdown + makeWidget( { 5, kTitleSequenceStart + 0}, {300, 31}, WidgetType::groupbox, WindowColour::secondary, STR_OPTIONS_TITLE_SEQUENCE ), + makeDropdownWidgets({ 10, kTitleSequenceStart + 15}, {290, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_STRINGID, STR_TITLE_SEQUENCE_TIP), // Title sequence dropdown - makeWidget({ 5, kScenarioGroupStart + 0}, {300, 66}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_OPTIONS_SCENARIO_SELECTION ), - makeWidget({ 10, kScenarioGroupStart + 16}, {165, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_SCENARIO_PREVIEWS_LABEL, STR_SCENARIO_PREVIEWS_TIP ), - makeWidget({175, kScenarioGroupStart + 15}, {125, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Scenario previews - makeWidget({288, kScenarioGroupStart + 16}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SCENARIO_PREVIEWS_TIP ), - makeWidget({ 10, kScenarioGroupStart + 31}, {165, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_OPTIONS_SCENARIO_GROUPING, STR_SCENARIO_GROUPING_TIP ), - makeWidget({175, kScenarioGroupStart + 30}, {125, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Scenario select mode - makeWidget({288, kScenarioGroupStart + 31}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SCENARIO_GROUPING_TIP ), - makeWidget({ 25, kScenarioGroupStart + 45}, {275, 16}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_OPTIONS_SCENARIO_UNLOCKING, STR_SCENARIO_UNLOCKING_TIP), // Unlocking of scenarios + makeWidget({ 5, kScenarioGroupStart + 0}, {300, 66}, WidgetType::groupbox, WindowColour::secondary, STR_OPTIONS_SCENARIO_SELECTION ), + makeWidget({ 10, kScenarioGroupStart + 16}, {165, 12}, WidgetType::label, WindowColour::secondary, STR_SCENARIO_PREVIEWS_LABEL, STR_SCENARIO_PREVIEWS_TIP ), + makeWidget({175, kScenarioGroupStart + 15}, {125, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Scenario previews + makeWidget({288, kScenarioGroupStart + 16}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SCENARIO_PREVIEWS_TIP ), + makeWidget({ 10, kScenarioGroupStart + 31}, {165, 12}, WidgetType::label, WindowColour::secondary, STR_OPTIONS_SCENARIO_GROUPING, STR_SCENARIO_GROUPING_TIP ), + makeWidget({175, kScenarioGroupStart + 30}, {125, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Scenario select mode + makeWidget({288, kScenarioGroupStart + 31}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SCENARIO_GROUPING_TIP ), + makeWidget({ 25, kScenarioGroupStart + 45}, {275, 16}, WidgetType::checkbox, WindowColour::tertiary , STR_OPTIONS_SCENARIO_UNLOCKING, STR_SCENARIO_UNLOCKING_TIP), // Unlocking of scenarios - makeWidget({ 5, kScenarioOptionsGroupStart + 0}, {300, 35}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_SCENARIO_OPTIONS ), - makeWidget({10, kScenarioOptionsGroupStart + 15}, {290, 15}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_ALLOW_EARLY_COMPLETION, STR_EARLY_COMPLETION_TIP), // Allow early scenario completion + makeWidget({ 5, kScenarioOptionsGroupStart + 0}, {300, 35}, WidgetType::groupbox, WindowColour::secondary, STR_SCENARIO_OPTIONS ), + makeWidget({10, kScenarioOptionsGroupStart + 15}, {290, 15}, WidgetType::checkbox, WindowColour::tertiary , STR_ALLOW_EARLY_COMPLETION, STR_EARLY_COMPLETION_TIP), // Allow early scenario completion - makeWidget({ 5, kTweaksStart + 0}, {300, 96}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_OPTIONS_TWEAKS ), - makeWidget({ 10, kTweaksStart + 15}, {290, 15}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_REAL_NAME_GUESTS, STR_REAL_NAME_GUESTS_TIP ), // Show 'real' names of guests - makeWidget({ 10, kTweaksStart + 30}, {290, 15}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_REAL_NAME_STAFF, STR_REAL_NAME_STAFF_TIP ), // Show 'real' names of staff - makeWidget({ 10, kTweaksStart + 45}, {290, 15}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_AUTO_STAFF_PLACEMENT, STR_AUTO_STAFF_PLACEMENT_TIP ), // Auto staff placement - makeWidget({ 10, kTweaksStart + 60}, {290, 15}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP ), // Automatically open shops & stalls - makeWidget({ 10, kTweaksStart + 77}, {165, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_DEFAULT_INSPECTION_INTERVAL, STR_DEFAULT_INSPECTION_INTERVAL_TIP), - makeWidget({175, kTweaksStart + 76}, {125, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Default inspection time dropdown - makeWidget({288, kTweaksStart + 77}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DEFAULT_INSPECTION_INTERVAL_TIP ) // Default inspection time dropdown button + makeWidget({ 5, kTweaksStart + 0}, {300, 96}, WidgetType::groupbox, WindowColour::secondary, STR_OPTIONS_TWEAKS ), + makeWidget({ 10, kTweaksStart + 15}, {290, 15}, WidgetType::checkbox, WindowColour::tertiary , STR_REAL_NAME_GUESTS, STR_REAL_NAME_GUESTS_TIP ), // Show 'real' names of guests + makeWidget({ 10, kTweaksStart + 30}, {290, 15}, WidgetType::checkbox, WindowColour::tertiary , STR_REAL_NAME_STAFF, STR_REAL_NAME_STAFF_TIP ), // Show 'real' names of staff + makeWidget({ 10, kTweaksStart + 45}, {290, 15}, WidgetType::checkbox, WindowColour::tertiary , STR_AUTO_STAFF_PLACEMENT, STR_AUTO_STAFF_PLACEMENT_TIP ), // Auto staff placement + makeWidget({ 10, kTweaksStart + 60}, {290, 15}, WidgetType::checkbox, WindowColour::tertiary , STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP ), // Automatically open shops & stalls + makeWidget({ 10, kTweaksStart + 77}, {165, 12}, WidgetType::label, WindowColour::secondary, STR_DEFAULT_INSPECTION_INTERVAL, STR_DEFAULT_INSPECTION_INTERVAL_TIP), + makeWidget({175, kTweaksStart + 76}, {125, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Default inspection time dropdown + makeWidget({288, kTweaksStart + 77}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_DEFAULT_INSPECTION_INTERVAL_TIP ) // Default inspection time dropdown button ); constexpr int32_t kRCT1Start = 53; @@ -434,29 +434,29 @@ namespace OpenRCT2::Ui::Windows static constexpr auto window_options_advanced_widgets = makeWidgets( kMainOptionsWidgets, - makeWidget ({ 5, kRCT1Start + 0}, {300, 50}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_RCT1 ), - makeWidget ({ 10, kRCT1Start + 16}, {276, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP ), // RCT 1 path label - makeWidget ({ 10, kRCT1Start + 30}, {290, 14}, WindowWidgetType::Label, WindowColour::secondary, kStringIdNone, STR_STRING_TOOLTIP ), // RCT 1 path path - makeWidget ({239, kRCT1Start + 15}, { 60, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_BROWSE ), // RCT 1 path browse - makeWidget ({249, kRCT1Start + 15}, { 50, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_CLEAR_BUTTON, STR_PATH_TO_RCT1_CLEAR_TIP ), // RCT 1 path clear + makeWidget ({ 5, kRCT1Start + 0}, {300, 50}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_RCT1 ), + makeWidget ({ 10, kRCT1Start + 16}, {276, 12}, WidgetType::label, WindowColour::secondary, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP ), // RCT 1 path label + makeWidget ({ 10, kRCT1Start + 30}, {290, 14}, WidgetType::label, WindowColour::secondary, kStringIdNone, STR_STRING_TOOLTIP ), // RCT 1 path path + makeWidget ({239, kRCT1Start + 15}, { 60, 14}, WidgetType::button, WindowColour::secondary, STR_BROWSE ), // RCT 1 path browse + makeWidget ({249, kRCT1Start + 15}, { 50, 14}, WidgetType::button, WindowColour::secondary, STR_CLEAR_BUTTON, STR_PATH_TO_RCT1_CLEAR_TIP ), // RCT 1 path clear - makeWidget ({ 5, kSavingStart + 0}, {300, 80}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_SAVING ), - makeWidget ({ 10, kSavingStart + 16}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP ), // Export plug-in objects with saved games - makeWidget ({ 10, kSavingStart + 30}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_ALWAYS_NATIVE_LOADSAVE, STR_ALWAYS_NATIVE_LOADSAVE_TIP ), // Use native load/save window - makeWidget ({ 23, kSavingStart + 46}, {135, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_OPTIONS_AUTOSAVE_FREQUENCY_LABEL, STR_AUTOSAVE_FREQUENCY_TIP ), - makeWidget ({165, kSavingStart + 45}, {135, 13}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Autosave dropdown - makeWidget ({288, kSavingStart + 46}, { 11, 11}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_AUTOSAVE_FREQUENCY_TIP ), // Autosave dropdown button - makeWidget ({ 23, kSavingStart + 60}, {135, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_AUTOSAVE_AMOUNT, STR_AUTOSAVE_AMOUNT_TIP ), - makeSpinnerWidgets({165, kSavingStart + 60}, {135, 12}, WindowWidgetType::Spinner, WindowColour::secondary, kStringIdNone, STR_AUTOSAVE_AMOUNT_TIP ), // Autosave amount spinner + makeWidget ({ 5, kSavingStart + 0}, {300, 80}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_SAVING ), + makeWidget ({ 10, kSavingStart + 16}, {290, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP ), // Export plug-in objects with saved games + makeWidget ({ 10, kSavingStart + 30}, {290, 12}, WidgetType::checkbox, WindowColour::secondary, STR_ALWAYS_NATIVE_LOADSAVE, STR_ALWAYS_NATIVE_LOADSAVE_TIP ), // Use native load/save window + makeWidget ({ 23, kSavingStart + 46}, {135, 12}, WidgetType::label, WindowColour::secondary, STR_OPTIONS_AUTOSAVE_FREQUENCY_LABEL, STR_AUTOSAVE_FREQUENCY_TIP ), + makeWidget ({165, kSavingStart + 45}, {135, 13}, WidgetType::dropdownMenu, WindowColour::secondary ), // Autosave dropdown + makeWidget ({288, kSavingStart + 46}, { 11, 11}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_AUTOSAVE_FREQUENCY_TIP ), // Autosave dropdown button + makeWidget ({ 23, kSavingStart + 60}, {135, 12}, WidgetType::label, WindowColour::secondary, STR_AUTOSAVE_AMOUNT, STR_AUTOSAVE_AMOUNT_TIP ), + makeSpinnerWidgets({165, kSavingStart + 60}, {135, 12}, WidgetType::spinner, WindowColour::secondary, kStringIdNone, STR_AUTOSAVE_AMOUNT_TIP ), // Autosave amount spinner - makeWidget ({ 5, kAdvancedStart + 0}, {300, 97}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_GROUP_ADVANCED ), - makeWidget ({ 10, kAdvancedStart + 16}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_ENABLE_DEBUGGING_TOOLS, STR_ENABLE_DEBUGGING_TOOLS_TIP ), // Enable debugging tools - makeWidget ({ 10, kAdvancedStart + 30}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary, STR_STAY_CONNECTED_AFTER_DESYNC, STR_STAY_CONNECTED_AFTER_DESYNC_TIP ), // Do not disconnect after the client desynchronises with the server + makeWidget ({ 5, kAdvancedStart + 0}, {300, 97}, WidgetType::groupbox, WindowColour::secondary, STR_GROUP_ADVANCED ), + makeWidget ({ 10, kAdvancedStart + 16}, {295, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_ENABLE_DEBUGGING_TOOLS, STR_ENABLE_DEBUGGING_TOOLS_TIP ), // Enable debugging tools + makeWidget ({ 10, kAdvancedStart + 30}, {295, 12}, WidgetType::checkbox, WindowColour::tertiary, STR_STAY_CONNECTED_AFTER_DESYNC, STR_STAY_CONNECTED_AFTER_DESYNC_TIP ), // Do not disconnect after the client desynchronises with the server #ifdef __EMSCRIPTEN__ - makeWidget ({ 10, kAdvancedStart + 46}, {135, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_EXPORT_EMSCRIPTEN, kStringIdNone ), // Emscripten data export - makeWidget ({150, kAdvancedStart + 46}, {150, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_IMPORT_EMSCRIPTEN, kStringIdNone ), // Emscripten data import + makeWidget ({ 10, kAdvancedStart + 46}, {135, 14}, WidgetType::button, WindowColour::secondary, STR_EXPORT_EMSCRIPTEN, kStringIdNone ), // Emscripten data export + makeWidget ({150, kAdvancedStart + 46}, {150, 14}, WidgetType::button, WindowColour::secondary, STR_IMPORT_EMSCRIPTEN, kStringIdNone ), // Emscripten data import #endif - makeWidget ({150, kAdvancedStart + 64}, {150, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_EDIT_ASSET_PACKS_BUTTON, kStringIdNone ) // Asset packs + makeWidget ({150, kAdvancedStart + 64}, {150, 14}, WidgetType::button, WindowColour::secondary, STR_EDIT_ASSET_PACKS_BUTTON, kStringIdNone ) // Asset packs ); static constexpr std::span window_options_page_widgets[] = { @@ -719,7 +719,7 @@ namespace OpenRCT2::Ui::Windows if (!hasFilePicker && advancedTabSelected) { disabled_widgets |= (1uLL << WIDX_ALWAYS_NATIVE_LOADSAVE); - widgets[WIDX_ALWAYS_NATIVE_LOADSAVE].type = WindowWidgetType::Empty; + widgets[WIDX_ALWAYS_NATIVE_LOADSAVE].type = WidgetType::empty; } } @@ -2184,9 +2184,9 @@ namespace OpenRCT2::Ui::Windows { if (!Config::Get().general.RCT1Path.empty()) { - widgets[WIDX_PATH_TO_RCT1_PATH].type = WindowWidgetType::Label; - widgets[WIDX_PATH_TO_RCT1_BROWSE].type = WindowWidgetType::Empty; - widgets[WIDX_PATH_TO_RCT1_CLEAR].type = WindowWidgetType::Button; + widgets[WIDX_PATH_TO_RCT1_PATH].type = WidgetType::label; + widgets[WIDX_PATH_TO_RCT1_BROWSE].type = WidgetType::empty; + widgets[WIDX_PATH_TO_RCT1_CLEAR].type = WidgetType::button; // Get 'Clear' button string width auto clearLabel = LanguageGetString(STR_CLEAR_BUTTON); @@ -2197,9 +2197,9 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_PATH_TO_RCT1_PATH].type = WindowWidgetType::Empty; - widgets[WIDX_PATH_TO_RCT1_BROWSE].type = WindowWidgetType::Button; - widgets[WIDX_PATH_TO_RCT1_CLEAR].type = WindowWidgetType::Empty; + widgets[WIDX_PATH_TO_RCT1_PATH].type = WidgetType::empty; + widgets[WIDX_PATH_TO_RCT1_BROWSE].type = WidgetType::button; + widgets[WIDX_PATH_TO_RCT1_CLEAR].type = WidgetType::empty; // Get 'Browse' button string width auto browseLabel = LanguageGetString(STR_BROWSE); diff --git a/src/openrct2-ui/windows/OverwritePrompt.cpp b/src/openrct2-ui/windows/OverwritePrompt.cpp index 848ae9caa2..f1bf92ee5e 100644 --- a/src/openrct2-ui/windows/OverwritePrompt.cpp +++ b/src/openrct2-ui/windows/OverwritePrompt.cpp @@ -34,8 +34,8 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_overwrite_prompt_widgets = makeWidgets( makeWindowShim(STR_FILEBROWSER_OVERWRITE_TITLE, OVERWRITE_WW, OVERWRITE_WH), - makeWidget({ 10, OVERWRITE_WH - 20 }, { 84, 11 }, WindowWidgetType::Button, WindowColour::primary, STR_FILEBROWSER_OVERWRITE_TITLE), - makeWidget({ OVERWRITE_WW - 95, OVERWRITE_WH - 20 }, { 85, 11 }, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) + makeWidget({ 10, OVERWRITE_WH - 20 }, { 84, 11 }, WidgetType::button, WindowColour::primary, STR_FILEBROWSER_OVERWRITE_TITLE), + makeWidget({ OVERWRITE_WW - 95, OVERWRITE_WH - 20 }, { 85, 11 }, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); // clang-format on diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index de2fea599c..c60e789a1a 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -90,7 +90,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto makeParkWidgets = [](int16_t width) { return makeWidgets( makeWindowShim(WINDOW_TITLE, width, WH), - makeWidget({ 0, 43 }, { width, 131 }, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43 }, { width, 131 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_PARK_ENTRANCE_TAB_TIP), makeTab({ 34, 17 }, STR_PARK_RATING_TAB_TIP), makeTab({ 65, 17 }, STR_PARK_GUESTS_TAB_TIP), @@ -103,14 +103,14 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _entranceWidgets = makeWidgets( makeParkWidgets(230), - makeWidget({ 3, 46}, {202, 115}, WindowWidgetType::Viewport, WindowColour::secondary ), // viewport - makeWidget({ 3, 161}, {202, 11}, WindowWidgetType::LabelCentred, WindowColour::secondary ), // status - makeWidget({205, 49}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_OPEN_OR_CLOSE_PARK_TIP ), // open / close - makeWidget({205, 73}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_BUY_LAND_RIGHTS), STR_BUY_LAND_AND_CONSTRUCTION_RIGHTS_TIP), // buy land rights - makeWidget({205, 97}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), // locate - makeWidget({205, 121}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_PARK_TIP ), // rename - makeWidget({210, 51}, { 14, 15}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_CLOSE_BUTTON_0), STR_CLOSE_PARK_TIP ), - makeWidget({210, 66}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_OPEN_BUTTON_0), STR_OPEN_PARK_TIP ) + makeWidget({ 3, 46}, {202, 115}, WidgetType::viewport, WindowColour::secondary ), // viewport + makeWidget({ 3, 161}, {202, 11}, WidgetType::labelCentred, WindowColour::secondary ), // status + makeWidget({205, 49}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_OPEN_OR_CLOSE_PARK_TIP ), // open / close + makeWidget({205, 73}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_BUY_LAND_RIGHTS), STR_BUY_LAND_AND_CONSTRUCTION_RIGHTS_TIP), // buy land rights + makeWidget({205, 97}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), // locate + makeWidget({205, 121}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_PARK_TIP ), // rename + makeWidget({210, 51}, { 14, 15}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_CLOSE_BUTTON_0), STR_CLOSE_PARK_TIP ), + makeWidget({210, 66}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_OPEN_BUTTON_0), STR_OPEN_PARK_TIP ) ); static constexpr auto _ratingWidgets = makeWidgets( @@ -123,8 +123,8 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _priceWidgets = makeWidgets( makeParkWidgets(230), - makeWidget ({ 21, 50}, {126, 14}, WindowWidgetType::Label, WindowColour::secondary, STR_ADMISSION_PRICE), - makeSpinnerWidgets({147, 50}, { 76, 14}, WindowWidgetType::Spinner, WindowColour::secondary ) // Price (3 widgets) + makeWidget ({ 21, 50}, {126, 14}, WidgetType::label, WindowColour::secondary, STR_ADMISSION_PRICE), + makeSpinnerWidgets({147, 50}, { 76, 14}, WidgetType::spinner, WindowColour::secondary ) // Price (3 widgets) ); static constexpr auto _statsWidgets = makeWidgets( @@ -133,7 +133,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _objectiveWidgets = makeWidgets( makeParkWidgets(230), - makeWidget({7, 207}, {216, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_ENTER_NAME_INTO_SCENARIO_CHART) // enter name + makeWidget({7, 207}, {216, 14}, WidgetType::button, WindowColour::secondary, STR_ENTER_NAME_INTO_SCENARIO_CHART) // enter name ); static constexpr auto _awardsWidgets = makeWidgets( @@ -553,9 +553,9 @@ namespace OpenRCT2::Ui::Windows // Only allow purchase of land when there is money if (gameState.park.Flags & PARK_FLAGS_NO_MONEY) - widgets[WIDX_BUY_LAND_RIGHTS].type = WindowWidgetType::Empty; + widgets[WIDX_BUY_LAND_RIGHTS].type = WidgetType::empty; else - widgets[WIDX_BUY_LAND_RIGHTS].type = WindowWidgetType::FlatBtn; + widgets[WIDX_BUY_LAND_RIGHTS].type = WidgetType::flatBtn; WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_7); @@ -569,24 +569,24 @@ namespace OpenRCT2::Ui::Windows auto y = 0; if (ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_PARK) { - widgets[WIDX_OPEN_OR_CLOSE].type = WindowWidgetType::Empty; + widgets[WIDX_OPEN_OR_CLOSE].type = WidgetType::empty; if (gameState.scenarioObjective.Type == OBJECTIVE_GUESTS_AND_RATING) { - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::FlatBtn; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::FlatBtn; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::flatBtn; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::flatBtn; } else { - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::ImgBtn; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::ImgBtn; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::imgBtn; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::imgBtn; } y = widgets[WIDX_OPEN_LIGHT].bottom + 5; } else { - widgets[WIDX_OPEN_OR_CLOSE].type = WindowWidgetType::FlatBtn; - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::Empty; + widgets[WIDX_OPEN_OR_CLOSE].type = WidgetType::flatBtn; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::empty; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::empty; y = widgets[WIDX_PAGE_BACKGROUND].top + 6; } @@ -597,7 +597,7 @@ namespace OpenRCT2::Ui::Windows } for (int32_t i = WIDX_OPEN_OR_CLOSE; i <= WIDX_RENAME; i++) { - if (widgets[i].type == WindowWidgetType::Empty) + if (widgets[i].type == WidgetType::empty) continue; widgets[i].left = width - 25; @@ -887,15 +887,15 @@ namespace OpenRCT2::Ui::Windows // If the entry price is locked at free, disable the widget, unless the unlock_all_prices cheat is active. if ((getGameState().park.Flags & PARK_FLAGS_NO_MONEY) || !Park::EntranceFeeUnlocked()) { - widgets[WIDX_PRICE].type = WindowWidgetType::LabelCentred; - widgets[WIDX_INCREASE_PRICE].type = WindowWidgetType::Empty; - widgets[WIDX_DECREASE_PRICE].type = WindowWidgetType::Empty; + widgets[WIDX_PRICE].type = WidgetType::labelCentred; + widgets[WIDX_INCREASE_PRICE].type = WidgetType::empty; + widgets[WIDX_DECREASE_PRICE].type = WidgetType::empty; } else { - widgets[WIDX_PRICE].type = WindowWidgetType::Spinner; - widgets[WIDX_INCREASE_PRICE].type = WindowWidgetType::Button; - widgets[WIDX_DECREASE_PRICE].type = WindowWidgetType::Button; + widgets[WIDX_PRICE].type = WidgetType::spinner; + widgets[WIDX_INCREASE_PRICE].type = WidgetType::button; + widgets[WIDX_DECREASE_PRICE].type = WidgetType::button; } WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_7); @@ -1077,12 +1077,12 @@ namespace OpenRCT2::Ui::Windows // Show name input button on scenario completion. if (getGameState().park.Flags & PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT) { - widgets[WIDX_ENTER_NAME].type = WindowWidgetType::Button; + widgets[WIDX_ENTER_NAME].type = WidgetType::button; widgets[WIDX_ENTER_NAME].top = height - 19; widgets[WIDX_ENTER_NAME].bottom = height - 6; } else - widgets[WIDX_ENTER_NAME].type = WindowWidgetType::Empty; + widgets[WIDX_ENTER_NAME].type = WidgetType::empty; WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_7); } diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index 3a274b39e5..91a73fbba9 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -46,9 +46,9 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto PatrolAreaWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({27, 17}, {44, 32}, WindowWidgetType::ImgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box - makeRemapWidget({28, 18}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_PATROL_AREA_TIP), // decrement size - makeRemapWidget({54, 32}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_PATROL_AREA_TIP ) // increment size + makeWidget ({27, 17}, {44, 32}, WidgetType::imgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box + makeRemapWidget({28, 18}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_PATROL_AREA_TIP), // decrement size + makeRemapWidget({54, 32}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_PATROL_AREA_TIP ) // increment size ); // clang-format on diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 6339a7920f..6009d34c69 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -52,18 +52,18 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kCommonPlayerWidgets = makeWidgets( makeWindowShim(STR_STRING, 192, 157), - makeWidget({ 0, 43 }, { 192, 114 }, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43 }, { 192, 114 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }), makeTab({ 34, 17 }) ); static constexpr auto window_player_overview_widgets = makeWidgets( kCommonPlayerWidgets, - makeWidget({ 3, 46}, {175, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Permission group - makeWidget({167, 47}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), - makeWidget({179, 45}, { 12, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_PLAYER_TIP), // Locate button - makeWidget({179, 69}, { 12, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_KICK_PLAYER_TIP ), // Kick button - makeWidget({ 3, 60}, {175, 61}, WindowWidgetType::Viewport, WindowColour::secondary ) // Viewport + makeWidget({ 3, 46}, {175, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Permission group + makeWidget({167, 47}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), + makeWidget({179, 45}, { 12, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_PLAYER_TIP), // Locate button + makeWidget({179, 69}, { 12, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_KICK_PLAYER_TIP ), // Kick button + makeWidget({ 3, 60}, {175, 61}, WidgetType::viewport, WindowColour::secondary ) // Viewport ); static constexpr auto window_player_statistics_widgets = makeWidgets( diff --git a/src/openrct2-ui/windows/ProgressWindow.cpp b/src/openrct2-ui/windows/ProgressWindow.cpp index 678fda3196..a734a9f962 100644 --- a/src/openrct2-ui/windows/ProgressWindow.cpp +++ b/src/openrct2-ui/windows/ProgressWindow.cpp @@ -119,9 +119,9 @@ namespace OpenRCT2::Ui::Windows void OnPrepareDraw() override { if (_onClose != nullptr) - widgets[WIDX_CLOSE].type = WindowWidgetType::CloseBox; + widgets[WIDX_CLOSE].type = WidgetType::closeBox; else - widgets[WIDX_CLOSE].type = WindowWidgetType::Empty; + widgets[WIDX_CLOSE].type = WidgetType::empty; PrepareCaption(); } diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index 98f9aa54f5..b0ff13d4d8 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -34,8 +34,8 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_ride_refurbish_widgets = makeWidgets( makeWindowShim(STR_REFURBISH_RIDE, WW, WH), - makeWidget({ 10, WH - 22 }, { 85, 14 }, WindowWidgetType::Button, WindowColour::primary, STR_REFURBISH), - makeWidget({ WW - 95, WH - 22 }, { 85, 14 }, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) + makeWidget({ 10, WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_REFURBISH), + makeWidget({ WW - 95, WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); // clang-format on diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index a49f035836..50badd0d76 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -70,30 +70,30 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_research_development_widgets = makeWidgets( makeWindowShim(STR_RESEARCH_AND_DEVELOPMENT, WW_DEVELOPMENT, WH_DEVELOPMENT), - makeWidget({ 0, 43}, { WW_DEVELOPMENT, 153}, WindowWidgetType::Resize, WindowColour::secondary ), + makeWidget({ 0, 43}, { WW_DEVELOPMENT, 153}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP), makeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), - makeWidget({ 3, 47}, {WW_DEVELOPMENT - 10, 70}, WindowWidgetType::Groupbox, WindowColour::tertiary , STR_CURRENTLY_IN_DEVELOPMENT ), - makeWidget({ 3, 124}, {WW_DEVELOPMENT - 10, 65}, WindowWidgetType::Groupbox, WindowColour::tertiary , STR_LAST_DEVELOPMENT ), - makeWidget({265, 161}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::tertiary , 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ) + makeWidget({ 3, 47}, {WW_DEVELOPMENT - 10, 70}, WidgetType::groupbox, WindowColour::tertiary , STR_CURRENTLY_IN_DEVELOPMENT ), + makeWidget({ 3, 124}, {WW_DEVELOPMENT - 10, 65}, WidgetType::groupbox, WindowColour::tertiary , STR_LAST_DEVELOPMENT ), + makeWidget({265, 161}, { 24, 24}, WidgetType::flatBtn, WindowColour::tertiary , 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ) ); static constexpr auto window_research_funding_widgets = makeWidgets( makeWindowShim(STR_RESEARCH_FUNDING, WW_FUNDING, WH_FUNDING), - makeWidget({ 0, 43}, { WW_FUNDING, 164}, WindowWidgetType::Resize, WindowColour::secondary ), + makeWidget({ 0, 43}, { WW_FUNDING, 164}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), makeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), - makeWidget({ 3, 47}, { WW_FUNDING - 6, 45}, WindowWidgetType::Groupbox, WindowColour::tertiary , STR_RESEARCH_FUNDING_ ), - makeWidget({ 8, 59}, { 160, 14}, WindowWidgetType::DropdownMenu, WindowColour::tertiary , 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), - makeWidget({156, 60}, { 11, 12}, WindowWidgetType::Button, WindowColour::tertiary , STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), - makeWidget({ 3, 96}, { WW_FUNDING - 6, 107}, WindowWidgetType::Groupbox, WindowColour::tertiary , STR_RESEARCH_PRIORITIES ), - makeWidget({ 8, 108}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), - makeWidget({ 8, 121}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), - makeWidget({ 8, 134}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), - makeWidget({ 8, 147}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), - makeWidget({ 8, 160}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), - makeWidget({ 8, 173}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), - makeWidget({ 8, 186}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ) + makeWidget({ 3, 47}, { WW_FUNDING - 6, 45}, WidgetType::groupbox, WindowColour::tertiary , STR_RESEARCH_FUNDING_ ), + makeWidget({ 8, 59}, { 160, 14}, WidgetType::dropdownMenu, WindowColour::tertiary , 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + makeWidget({156, 60}, { 11, 12}, WidgetType::button, WindowColour::tertiary , STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + makeWidget({ 3, 96}, { WW_FUNDING - 6, 107}, WidgetType::groupbox, WindowColour::tertiary , STR_RESEARCH_PRIORITIES ), + makeWidget({ 8, 108}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), + makeWidget({ 8, 121}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), + makeWidget({ 8, 134}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), + makeWidget({ 8, 147}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), + makeWidget({ 8, 160}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), + makeWidget({ 8, 173}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), + makeWidget({ 8, 186}, {WW_FUNDING - 16, 12}, WidgetType::checkbox, WindowColour::tertiary , STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ) ); static constexpr std::span window_research_page_widgets[] = { @@ -329,13 +329,13 @@ namespace OpenRCT2::Ui::Windows const auto& gameState = getGameState(); // Offset the widget index to allow reuse from other windows auto widgetOffset = GetWidgetIndexOffset(baseWidgetIndex, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP); - w->widgets[WIDX_LAST_DEVELOPMENT_BUTTON + widgetOffset].type = WindowWidgetType::Empty; + w->widgets[WIDX_LAST_DEVELOPMENT_BUTTON + widgetOffset].type = WidgetType::empty; // Display button to link to the last development, if there is one if (gameState.researchLastItem.has_value()) { auto type = gameState.researchLastItem->type; - w->widgets[WIDX_LAST_DEVELOPMENT_BUTTON + widgetOffset].type = WindowWidgetType::FlatBtn; + w->widgets[WIDX_LAST_DEVELOPMENT_BUTTON + widgetOffset].type = WidgetType::flatBtn; const auto image = type == Research::EntryType::Ride ? SPR_NEW_RIDE : SPR_NEW_SCENERY; w->widgets[WIDX_LAST_DEVELOPMENT_BUTTON + widgetOffset].image = ImageId(image); } @@ -534,13 +534,13 @@ namespace OpenRCT2::Ui::Windows if ((gameState.park.Flags & PARK_FLAGS_NO_MONEY) || gameState.researchProgressStage == RESEARCH_STAGE_FINISHED_ALL) { - w->widgets[WIDX_RESEARCH_FUNDING + widgetOffset].type = WindowWidgetType::Empty; - w->widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON + widgetOffset].type = WindowWidgetType::Empty; + w->widgets[WIDX_RESEARCH_FUNDING + widgetOffset].type = WidgetType::empty; + w->widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON + widgetOffset].type = WidgetType::empty; } else { - w->widgets[WIDX_RESEARCH_FUNDING + widgetOffset].type = WindowWidgetType::DropdownMenu; - w->widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON + widgetOffset].type = WindowWidgetType::Button; + w->widgets[WIDX_RESEARCH_FUNDING + widgetOffset].type = WidgetType::dropdownMenu; + w->widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON + widgetOffset].type = WidgetType::button; } // Current funding diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 24ffe05871..ffa4d92178 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -244,7 +244,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto kMainRideWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {kMinimumWindowWidth, 137}, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43}, {kMinimumWindowWidth, 137}, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_VIEW_OF_RIDE_ATTRACTION_TIP), makeTab({ 34, 17 }, STR_VEHICLE_DETAILS_AND_OPTIONS_TIP), makeTab({ 65, 17 }, STR_OPERATING_OPTIONS_TIP), @@ -260,64 +260,64 @@ namespace OpenRCT2::Ui::Windows // 0x009ADC34 static constexpr auto _mainWidgets = makeWidgets( kMainRideWidgets, - makeWidget({ 3, 60}, {288, 107}, WindowWidgetType::Viewport, WindowColour::secondary ), - makeWidget({ 35, 46}, {222, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kWidgetContentEmpty, STR_VIEW_SELECTION ), - makeWidget({245, 47}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_VIEW_SELECTION ), - makeWidget({ 3, 167}, {288, 11}, WindowWidgetType::LabelCentred, WindowColour::secondary ), - makeWidget({291, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, kWidgetContentEmpty, STR_OPEN_CLOSE_OR_TEST_RIDE), - makeWidget({291, 70}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION), STR_CONSTRUCTION ), - makeWidget({291, 94}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_RIDE_TIP ), - makeWidget({291, 118}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), - makeWidget({291, 142}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_RIDE_TIP ), - makeWidget({296, 48}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_CLOSE_BUTTON_0), STR_CLOSE_RIDE_TIP ), - makeWidget({296, 62}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_TEST_BUTTON_0), STR_SIMULATE_RIDE_TIP ), - makeWidget({296, 62}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_TEST_BUTTON_0), STR_TEST_RIDE_TIP ), - makeWidget({296, 76}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_OPEN_BUTTON_0), STR_OPEN_RIDE_TIP ), - makeWidget({ 3, 180}, {305, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_ARG_6_STRINGID ), - makeWidget({297, 180}, { 11, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ) + makeWidget({ 3, 60}, {288, 107}, WidgetType::viewport, WindowColour::secondary ), + makeWidget({ 35, 46}, {222, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kWidgetContentEmpty, STR_VIEW_SELECTION ), + makeWidget({245, 47}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_VIEW_SELECTION ), + makeWidget({ 3, 167}, {288, 11}, WidgetType::labelCentred, WindowColour::secondary ), + makeWidget({291, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, kWidgetContentEmpty, STR_OPEN_CLOSE_OR_TEST_RIDE), + makeWidget({291, 70}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION), STR_CONSTRUCTION ), + makeWidget({291, 94}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_RIDE_TIP ), + makeWidget({291, 118}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP ), + makeWidget({291, 142}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_RIDE_TIP ), + makeWidget({296, 48}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_CLOSE_BUTTON_0), STR_CLOSE_RIDE_TIP ), + makeWidget({296, 62}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_TEST_BUTTON_0), STR_SIMULATE_RIDE_TIP ), + makeWidget({296, 62}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_TEST_BUTTON_0), STR_TEST_RIDE_TIP ), + makeWidget({296, 76}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_OPEN_BUTTON_0), STR_OPEN_RIDE_TIP ), + makeWidget({ 3, 180}, {305, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_ARG_6_STRINGID ), + makeWidget({297, 180}, { 11, 12}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ) ); // 0x009ADDA8 static constexpr auto _vehicleWidgets = makeWidgets( kMainRideWidgets, - makeWidget ({ 7, 50}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget ({297, 51}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), - makeWidget ({ 7, 137}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_OPTION_REVERSE_TRAINS, STR_OPTION_REVERSE_TRAINS_TIP ), - makeWidget ({ 7, 154}, {302, 43}, WindowWidgetType::Scroll, WindowColour::secondary, kStringIdEmpty ), - makeSpinnerWidgets({ 7, 203}, {145, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP ), - makeSpinnerWidgets({164, 203}, {145, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP) + makeWidget ({ 7, 50}, {302, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget ({297, 51}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), + makeWidget ({ 7, 137}, {302, 12}, WidgetType::checkbox, WindowColour::secondary, STR_OPTION_REVERSE_TRAINS, STR_OPTION_REVERSE_TRAINS_TIP ), + makeWidget ({ 7, 154}, {302, 43}, WidgetType::scroll, WindowColour::secondary, kStringIdEmpty ), + makeSpinnerWidgets({ 7, 203}, {145, 12}, WidgetType::spinner, WindowColour::secondary, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP ), + makeSpinnerWidgets({164, 203}, {145, 12}, WidgetType::spinner, WindowColour::secondary, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP) ); // 0x009ADEFC static constexpr auto _operatingWidgets = makeWidgets( kMainRideWidgets, - makeSpinnerWidgets({157, 61}, {152, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_ARG_18_STRINGID ), // NB: 3 widgets - makeSpinnerWidgets({157, 75}, {152, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_LIFT_HILL_CHAIN_SPEED_VALUE ), // NB: 3 widgets - makeWidget ({ 7, 109}, { 80, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_WAIT_FOR, STR_WAIT_FOR_PASSENGERS_BEFORE_DEPARTING_TIP), - makeWidget ({ 7, 124}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::secondary ), - makeWidget ({ 7, 139}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MINIMUM_WAITING_TIME, STR_MINIMUM_LENGTH_BEFORE_DEPARTING_TIP ), - makeSpinnerWidgets({157, 139}, {152, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_ARG_10_STRINGID ), // NB: 3 widgets - makeWidget ({ 7, 154}, {150, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_MAXIMUM_WAITING_TIME, STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP ), - makeSpinnerWidgets({157, 154}, {152, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_ARG_14_STRINGID ), // NB: 3 widgets - makeWidget ({ 7, 169}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP ), - makeWidget ({ 21, 61}, {129, 12}, WindowWidgetType::Label, WindowColour::secondary ), - makeWidget ({ 21, 75}, {129, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_LIFT_HILL_CHAIN_SPEED ), - makeWidget ({ 7, 47}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE ), - makeWidget ({297, 48}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE ), - makeWidget ({ 87, 109}, {222, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget ({297, 110}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), - makeWidget ({ 21, 89}, {129, 12}, WindowWidgetType::Label, WindowColour::secondary, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP ), - makeSpinnerWidgets({157, 89}, {152, 12}, WindowWidgetType::Spinner, WindowColour::secondary, STR_NUMBER_OF_CIRCUITS_VALUE ) // NB: 3 widgets + makeSpinnerWidgets({157, 61}, {152, 12}, WidgetType::spinner, WindowColour::secondary, STR_ARG_18_STRINGID ), // NB: 3 widgets + makeSpinnerWidgets({157, 75}, {152, 12}, WidgetType::spinner, WindowColour::secondary, STR_LIFT_HILL_CHAIN_SPEED_VALUE ), // NB: 3 widgets + makeWidget ({ 7, 109}, { 80, 12}, WidgetType::checkbox, WindowColour::secondary, STR_WAIT_FOR, STR_WAIT_FOR_PASSENGERS_BEFORE_DEPARTING_TIP), + makeWidget ({ 7, 124}, {302, 12}, WidgetType::checkbox, WindowColour::secondary ), + makeWidget ({ 7, 139}, {150, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MINIMUM_WAITING_TIME, STR_MINIMUM_LENGTH_BEFORE_DEPARTING_TIP ), + makeSpinnerWidgets({157, 139}, {152, 12}, WidgetType::spinner, WindowColour::secondary, STR_ARG_10_STRINGID ), // NB: 3 widgets + makeWidget ({ 7, 154}, {150, 12}, WidgetType::checkbox, WindowColour::secondary, STR_MAXIMUM_WAITING_TIME, STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP ), + makeSpinnerWidgets({157, 154}, {152, 12}, WidgetType::spinner, WindowColour::secondary, STR_ARG_14_STRINGID ), // NB: 3 widgets + makeWidget ({ 7, 169}, {302, 12}, WidgetType::checkbox, WindowColour::secondary, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP ), + makeWidget ({ 21, 61}, {129, 12}, WidgetType::label, WindowColour::secondary ), + makeWidget ({ 21, 75}, {129, 12}, WidgetType::label, WindowColour::secondary, STR_LIFT_HILL_CHAIN_SPEED ), + makeWidget ({ 7, 47}, {302, 12}, WidgetType::dropdownMenu, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE ), + makeWidget ({297, 48}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE ), + makeWidget ({ 87, 109}, {222, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget ({297, 110}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), + makeWidget ({ 21, 89}, {129, 12}, WidgetType::label, WindowColour::secondary, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP ), + makeSpinnerWidgets({157, 89}, {152, 12}, WidgetType::spinner, WindowColour::secondary, STR_NUMBER_OF_CIRCUITS_VALUE ) // NB: 3 widgets ); // 0x009AE190 static constexpr auto _maintenanceWidgets = makeWidgets( kMainRideWidgets, - makeWidget({107, 71}, {202, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdEmpty, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), - makeWidget({297, 72}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), - makeWidget({289, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP ), - makeWidget({265, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION), STR_REFURBISH_RIDE_TIP ), - makeWidget({241, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_NO_ENTRY), STR_DEBUG_FORCE_BREAKDOWN_TIP ), + makeWidget({107, 71}, {202, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdEmpty, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), + makeWidget({297, 72}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), + makeWidget({289, 108}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP ), + makeWidget({265, 108}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CONSTRUCTION), STR_REFURBISH_RIDE_TIP ), + makeWidget({241, 108}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_NO_ENTRY), STR_DEBUG_FORCE_BREAKDOWN_TIP ), makeProgressBar({107, 47}, { 147, 10}, COLOUR_BRIGHT_GREEN), makeProgressBar({107, 58}, { 147, 10}, COLOUR_BRIGHT_RED) ); @@ -325,77 +325,77 @@ namespace OpenRCT2::Ui::Windows // 0x009AE2A4 static constexpr auto _colourWidgets = makeWidgets( kMainRideWidgets, - makeWidget({ 3, 47}, { 68, 47}, WindowWidgetType::Spinner, WindowColour::secondary ), - makeWidget({ 74, 49}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_ARG_14_STRINGID ), - makeWidget({301, 50}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP ), - makeWidget({ 79, 74}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), - makeWidget({ 99, 74}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), - makeWidget({119, 74}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP ), - makeWidget({ 74, 49}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({301, 50}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), - makeWidget({289, 68}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_PAINT_INDIVIDUAL_AREA_TIP ), - makeWidget({245, 101}, { 68, 47}, WindowWidgetType::Spinner, WindowColour::secondary ), - makeWidget({103, 103}, {139, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdEmpty ), - makeWidget({230, 104}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP), - makeWidget({ 3, 157}, { 68, 47}, WindowWidgetType::Scroll, WindowColour::secondary, kStringIdEmpty ), - makeWidget({ 74, 157}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, STR_ARG_6_STRINGID ), - makeWidget({301, 158}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP ), - makeWidget({ 74, 173}, {239, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), - makeWidget({301, 174}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_TO_MODIFY_TIP ), - makeWidget({ 79, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), - makeWidget({ 99, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), - makeWidget({119, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP ), - makeWidget({100, 74}, {239, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_RANDOM_COLOUR ), - makeWidget({139, 190}, {110, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_RANDOMISE_VEHICLE_COLOURS, STR_RANDOMISE_VEHICLE_COLOURS_TIP ) + makeWidget({ 3, 47}, { 68, 47}, WidgetType::spinner, WindowColour::secondary ), + makeWidget({ 74, 49}, {239, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_ARG_14_STRINGID ), + makeWidget({301, 50}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP ), + makeWidget({ 79, 74}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), + makeWidget({ 99, 74}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), + makeWidget({119, 74}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP ), + makeWidget({ 74, 49}, {239, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({301, 50}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), + makeWidget({289, 68}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_PAINT_INDIVIDUAL_AREA_TIP ), + makeWidget({245, 101}, { 68, 47}, WidgetType::spinner, WindowColour::secondary ), + makeWidget({103, 103}, {139, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdEmpty ), + makeWidget({230, 104}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP), + makeWidget({ 3, 157}, { 68, 47}, WidgetType::scroll, WindowColour::secondary, kStringIdEmpty ), + makeWidget({ 74, 157}, {239, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_ARG_6_STRINGID ), + makeWidget({301, 158}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP ), + makeWidget({ 74, 173}, {239, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), + makeWidget({301, 174}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_TO_MODIFY_TIP ), + makeWidget({ 79, 190}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), + makeWidget({ 99, 190}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), + makeWidget({119, 190}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP ), + makeWidget({100, 74}, {239, 12}, WidgetType::checkbox, WindowColour::secondary, STR_RANDOM_COLOUR ), + makeWidget({139, 190}, {110, 12}, WidgetType::button, WindowColour::secondary, STR_RANDOMISE_VEHICLE_COLOURS, STR_RANDOMISE_VEHICLE_COLOURS_TIP ) ); // 0x009AE4C8 static constexpr auto _musicWidgets = makeWidgets( kMainRideWidgets, - makeWidget({ 7, 47}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP ), - makeWidget({ 7, 62}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary, kStringIdEmpty ), - makeWidget({297, 63}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP), - makeWidget({154, 90}, {114, 114}, WindowWidgetType::FlatBtn, WindowColour::secondary ), - makeWidget({ 7, 90}, {500, 450}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_BOTH ) + makeWidget({ 7, 47}, {302, 12}, WidgetType::checkbox, WindowColour::secondary, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP ), + makeWidget({ 7, 62}, {302, 12}, WidgetType::dropdownMenu, WindowColour::secondary, kStringIdEmpty ), + makeWidget({297, 63}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP), + makeWidget({154, 90}, {114, 114}, WidgetType::flatBtn, WindowColour::secondary ), + makeWidget({ 7, 90}, {500, 450}, WidgetType::scroll, WindowColour::secondary, SCROLL_BOTH ) ); // 0x009AE5DC static constexpr auto _measurementWidgets = makeWidgets( kMainRideWidgets, - makeWidget({288, 194}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_FLOPPY), STR_SAVE_TRACK_DESIGN), - makeWidget({ 4, 127}, {154, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_SELECT_NEARBY_SCENERY ), - makeWidget({158, 127}, {154, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RESET_SELECTION ), - makeWidget({ 4, 177}, {154, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_DESIGN_SAVE ), - makeWidget({158, 177}, {154, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_DESIGN_CANCEL ) + makeWidget({288, 194}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_FLOPPY), STR_SAVE_TRACK_DESIGN), + makeWidget({ 4, 127}, {154, 14}, WidgetType::button, WindowColour::secondary, STR_SELECT_NEARBY_SCENERY ), + makeWidget({158, 127}, {154, 14}, WidgetType::button, WindowColour::secondary, STR_RESET_SELECTION ), + makeWidget({ 4, 177}, {154, 14}, WidgetType::button, WindowColour::secondary, STR_DESIGN_SAVE ), + makeWidget({158, 177}, {154, 14}, WidgetType::button, WindowColour::secondary, STR_DESIGN_CANCEL ) ); // 0x009AE710 static constexpr auto _graphsWidgets = makeWidgets( kMainRideWidgets, - makeWidget({ 3, 46}, {306, 112}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_HORIZONTAL, STR_LOGGING_DATA_FROM_TIP ), - makeWidget({ 3, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_STATS_VELOCITY, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP ), - makeWidget({ 76, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP ), - makeWidget({149, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP), - makeWidget({222, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP ) + makeWidget({ 3, 46}, {306, 112}, WidgetType::scroll, WindowColour::secondary, SCROLL_HORIZONTAL, STR_LOGGING_DATA_FROM_TIP ), + makeWidget({ 3, 163}, { 73, 14}, WidgetType::button, WindowColour::secondary, STR_RIDE_STATS_VELOCITY, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP ), + makeWidget({ 76, 163}, { 73, 14}, WidgetType::button, WindowColour::secondary, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP ), + makeWidget({149, 163}, { 73, 14}, WidgetType::button, WindowColour::secondary, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP), + makeWidget({222, 163}, { 73, 14}, WidgetType::button, WindowColour::secondary, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP ) ); // 0x009AE844 static constexpr auto _incomeWidgets = makeWidgets( kMainRideWidgets, - makeWidget ({ 19, 50}, {126, 14}, WindowWidgetType::Label, WindowColour::secondary ), - makeSpinnerWidgets({147, 50}, {162, 14}, WindowWidgetType::Spinner, WindowColour::secondary, STR_ARG_6_CURRENCY2DP ), // NB: 3 widgets - makeWidget ({ 5, 62}, {306, 13}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP), - makeWidget ({ 19, 94}, {126, 14}, WindowWidgetType::Label, WindowColour::secondary ), - makeSpinnerWidgets({147, 94}, {162, 14}, WindowWidgetType::Spinner, WindowColour::secondary, STR_RIDE_SECONDARY_PRICE_VALUE ), // NB: 3 widgets - makeWidget ({ 5, 106}, {306, 13}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP) + makeWidget ({ 19, 50}, {126, 14}, WidgetType::label, WindowColour::secondary ), + makeSpinnerWidgets({147, 50}, {162, 14}, WidgetType::spinner, WindowColour::secondary, STR_ARG_6_CURRENCY2DP ), // NB: 3 widgets + makeWidget ({ 5, 62}, {306, 13}, WidgetType::checkbox, WindowColour::secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP), + makeWidget ({ 19, 94}, {126, 14}, WidgetType::label, WindowColour::secondary ), + makeSpinnerWidgets({147, 94}, {162, 14}, WidgetType::spinner, WindowColour::secondary, STR_RIDE_SECONDARY_PRICE_VALUE ), // NB: 3 widgets + makeWidget ({ 5, 106}, {306, 13}, WidgetType::checkbox, WindowColour::secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP) ); // 0x009AE9C8 static constexpr auto _customerWidgets = makeWidgets( kMainRideWidgets, - makeWidget({289, 54}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION), STR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION_TIP), - makeWidget({289, 78}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION), STR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION_TIP ), - makeWidget({289, 102}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION), STR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION_TIP ) + makeWidget({289, 54}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION), STR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION_TIP), + makeWidget({289, 78}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION), STR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION_TIP ), + makeWidget({289, 102}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION), STR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION_TIP ) ); static constexpr std::span PageWidgets[] = { @@ -2386,39 +2386,39 @@ namespace OpenRCT2::Ui::Windows if (!gameState.cheats.allowArbitraryRideTypeChanges) { - widgets[WIDX_RIDE_TYPE].type = WindowWidgetType::Empty; - widgets[WIDX_RIDE_TYPE_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_RIDE_TYPE].type = WidgetType::empty; + widgets[WIDX_RIDE_TYPE_DROPDOWN].type = WidgetType::empty; } else { - widgets[WIDX_RIDE_TYPE].type = WindowWidgetType::DropdownMenu; + widgets[WIDX_RIDE_TYPE].type = WidgetType::dropdownMenu; widgets[WIDX_RIDE_TYPE].text = ride->getRideTypeDescriptor().Naming.Name; - widgets[WIDX_RIDE_TYPE_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_RIDE_TYPE_DROPDOWN].type = WidgetType::button; } WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_10); if (ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE) { - widgets[WIDX_OPEN].type = WindowWidgetType::Empty; - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::ImgBtn; - widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::Empty; + widgets[WIDX_OPEN].type = WidgetType::empty; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::imgBtn; + widgets[WIDX_SIMULATE_LIGHT].type = WidgetType::empty; #ifdef __SIMULATE_IN_RIDE_WINDOW__ if (ride->supportsStatus(RideStatus::simulating)) - widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::ImgBtn; + widgets[WIDX_SIMULATE_LIGHT].type = WidgetType::imgBtn; #endif - widgets[WIDX_TEST_LIGHT].type = ride->supportsStatus(RideStatus::testing) ? WindowWidgetType::ImgBtn - : WindowWidgetType::Empty; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::ImgBtn; + widgets[WIDX_TEST_LIGHT].type = ride->supportsStatus(RideStatus::testing) ? WidgetType::imgBtn + : WidgetType::empty; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::imgBtn; widgetHeight = widgets[WIDX_PAGE_BACKGROUND].top + 19; - if (widgets[WIDX_SIMULATE_LIGHT].type != WindowWidgetType::Empty) + if (widgets[WIDX_SIMULATE_LIGHT].type != WidgetType::empty) { widgets[WIDX_SIMULATE_LIGHT].top = widgetHeight; widgets[WIDX_SIMULATE_LIGHT].bottom = widgetHeight + 13; widgetHeight += 14; } - if (widgets[WIDX_TEST_LIGHT].type != WindowWidgetType::Empty) + if (widgets[WIDX_TEST_LIGHT].type != WidgetType::empty) { widgets[WIDX_TEST_LIGHT].top = widgetHeight; widgets[WIDX_TEST_LIGHT].bottom = widgetHeight + 13; @@ -2430,11 +2430,11 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_OPEN].type = WindowWidgetType::FlatBtn; - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_SIMULATE_LIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_TEST_LIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::Empty; + widgets[WIDX_OPEN].type = WidgetType::flatBtn; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::empty; + widgets[WIDX_SIMULATE_LIGHT].type = WidgetType::empty; + widgets[WIDX_TEST_LIGHT].type = WidgetType::empty; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::empty; widgetHeight = widgets[WIDX_PAGE_BACKGROUND].top + 3; } @@ -2796,35 +2796,35 @@ namespace OpenRCT2::Ui::Windows // Trains if (rideEntry->cars_per_flat_ride > 1 || gameState.cheats.disableTrainLengthLimit) { - widgets[WIDX_VEHICLE_TRAINS].type = WindowWidgetType::Spinner; - widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_VEHICLE_TRAINS].type = WidgetType::spinner; + widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WidgetType::button; + widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WidgetType::button; } else { - widgets[WIDX_VEHICLE_TRAINS].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_TRAINS].type = WidgetType::empty; + widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WidgetType::empty; + widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WidgetType::empty; } // Cars per train if (rideEntry->zero_cars + 1 < rideEntry->max_cars_in_train || gameState.cheats.disableTrainLengthLimit) { - widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WindowWidgetType::Spinner; - widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WidgetType::spinner; + widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WidgetType::button; + widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WidgetType::button; } else { - widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WidgetType::empty; + widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WidgetType::empty; + widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WidgetType::empty; } if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::allowReversedTrains) || (gameState.cheats.disableTrainLengthLimit && !ride->getRideTypeDescriptor().HasFlag(RtdFlag::isFlatRide))) { - widgets[WIDX_VEHICLE_REVERSED_TRAINS_CHECKBOX].type = WindowWidgetType::Checkbox; + widgets[WIDX_VEHICLE_REVERSED_TRAINS_CHECKBOX].type = WidgetType::checkbox; if (ride->hasLifecycleFlag(RIDE_LIFECYCLE_REVERSED_TRAINS)) { pressed_widgets |= (1uLL << WIDX_VEHICLE_REVERSED_TRAINS_CHECKBOX); @@ -2836,7 +2836,7 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_VEHICLE_REVERSED_TRAINS_CHECKBOX].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_REVERSED_TRAINS_CHECKBOX].type = WidgetType::empty; } auto ft = Formatter::Common(); @@ -3483,46 +3483,46 @@ namespace OpenRCT2::Ui::Windows if (rtd.TrackPaintFunctions.Regular.SupportsTrackGroup(TrackGroup::liftHill) || (hasAlternativeType && rtd.InvertedTrackPaintFunctions.Regular.SupportsTrackGroup(TrackGroup::liftHill))) { - widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_LIFT_HILL_SPEED].type = WindowWidgetType::Spinner; - widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WidgetType::label; + widgets[WIDX_LIFT_HILL_SPEED].type = WidgetType::spinner; + widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WidgetType::button; + widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WidgetType::button; ft.Rewind(); ft.Increment(20); ft.Add(ride->liftHillSpeed); } else { - widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_LIFT_HILL_SPEED].type = WindowWidgetType::Empty; - widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WidgetType::empty; + widgets[WIDX_LIFT_HILL_SPEED].type = WidgetType::empty; + widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WidgetType::empty; + widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WidgetType::empty; } // Number of circuits if (ride->canHaveMultipleCircuits()) { - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WindowWidgetType::Spinner; - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WidgetType::label; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WidgetType::spinner; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WidgetType::button; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WidgetType::button; ft.Rewind(); ft.Increment(22); ft.Add(ride->numCircuits); } else { - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WindowWidgetType::Empty; - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WidgetType::empty; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WidgetType::empty; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WidgetType::empty; + widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WidgetType::empty; } // Leave if another vehicle arrives at station if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::hasLeaveWhenAnotherVehicleArrivesAtStation) && ride->numTrains > 1 && !ride->isBlockSectioned()) { - widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WindowWidgetType::Checkbox; + widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WidgetType::checkbox; widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].tooltip = STR_LEAVE_IF_ANOTHER_VEHICLE_ARRIVES_TIP; widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].text = ride->getRideTypeDescriptor().NameConvention.vehicle == RideComponentType::Boat @@ -3531,19 +3531,19 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WindowWidgetType::Empty; + widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WidgetType::empty; } // Synchronise with adjacent stations if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::canSynchroniseWithAdjacentStations)) { - widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].type = WindowWidgetType::Checkbox; + widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].type = WidgetType::checkbox; widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].text = STR_SYNCHRONISE_WITH_ADJACENT_STATIONS; widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].tooltip = STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP; } else { - widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].type = WindowWidgetType::Empty; + widgets[WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX].type = WidgetType::empty; } // Mode @@ -3553,19 +3553,19 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_LOAD].text = VehicleLoadNames[(ride->departFlags & RIDE_DEPART_WAIT_FOR_LOAD_MASK)]; if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::hasLoadOptions)) { - widgets[WIDX_LOAD_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_LOAD].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_LOAD_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_LOAD_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_LOAD].type = WidgetType::dropdownMenu; + widgets[WIDX_LOAD_DROPDOWN].type = WidgetType::button; - widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_MINIMUM_LENGTH].type = WindowWidgetType::Spinner; - widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_MINIMUM_LENGTH].type = WidgetType::spinner; + widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WidgetType::button; + widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WidgetType::button; - widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Checkbox; - widgets[WIDX_MAXIMUM_LENGTH].type = WindowWidgetType::Spinner; - widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WidgetType::checkbox; + widgets[WIDX_MAXIMUM_LENGTH].type = WidgetType::spinner; + widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WidgetType::button; + widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WidgetType::button; ft.Rewind(); ft.Increment(10); @@ -3579,19 +3579,19 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_LOAD_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_LOAD].type = WindowWidgetType::Empty; - widgets[WIDX_LOAD_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_LOAD_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_LOAD].type = WidgetType::empty; + widgets[WIDX_LOAD_DROPDOWN].type = WidgetType::empty; - widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_MINIMUM_LENGTH].type = WindowWidgetType::Empty; - widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_MINIMUM_LENGTH].type = WidgetType::empty; + widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WidgetType::empty; + widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WidgetType::empty; - widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WindowWidgetType::Empty; - widgets[WIDX_MAXIMUM_LENGTH].type = WindowWidgetType::Empty; - widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WidgetType::empty; + widgets[WIDX_MAXIMUM_LENGTH].type = WidgetType::empty; + widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WidgetType::empty; + widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WidgetType::empty; } if (ride->departFlags & RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES) @@ -3665,21 +3665,21 @@ namespace OpenRCT2::Ui::Windows if (format != 0) { - widgets[WIDX_MODE_TWEAK_LABEL].type = WindowWidgetType::Label; + widgets[WIDX_MODE_TWEAK_LABEL].type = WidgetType::label; widgets[WIDX_MODE_TWEAK_LABEL].text = caption; widgets[WIDX_MODE_TWEAK_LABEL].tooltip = tooltip; - widgets[WIDX_MODE_TWEAK].type = WindowWidgetType::Spinner; + widgets[WIDX_MODE_TWEAK].type = WidgetType::spinner; widgets[WIDX_MODE_TWEAK].text = format; - widgets[WIDX_MODE_TWEAK_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_MODE_TWEAK_DECREASE].type = WindowWidgetType::Button; + widgets[WIDX_MODE_TWEAK_INCREASE].type = WidgetType::button; + widgets[WIDX_MODE_TWEAK_DECREASE].type = WidgetType::button; pressed_widgets &= ~(1uLL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX); } else { - widgets[WIDX_MODE_TWEAK_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_MODE_TWEAK].type = WindowWidgetType::Empty; - widgets[WIDX_MODE_TWEAK_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_MODE_TWEAK_DECREASE].type = WindowWidgetType::Empty; + widgets[WIDX_MODE_TWEAK_LABEL].type = WidgetType::empty; + widgets[WIDX_MODE_TWEAK].type = WidgetType::empty; + widgets[WIDX_MODE_TWEAK_INCREASE].type = WidgetType::empty; + widgets[WIDX_MODE_TWEAK_DECREASE].type = WidgetType::empty; } WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_10); @@ -4008,11 +4008,11 @@ namespace OpenRCT2::Ui::Windows if (Config::Get().general.DebuggingTools && NetworkGetMode() == NETWORK_MODE_NONE) { - widgets[WIDX_FORCE_BREAKDOWN].type = WindowWidgetType::FlatBtn; + widgets[WIDX_FORCE_BREAKDOWN].type = WidgetType::flatBtn; } else { - widgets[WIDX_FORCE_BREAKDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_FORCE_BREAKDOWN].type = WidgetType::empty; } if (ride->getRideTypeDescriptor().AvailableBreakdowns == 0 @@ -4598,56 +4598,56 @@ namespace OpenRCT2::Ui::Windows const auto& rtd = ride->getRideTypeDescriptor(); if (rtd.specialType == RtdSpecialType::maze) { - widgets[WIDX_MAZE_STYLE].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_MAZE_STYLE_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_MAZE_STYLE].type = WidgetType::dropdownMenu; + widgets[WIDX_MAZE_STYLE_DROPDOWN].type = WidgetType::button; widgets[WIDX_MAZE_STYLE].text = MazeOptions[trackColour.supports].text; } else { - widgets[WIDX_MAZE_STYLE].type = WindowWidgetType::Empty; - widgets[WIDX_MAZE_STYLE_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_MAZE_STYLE].type = WidgetType::empty; + widgets[WIDX_MAZE_STYLE_DROPDOWN].type = WidgetType::empty; } // Track, multiple colour schemes if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::supportsMultipleColourSchemes)) { - widgets[WIDX_TRACK_COLOUR_SCHEME].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_TRACK_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Button; - widgets[WIDX_PAINT_INDIVIDUAL_AREA].type = WindowWidgetType::FlatBtn; + widgets[WIDX_TRACK_COLOUR_SCHEME].type = WidgetType::dropdownMenu; + widgets[WIDX_TRACK_COLOUR_SCHEME_DROPDOWN].type = WidgetType::button; + widgets[WIDX_PAINT_INDIVIDUAL_AREA].type = WidgetType::flatBtn; } else { - widgets[WIDX_TRACK_COLOUR_SCHEME].type = WindowWidgetType::Empty; - widgets[WIDX_TRACK_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_PAINT_INDIVIDUAL_AREA].type = WindowWidgetType::Empty; + widgets[WIDX_TRACK_COLOUR_SCHEME].type = WidgetType::empty; + widgets[WIDX_TRACK_COLOUR_SCHEME_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_PAINT_INDIVIDUAL_AREA].type = WidgetType::empty; } // Track main colour if (HasTrackColour(*ride, 0)) { - widgets[WIDX_TRACK_MAIN_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_TRACK_MAIN_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_TRACK_MAIN_COLOUR].image = GetColourButtonImage(trackColour.main); } else { - widgets[WIDX_TRACK_MAIN_COLOUR].type = WindowWidgetType::Empty; + widgets[WIDX_TRACK_MAIN_COLOUR].type = WidgetType::empty; } // Track additional colour if (HasTrackColour(*ride, 1)) { - widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_TRACK_ADDITIONAL_COLOUR].image = GetColourButtonImage(trackColour.additional); } else { - widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WindowWidgetType::Empty; + widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WidgetType::empty; } // Selling item random colour checkbox if (ride->hasRecolourableShopItems()) { - widgets[WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX].type = WindowWidgetType::Checkbox; + widgets[WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX].type = WidgetType::checkbox; if (ride->hasLifecycleFlag(RIDE_LIFECYCLE_RANDOM_SHOP_COLOURS)) { pressed_widgets |= (1uLL << WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX); @@ -4659,33 +4659,33 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX].type = WindowWidgetType::Empty; + widgets[WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX].type = WidgetType::empty; } // Track supports colour if (HasTrackColour(*ride, 2) && rtd.specialType != RtdSpecialType::maze) { - widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_TRACK_SUPPORT_COLOUR].image = GetColourButtonImage(trackColour.supports); } else { - widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WindowWidgetType::Empty; + widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WidgetType::empty; } // Track preview if (rtd.HasFlag(RtdFlag::hasTrackColourMain) || rtd.HasFlag(RtdFlag::hasTrackColourAdditional) || rtd.HasFlag(RtdFlag::hasTrackColourSupports)) - widgets[WIDX_TRACK_PREVIEW].type = WindowWidgetType::Spinner; + widgets[WIDX_TRACK_PREVIEW].type = WidgetType::spinner; else - widgets[WIDX_TRACK_PREVIEW].type = WindowWidgetType::Empty; + widgets[WIDX_TRACK_PREVIEW].type = WidgetType::empty; // Entrance style if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::hasEntranceAndExit)) { - widgets[WIDX_ENTRANCE_PREVIEW].type = WindowWidgetType::Spinner; - widgets[WIDX_ENTRANCE_STYLE].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_ENTRANCE_PREVIEW].type = WidgetType::spinner; + widgets[WIDX_ENTRANCE_STYLE].type = WidgetType::dropdownMenu; + widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WidgetType::button; auto stringId = kStringIdNone; auto stationObj = ride->getStationObject(); @@ -4697,9 +4697,9 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_ENTRANCE_PREVIEW].type = WindowWidgetType::Empty; - widgets[WIDX_ENTRANCE_STYLE].type = WindowWidgetType::Empty; - widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_ENTRANCE_PREVIEW].type = WidgetType::empty; + widgets[WIDX_ENTRANCE_STYLE].type = WidgetType::empty; + widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WidgetType::empty; } // Vehicle colours @@ -4709,17 +4709,17 @@ namespace OpenRCT2::Ui::Windows if (ride->vehicleColourSettings == VehicleColourSettings::same) { _vehicleIndex = 0; - widgets[WIDX_RANDOMISE_VEHICLE_COLOURS].type = WindowWidgetType::Empty; + widgets[WIDX_RANDOMISE_VEHICLE_COLOURS].type = WidgetType::empty; } else { - widgets[WIDX_RANDOMISE_VEHICLE_COLOURS].type = WindowWidgetType::Button; + widgets[WIDX_RANDOMISE_VEHICLE_COLOURS].type = WidgetType::button; } vehicleColour = RideGetVehicleColour(*ride, _vehicleIndex); - widgets[WIDX_VEHICLE_PREVIEW].type = WindowWidgetType::Scroll; - widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_VEHICLE_PREVIEW].type = WidgetType::scroll; + widgets[WIDX_VEHICLE_BODY_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_VEHICLE_BODY_COLOUR].image = GetColourButtonImage(vehicleColour.Body); bool allowChangingBodyColour = false; @@ -4740,23 +4740,23 @@ namespace OpenRCT2::Ui::Windows allowChangingTertiaryColour = true; } - widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_BODY_COLOUR].type = WidgetType::empty; + widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WidgetType::empty; + widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WidgetType::empty; if (allowChangingBodyColour) { - widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_VEHICLE_BODY_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_VEHICLE_BODY_COLOUR].image = GetColourButtonImage(vehicleColour.Body); } if (allowChangingTrimColour) { - widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_VEHICLE_TRIM_COLOUR].image = GetColourButtonImage(vehicleColour.Trim); } if (allowChangingTertiaryColour) { - widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::ColourBtn; + widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WidgetType::colourBtn; widgets[WIDX_VEHICLE_TERTIARY_COLOUR].image = GetColourButtonImage(vehicleColour.Tertiary); } @@ -4764,13 +4764,13 @@ namespace OpenRCT2::Ui::Windows if (!ride->getRideTypeDescriptor().HasFlag(RtdFlag::vehicleIsIntegral) && (ride->numCarsPerTrain | ride->numTrains) > 1) { - widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WidgetType::dropdownMenu; + widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WidgetType::button; } else { - widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WidgetType::empty; + widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WidgetType::empty; } ft.Rewind(); ft.Increment(6); @@ -4782,29 +4782,29 @@ namespace OpenRCT2::Ui::Windows // Vehicle index if (ride->vehicleColourSettings != VehicleColourSettings::same) { - widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WidgetType::dropdownMenu; + widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WidgetType::button; widgets[WIDX_VEHICLE_COLOUR_INDEX].text = ride->vehicleColourSettings == VehicleColourSettings::perTrain ? STR_RIDE_COLOUR_TRAIN_VALUE : STR_RIDE_COLOUR_VEHICLE_VALUE; } else { - widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WidgetType::empty; + widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WidgetType::empty; } } else { - widgets[WIDX_VEHICLE_PREVIEW].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::Empty; - widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::Empty; - widgets[WIDX_RANDOMISE_VEHICLE_COLOURS].type = WindowWidgetType::Empty; + widgets[WIDX_VEHICLE_PREVIEW].type = WidgetType::empty; + widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WidgetType::empty; + widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WidgetType::empty; + widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_VEHICLE_BODY_COLOUR].type = WidgetType::empty; + widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WidgetType::empty; + widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WidgetType::empty; + widgets[WIDX_RANDOMISE_VEHICLE_COLOURS].type = WidgetType::empty; } ft.Rewind(); @@ -4828,7 +4828,7 @@ namespace OpenRCT2::Ui::Windows // Track / shop item preview const auto& trackPreviewWidget = widgets[WIDX_TRACK_PREVIEW]; - if (trackPreviewWidget.type != WindowWidgetType::Empty) + if (trackPreviewWidget.type != WidgetType::empty) GfxFillRect( rt, { { windowPos + ScreenCoordsXY{ trackPreviewWidget.left + 1, trackPreviewWidget.top + 1 } }, @@ -4898,7 +4898,7 @@ namespace OpenRCT2::Ui::Windows // Entrance preview trackColour = ride->trackColours[0]; const auto& entrancePreviewWidget = widgets[WIDX_ENTRANCE_PREVIEW]; - if (entrancePreviewWidget.type != WindowWidgetType::Empty) + if (entrancePreviewWidget.type != WidgetType::empty) { if (ClipDrawPixelInfo( clippedDpi, rt, @@ -5589,22 +5589,22 @@ namespace OpenRCT2::Ui::Windows ride->formatNameTo(ft); widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN_NOT_POSSIBLE; - widgets[WIDX_SAVE_TRACK_DESIGN].type = WindowWidgetType::Empty; + widgets[WIDX_SAVE_TRACK_DESIGN].type = WidgetType::empty; if (gTrackDesignSaveMode && gTrackDesignSaveRideIndex == rideId) { - widgets[WIDX_SELECT_NEARBY_SCENERY].type = WindowWidgetType::Button; - widgets[WIDX_RESET_SELECTION].type = WindowWidgetType::Button; - widgets[WIDX_SAVE_DESIGN].type = WindowWidgetType::Button; - widgets[WIDX_CANCEL_DESIGN].type = WindowWidgetType::Button; + widgets[WIDX_SELECT_NEARBY_SCENERY].type = WidgetType::button; + widgets[WIDX_RESET_SELECTION].type = WidgetType::button; + widgets[WIDX_SAVE_DESIGN].type = WidgetType::button; + widgets[WIDX_CANCEL_DESIGN].type = WidgetType::button; } else { - widgets[WIDX_SELECT_NEARBY_SCENERY].type = WindowWidgetType::Empty; - widgets[WIDX_RESET_SELECTION].type = WindowWidgetType::Empty; - widgets[WIDX_SAVE_DESIGN].type = WindowWidgetType::Empty; - widgets[WIDX_CANCEL_DESIGN].type = WindowWidgetType::Empty; + widgets[WIDX_SELECT_NEARBY_SCENERY].type = WidgetType::empty; + widgets[WIDX_RESET_SELECTION].type = WidgetType::empty; + widgets[WIDX_SAVE_DESIGN].type = WidgetType::empty; + widgets[WIDX_CANCEL_DESIGN].type = WidgetType::empty; - widgets[WIDX_SAVE_TRACK_DESIGN].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SAVE_TRACK_DESIGN].type = WidgetType::flatBtn; disabled_widgets |= (1uLL << WIDX_SAVE_TRACK_DESIGN); if (ride->lifecycleFlags & RIDE_LIFECYCLE_TESTED) { @@ -5624,7 +5624,7 @@ namespace OpenRCT2::Ui::Windows DrawWidgets(rt); DrawTabImages(rt); - if (widgets[WIDX_SAVE_DESIGN].type == WindowWidgetType::Button) + if (widgets[WIDX_SAVE_DESIGN].type == WidgetType::button) { Widget* widget = &widgets[WIDX_PAGE_BACKGROUND]; @@ -6034,13 +6034,13 @@ namespace OpenRCT2::Ui::Windows // Hide graph buttons that are not applicable if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::hasGForces)) { - widgets[WIDX_GRAPH_VERTICAL].type = WindowWidgetType::Button; - widgets[WIDX_GRAPH_LATERAL].type = WindowWidgetType::Button; + widgets[WIDX_GRAPH_VERTICAL].type = WidgetType::button; + widgets[WIDX_GRAPH_LATERAL].type = WidgetType::button; } else { - widgets[WIDX_GRAPH_VERTICAL].type = WindowWidgetType::Empty; - widgets[WIDX_GRAPH_LATERAL].type = WindowWidgetType::Empty; + widgets[WIDX_GRAPH_VERTICAL].type = WidgetType::empty; + widgets[WIDX_GRAPH_LATERAL].type = WidgetType::empty; } // Anchor graph widget @@ -6559,7 +6559,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_PRIMARY_PRICE_LABEL].text = STR_RIDE_INCOME_ADMISSION_PRICE; widgets[WIDX_SECONDARY_PRICE_LABEL].text = STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO; - widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Empty; + widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WidgetType::empty; widgets[WIDX_PRIMARY_PRICE].text = STR_BOTTOM_TOOLBAR_CASH; auto ridePrimaryPrice = RideGetPrice(*ride); @@ -6571,7 +6571,7 @@ namespace OpenRCT2::Ui::Windows ShopItem primaryItem = ShopItem::Admission; if (rtd.specialType == RtdSpecialType::toilet || ((primaryItem = rideEntry->shop_item[0]) != ShopItem::None)) { - widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Checkbox; + widgets[WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK].type = WidgetType::checkbox; if (ShopItemHasCommonPrice(primaryItem)) pressed_widgets |= (1uLL << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); @@ -6592,11 +6592,11 @@ namespace OpenRCT2::Ui::Windows if (secondaryItem == ShopItem::None) { // Hide secondary item widgets - widgets[WIDX_SECONDARY_PRICE_LABEL].type = WindowWidgetType::Empty; - widgets[WIDX_SECONDARY_PRICE].type = WindowWidgetType::Empty; - widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WindowWidgetType::Empty; - widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WindowWidgetType::Empty; - widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Empty; + widgets[WIDX_SECONDARY_PRICE_LABEL].type = WidgetType::empty; + widgets[WIDX_SECONDARY_PRICE].type = WidgetType::empty; + widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WidgetType::empty; + widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WidgetType::empty; + widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WidgetType::empty; } else { @@ -6606,11 +6606,11 @@ namespace OpenRCT2::Ui::Windows pressed_widgets |= (1uLL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK); // Show widgets - widgets[WIDX_SECONDARY_PRICE_LABEL].type = WindowWidgetType::Label; - widgets[WIDX_SECONDARY_PRICE].type = WindowWidgetType::Spinner; - widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WindowWidgetType::Button; - widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WindowWidgetType::Button; - widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WindowWidgetType::Checkbox; + widgets[WIDX_SECONDARY_PRICE_LABEL].type = WidgetType::label; + widgets[WIDX_SECONDARY_PRICE].type = WidgetType::spinner; + widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WidgetType::button; + widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WidgetType::button; + widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WidgetType::checkbox; // Set secondary item price widgets[WIDX_SECONDARY_PRICE].text = STR_RIDE_SECONDARY_PRICE_VALUE; @@ -6807,16 +6807,16 @@ namespace OpenRCT2::Ui::Windows auto ft = Formatter::Common(); ride->formatNameTo(ft); - widgets[WIDX_SHOW_GUESTS_THOUGHTS].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SHOW_GUESTS_THOUGHTS].type = WidgetType::flatBtn; if (ride->getRideTypeDescriptor().HasFlag(RtdFlag::isShopOrFacility)) { - widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WindowWidgetType::Empty; - widgets[WIDX_SHOW_GUESTS_QUEUING].type = WindowWidgetType::Empty; + widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WidgetType::empty; + widgets[WIDX_SHOW_GUESTS_QUEUING].type = WidgetType::empty; } else { - widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WindowWidgetType::FlatBtn; - widgets[WIDX_SHOW_GUESTS_QUEUING].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SHOW_GUESTS_ON_RIDE].type = WidgetType::flatBtn; + widgets[WIDX_SHOW_GUESTS_QUEUING].type = WidgetType::flatBtn; } WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_10); diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index c5d949012d..75bdafd56c 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -146,43 +146,43 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kRideConstructionWidgets = makeWidgets( makeWindowShim(kWindowTitle, WW, WH), - makeWidget ({ 3, 17}, { GW, 57}, WindowWidgetType::Groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_DIRECTION ), - makeWidget ({ 3, 76}, { GW, 41}, WindowWidgetType::Groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_SLOPE ), - makeWidget ({ 3, 120}, { GW, 41}, WindowWidgetType::Groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_ROLL_BANKING ), - makeWidget ({ 6, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL), STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP ), - makeWidget ({ 28, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_ICON_MEDIUM_CURVE_LEFT), STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP ), - makeWidget ({ 50, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE), STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP ), - makeWidget ({ 72, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE), STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP ), - makeWidget ({ 94, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_STRAIGHT), STR_RIDE_CONSTRUCTION_STRAIGHT_TIP ), - makeWidget ({116, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP ), - makeWidget ({138, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP ), - makeWidget ({160, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_ICON_MEDIUM_CURVE_RIGHT), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP ), - makeWidget ({182, 29}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP ), - makeWidget ({ 6, 55}, { GW - 6, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_YELLOW_STRING, STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP), - makeWidget ({ 6, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_VERTICAL_DROP), STR_RIDE_CONSTRUCTION_VERTICAL_DROP_TIP ), - makeWidget ({ 30, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP), STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP ), - makeWidget ({ 54, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN), STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP ), - makeWidget ({ 78, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL), STR_RIDE_CONSTRUCTION_LEVEL_TIP ), - makeWidget ({102, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP ), - makeWidget ({126, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP), STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP ), - makeWidget ({150, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_VERTICAL_RISE), STR_RIDE_CONSTRUCTION_VERTICAL_RISE_TIP ), - makeWidget ({178, 88}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_CHAIN_LIFT), STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP ), - makeWidget ({ 69, 132}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_BANK), STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP ), - makeWidget ({ 93, 132}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_NO_BANK), STR_RIDE_CONSTRUCTION_NO_ROLL_TIP ), - makeWidget ({117, 132}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_BANK), STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP ), - makeWidget ({ 3, 164}, { GW, 170}, WindowWidgetType::ImgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP), - makeWidget ({ 82, 338}, { 46, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH_CURRENT_SECTION), STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP), - makeWidget ({ 52, 338}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PREVIOUS), STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP ), - makeWidget ({134, 338}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_NEXT), STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP ), - makeWidget ({ 3, 362}, { GW, 28}, WindowWidgetType::Groupbox, WindowColour::primary ), - makeWidget ({ 31, 372}, { 70, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), - makeWidget ({109, 372}, { 70, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), - makeWidget ({ 94, 338}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), - makeWidget ({ 41, 132}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK), STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP ), - makeWidget ({144, 132}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK), STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP ), - makeWidget ({118, 120}, { 89, 41}, WindowWidgetType::Groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_SEAT_ROT ), - makeSpinnerWidgets({123, 138}, { 58, 12}, WindowWidgetType::Spinner, WindowColour::secondary, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP), - makeWidget ({161, 338}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_SIMULATE), STR_SIMULATE_RIDE_TIP ) + makeWidget ({ 3, 17}, { GW, 57}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_DIRECTION ), + makeWidget ({ 3, 76}, { GW, 41}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_SLOPE ), + makeWidget ({ 3, 120}, { GW, 41}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_ROLL_BANKING ), + makeWidget ({ 6, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL), STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP ), + makeWidget ({ 28, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_ICON_MEDIUM_CURVE_LEFT), STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP ), + makeWidget ({ 50, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE), STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP ), + makeWidget ({ 72, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE), STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP ), + makeWidget ({ 94, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_STRAIGHT), STR_RIDE_CONSTRUCTION_STRAIGHT_TIP ), + makeWidget ({116, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP ), + makeWidget ({138, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP ), + makeWidget ({160, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_ICON_MEDIUM_CURVE_RIGHT), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP ), + makeWidget ({182, 29}, { 22, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP ), + makeWidget ({ 6, 55}, { GW - 6, 14}, WidgetType::button, WindowColour::secondary, STR_YELLOW_STRING, STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP), + makeWidget ({ 6, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_VERTICAL_DROP), STR_RIDE_CONSTRUCTION_VERTICAL_DROP_TIP ), + makeWidget ({ 30, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP), STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP ), + makeWidget ({ 54, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN), STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP ), + makeWidget ({ 78, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL), STR_RIDE_CONSTRUCTION_LEVEL_TIP ), + makeWidget ({102, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP ), + makeWidget ({126, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP), STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP ), + makeWidget ({150, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_VERTICAL_RISE), STR_RIDE_CONSTRUCTION_VERTICAL_RISE_TIP ), + makeWidget ({178, 88}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_CHAIN_LIFT), STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP ), + makeWidget ({ 69, 132}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_BANK), STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP ), + makeWidget ({ 93, 132}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_NO_BANK), STR_RIDE_CONSTRUCTION_NO_ROLL_TIP ), + makeWidget ({117, 132}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_BANK), STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP ), + makeWidget ({ 3, 164}, { GW, 170}, WidgetType::imgBtn, WindowColour::secondary, 0xFFFFFFFF, STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP), + makeWidget ({ 82, 338}, { 46, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH_CURRENT_SECTION), STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP), + makeWidget ({ 52, 338}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PREVIOUS), STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP ), + makeWidget ({134, 338}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_NEXT), STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP ), + makeWidget ({ 3, 362}, { GW, 28}, WidgetType::groupbox, WindowColour::primary ), + makeWidget ({ 31, 372}, { 70, 12}, WidgetType::button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), + makeWidget ({109, 372}, { 70, 12}, WidgetType::button, WindowColour::secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), + makeWidget ({ 94, 338}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), + makeWidget ({ 41, 132}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK), STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP ), + makeWidget ({144, 132}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK), STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP ), + makeWidget ({118, 120}, { 89, 41}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_SEAT_ROT ), + makeSpinnerWidgets({123, 138}, { 58, 12}, WidgetType::spinner, WindowColour::secondary, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP), + makeWidget ({161, 338}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_SIMULATE), STR_SIMULATE_RIDE_TIP ) ); // clang-format on @@ -1579,10 +1579,10 @@ namespace OpenRCT2::Ui::Windows // Simulate button auto& simulateWidget = widgets[WIDX_SIMULATE]; - simulateWidget.type = WindowWidgetType::Empty; + simulateWidget.type = WidgetType::empty; if (currentRide->supportsStatus(RideStatus::simulating)) { - simulateWidget.type = WindowWidgetType::FlatBtn; + simulateWidget.type = WidgetType::flatBtn; if (currentRide->status == RideStatus::simulating) { pressed_widgets |= (1uLL << WIDX_SIMULATE); @@ -1599,8 +1599,8 @@ namespace OpenRCT2::Ui::Windows static void OnDrawUpdateCoveredPieces(const TrackDrawerDescriptor& trackDrawerDescriptor, std::span widgets) { - widgets[WIDX_U_TRACK].type = WindowWidgetType::Empty; - widgets[WIDX_O_TRACK].type = WindowWidgetType::Empty; + widgets[WIDX_U_TRACK].type = WidgetType::empty; + widgets[WIDX_O_TRACK].type = WidgetType::empty; if (!trackDrawerDescriptor.HasCoveredPieces()) return; @@ -1617,8 +1617,8 @@ namespace OpenRCT2::Ui::Windows return; widgets[WIDX_BANKING_GROUPBOX].text = STR_RIDE_CONSTRUCTION_TRACK_STYLE; - widgets[WIDX_U_TRACK].type = WindowWidgetType::FlatBtn; - widgets[WIDX_O_TRACK].type = WindowWidgetType::FlatBtn; + widgets[WIDX_U_TRACK].type = WidgetType::flatBtn; + widgets[WIDX_O_TRACK].type = WidgetType::flatBtn; widgets[WIDX_U_TRACK].image = ImageId(trackDrawerDescriptor.Regular.icon); widgets[WIDX_O_TRACK].image = ImageId(trackDrawerDescriptor.Covered.icon); @@ -1635,7 +1635,7 @@ namespace OpenRCT2::Ui::Windows DrawWidgets(rt); widget = &widgets[WIDX_CONSTRUCT]; - if (widget->type == WindowWidgetType::Empty) + if (widget->type == WidgetType::empty) return; RideId rideIndex; @@ -1685,96 +1685,96 @@ namespace OpenRCT2::Ui::Windows | (1u << WIDX_PREVIOUS_SECTION); if (rtd.HasFlag(RtdFlag::isShopOrFacility) || !currentRide->hasStation()) { - widgets[WIDX_ENTRANCE_EXIT_GROUPBOX].type = WindowWidgetType::Empty; - widgets[WIDX_ENTRANCE].type = WindowWidgetType::Empty; - widgets[WIDX_EXIT].type = WindowWidgetType::Empty; + widgets[WIDX_ENTRANCE_EXIT_GROUPBOX].type = WidgetType::empty; + widgets[WIDX_ENTRANCE].type = WidgetType::empty; + widgets[WIDX_EXIT].type = WidgetType::empty; } else { - widgets[WIDX_ENTRANCE_EXIT_GROUPBOX].type = WindowWidgetType::Groupbox; - widgets[WIDX_ENTRANCE].type = WindowWidgetType::Button; - widgets[WIDX_EXIT].type = WindowWidgetType::Button; + widgets[WIDX_ENTRANCE_EXIT_GROUPBOX].type = WidgetType::groupbox; + widgets[WIDX_ENTRANCE].type = WidgetType::button; + widgets[WIDX_EXIT].type = WidgetType::button; } if (_specialElementDropdownState.HasActiveElements) { - widgets[WIDX_SPECIAL_TRACK_DROPDOWN].type = WindowWidgetType::Button; + widgets[WIDX_SPECIAL_TRACK_DROPDOWN].type = WidgetType::button; } else { - widgets[WIDX_SPECIAL_TRACK_DROPDOWN].type = WindowWidgetType::Empty; + widgets[WIDX_SPECIAL_TRACK_DROPDOWN].type = WidgetType::empty; } if (IsTrackEnabled(TrackGroup::straight)) { - widgets[WIDX_STRAIGHT].type = WindowWidgetType::FlatBtn; + widgets[WIDX_STRAIGHT].type = WidgetType::flatBtn; } else { - widgets[WIDX_STRAIGHT].type = WindowWidgetType::Empty; + widgets[WIDX_STRAIGHT].type = WidgetType::empty; } if (IsTrackEnabled(TrackGroup::curveLarge)) { - widgets[WIDX_LEFT_CURVE_LARGE].type = WindowWidgetType::FlatBtn; - widgets[WIDX_RIGHT_CURVE_LARGE].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEFT_CURVE_LARGE].type = WidgetType::flatBtn; + widgets[WIDX_RIGHT_CURVE_LARGE].type = WidgetType::flatBtn; } else { - widgets[WIDX_LEFT_CURVE_LARGE].type = WindowWidgetType::Empty; - widgets[WIDX_RIGHT_CURVE_LARGE].type = WindowWidgetType::Empty; + widgets[WIDX_LEFT_CURVE_LARGE].type = WidgetType::empty; + widgets[WIDX_RIGHT_CURVE_LARGE].type = WidgetType::empty; } - widgets[WIDX_LEFT_CURVE].type = WindowWidgetType::Empty; - widgets[WIDX_RIGHT_CURVE].type = WindowWidgetType::Empty; - widgets[WIDX_LEFT_CURVE_SMALL].type = WindowWidgetType::Empty; - widgets[WIDX_RIGHT_CURVE_SMALL].type = WindowWidgetType::Empty; - widgets[WIDX_LEFT_CURVE_VERY_SMALL].type = WindowWidgetType::Empty; - widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type = WindowWidgetType::Empty; + widgets[WIDX_LEFT_CURVE].type = WidgetType::empty; + widgets[WIDX_RIGHT_CURVE].type = WidgetType::empty; + widgets[WIDX_LEFT_CURVE_SMALL].type = WidgetType::empty; + widgets[WIDX_RIGHT_CURVE_SMALL].type = WidgetType::empty; + widgets[WIDX_LEFT_CURVE_VERY_SMALL].type = WidgetType::empty; + widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type = WidgetType::empty; if (IsTrackEnabled(TrackGroup::curveVertical)) { - widgets[WIDX_LEFT_CURVE_SMALL].type = WindowWidgetType::FlatBtn; - widgets[WIDX_RIGHT_CURVE_SMALL].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEFT_CURVE_SMALL].type = WidgetType::flatBtn; + widgets[WIDX_RIGHT_CURVE_SMALL].type = WidgetType::flatBtn; } if (IsTrackEnabled(TrackGroup::curve)) { - widgets[WIDX_LEFT_CURVE].type = WindowWidgetType::FlatBtn; - widgets[WIDX_RIGHT_CURVE].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEFT_CURVE].type = WidgetType::flatBtn; + widgets[WIDX_RIGHT_CURVE].type = WidgetType::flatBtn; } if (IsTrackEnabled(TrackGroup::curveSmall)) { - widgets[WIDX_LEFT_CURVE_SMALL].type = WindowWidgetType::FlatBtn; - widgets[WIDX_RIGHT_CURVE_SMALL].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEFT_CURVE_SMALL].type = WidgetType::flatBtn; + widgets[WIDX_RIGHT_CURVE_SMALL].type = WidgetType::flatBtn; } if (IsTrackEnabled(TrackGroup::curveVerySmall)) { - widgets[WIDX_LEFT_CURVE_VERY_SMALL].type = WindowWidgetType::FlatBtn; - widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEFT_CURVE_VERY_SMALL].type = WidgetType::flatBtn; + widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type = WidgetType::flatBtn; } - widgets[WIDX_SLOPE_DOWN_STEEP].type = WindowWidgetType::Empty; - widgets[WIDX_SLOPE_DOWN].type = WindowWidgetType::Empty; - widgets[WIDX_LEVEL].type = WindowWidgetType::Empty; - widgets[WIDX_SLOPE_UP].type = WindowWidgetType::Empty; - widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::Empty; + widgets[WIDX_SLOPE_DOWN_STEEP].type = WidgetType::empty; + widgets[WIDX_SLOPE_DOWN].type = WidgetType::empty; + widgets[WIDX_LEVEL].type = WidgetType::empty; + widgets[WIDX_SLOPE_UP].type = WidgetType::empty; + widgets[WIDX_SLOPE_UP_STEEP].type = WidgetType::empty; widgets[WIDX_SLOPE_DOWN_STEEP].image = ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP); widgets[WIDX_SLOPE_DOWN_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP; widgets[WIDX_SLOPE_UP_STEEP].image = ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP); widgets[WIDX_SLOPE_UP_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP; if (trackDrawerDescriptor.Regular.SupportsTrackGroup(TrackGroup::reverseFreefall)) { - widgets[WIDX_LEVEL].type = WindowWidgetType::FlatBtn; - widgets[WIDX_SLOPE_UP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEVEL].type = WidgetType::flatBtn; + widgets[WIDX_SLOPE_UP].type = WidgetType::flatBtn; } if (IsTrackEnabled(TrackGroup::slope) || IsTrackEnabled(TrackGroup::slopeSteepDown) || IsTrackEnabled(TrackGroup::slopeSteepUp)) { - widgets[WIDX_LEVEL].type = WindowWidgetType::FlatBtn; + widgets[WIDX_LEVEL].type = WidgetType::flatBtn; } if (IsTrackEnabled(TrackGroup::slope)) { - widgets[WIDX_SLOPE_DOWN].type = WindowWidgetType::FlatBtn; - widgets[WIDX_SLOPE_UP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_DOWN].type = WidgetType::flatBtn; + widgets[WIDX_SLOPE_UP].type = WidgetType::flatBtn; } if ((IsTrackEnabled(TrackGroup::helixDownBankedHalf) || IsTrackEnabled(TrackGroup::helixUpBankedHalf)) && _currentTrackRollEnd != TrackRoll::None && _currentTrackPitchEnd == TrackPitch::None) @@ -1785,19 +1785,19 @@ namespace OpenRCT2::Ui::Windows if (hasHelixEquivalent) { // Enable helix - widgets[WIDX_SLOPE_DOWN_STEEP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_DOWN_STEEP].type = WidgetType::flatBtn; if (IsTrackEnabled(TrackGroup::helixUpBankedHalf)) - widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_UP_STEEP].type = WidgetType::flatBtn; } } if (IsTrackEnabled(TrackGroup::slopeSteepDown)) { - widgets[WIDX_SLOPE_DOWN_STEEP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_DOWN_STEEP].type = WidgetType::flatBtn; } if (IsTrackEnabled(TrackGroup::slopeSteepUp)) { - widgets[WIDX_SLOPE_UP_STEEP].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_UP_STEEP].type = WidgetType::flatBtn; } const auto& gameState = getGameState(); @@ -1812,11 +1812,11 @@ namespace OpenRCT2::Ui::Windows || (gameState.cheats.enableChainLiftOnAllTrack && currentRide->getRideTypeDescriptor().HasFlag(RtdFlag::hasTrack))) { - widgets[WIDX_CHAIN_LIFT].type = WindowWidgetType::FlatBtn; + widgets[WIDX_CHAIN_LIFT].type = WidgetType::flatBtn; } else { - widgets[WIDX_CHAIN_LIFT].type = WindowWidgetType::Empty; + widgets[WIDX_CHAIN_LIFT].type = WidgetType::empty; } int32_t x = kVerticalDropButtonStart; @@ -1826,18 +1826,18 @@ namespace OpenRCT2::Ui::Windows x += 24; } - widgets[WIDX_SLOPE_DOWN_VERTICAL].type = WindowWidgetType::Empty; - widgets[WIDX_SLOPE_UP_VERTICAL].type = WindowWidgetType::Empty; + widgets[WIDX_SLOPE_DOWN_VERTICAL].type = WidgetType::empty; + widgets[WIDX_SLOPE_UP_VERTICAL].type = WidgetType::empty; if (IsTrackEnabled(TrackGroup::slopeVertical) && !TrackPieceDirectionIsDiagonal(_currentTrackPieceDirection)) { if (_previousTrackPitchEnd == TrackPitch::Up60 || _previousTrackPitchEnd == TrackPitch::Up90) { - widgets[WIDX_SLOPE_UP_VERTICAL].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_UP_VERTICAL].type = WidgetType::flatBtn; } else if (_previousTrackPitchEnd == TrackPitch::Down60 || _previousTrackPitchEnd == TrackPitch::Down90) { - widgets[WIDX_SLOPE_DOWN_VERTICAL].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SLOPE_DOWN_VERTICAL].type = WidgetType::flatBtn; } } @@ -1920,11 +1920,11 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_BANK_RIGHT].right = 140; widgets[WIDX_BANK_RIGHT].top = top; widgets[WIDX_BANK_RIGHT].bottom = bottom; - widgets[WIDX_BANK_LEFT].type = WindowWidgetType::Empty; - widgets[WIDX_BANK_STRAIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_BANK_RIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_U_TRACK].type = WindowWidgetType::Empty; - widgets[WIDX_O_TRACK].type = WindowWidgetType::Empty; + widgets[WIDX_BANK_LEFT].type = WidgetType::empty; + widgets[WIDX_BANK_STRAIGHT].type = WidgetType::empty; + widgets[WIDX_BANK_RIGHT].type = WidgetType::empty; + widgets[WIDX_U_TRACK].type = WidgetType::empty; + widgets[WIDX_O_TRACK].type = WidgetType::empty; bool trackHasSpeedSetting = TrackTypeHasSpeedSetting(_selectedTrackType) || TrackTypeHasSpeedSetting(_currentlySelectedTrack.trackType); @@ -1942,9 +1942,9 @@ namespace OpenRCT2::Ui::Windows { if (IsTrackEnabled(TrackGroup::flatRollBanking)) { - widgets[WIDX_BANK_LEFT].type = WindowWidgetType::FlatBtn; - widgets[WIDX_BANK_STRAIGHT].type = WindowWidgetType::FlatBtn; - widgets[WIDX_BANK_RIGHT].type = WindowWidgetType::FlatBtn; + widgets[WIDX_BANK_LEFT].type = WidgetType::flatBtn; + widgets[WIDX_BANK_STRAIGHT].type = WidgetType::flatBtn; + widgets[WIDX_BANK_RIGHT].type = WidgetType::flatBtn; } OnDrawUpdateCoveredPieces(trackDrawerDescriptor, widgets); } @@ -1968,10 +1968,10 @@ namespace OpenRCT2::Ui::Windows _currentlyShowingBrakeOrBoosterSpeed = true; widgets[WIDX_SPEED_SETTING_SPINNER].text = STR_RIDE_CONSTRUCTION_BRAKE_SPEED_VELOCITY; - widgets[WIDX_SPEED_SETTING_SPINNER].type = WindowWidgetType::Spinner; - widgets[WIDX_SPEED_SETTING_SPINNER_UP].type = WindowWidgetType::Button; + widgets[WIDX_SPEED_SETTING_SPINNER].type = WidgetType::spinner; + widgets[WIDX_SPEED_SETTING_SPINNER_UP].type = WidgetType::button; widgets[WIDX_SPEED_SETTING_SPINNER_UP].text = STR_NUMERIC_UP; - widgets[WIDX_SPEED_SETTING_SPINNER_DOWN].type = WindowWidgetType::Button; + widgets[WIDX_SPEED_SETTING_SPINNER_DOWN].type = WidgetType::button; widgets[WIDX_SPEED_SETTING_SPINNER_DOWN].text = STR_NUMERIC_DOWN; auto spinnerStart = 124 + widgets[WIDX_TITLE].bottom; @@ -1984,19 +1984,19 @@ namespace OpenRCT2::Ui::Windows static constexpr int16_t bankingGroupboxRightWithSeatRotation = 114; widgets[WIDX_BANKING_GROUPBOX].right = bankingGroupboxRightNoSeatRotation; - widgets[WIDX_SEAT_ROTATION_GROUPBOX].type = WindowWidgetType::Empty; - widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER].type = WindowWidgetType::Empty; - widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP].type = WindowWidgetType::Empty; - widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN].type = WindowWidgetType::Empty; + widgets[WIDX_SEAT_ROTATION_GROUPBOX].type = WidgetType::empty; + widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER].type = WidgetType::empty; + widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP].type = WidgetType::empty; + widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN].type = WidgetType::empty; // Simplify this condition to "rideHasSeatRotation" for new track design format if ((rideHasSeatRotation && !trackHasSpeedSetting) || (rideHasSeatRotation && trackHasSpeedSetting && trackHasSpeedAndSeatRotation)) { - widgets[WIDX_SEAT_ROTATION_GROUPBOX].type = WindowWidgetType::Groupbox; - widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER].type = WindowWidgetType::Spinner; - widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP].type = WindowWidgetType::Button; - widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN].type = WindowWidgetType::Button; + widgets[WIDX_SEAT_ROTATION_GROUPBOX].type = WidgetType::groupbox; + widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER].type = WidgetType::spinner; + widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP].type = WidgetType::button; + widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN].type = WidgetType::button; widgets[WIDX_BANKING_GROUPBOX].right = bankingGroupboxRightWithSeatRotation; // squishes the track speed spinner slightly to make room for the seat rotation widgets @@ -2026,41 +2026,41 @@ namespace OpenRCT2::Ui::Windows | (1uLL << WIDX_DEMOLISH) | (1uLL << WIDX_PREVIOUS_SECTION) | (1uLL << WIDX_NEXT_SECTION) | (1uLL << WIDX_ENTRANCE_EXIT_GROUPBOX) | (1uLL << WIDX_ENTRANCE) | (1uLL << WIDX_EXIT)); - widgets[WIDX_CONSTRUCT].type = WindowWidgetType::Empty; - widgets[WIDX_DEMOLISH].type = WindowWidgetType::FlatBtn; - widgets[WIDX_ROTATE].type = WindowWidgetType::Empty; + widgets[WIDX_CONSTRUCT].type = WidgetType::empty; + widgets[WIDX_DEMOLISH].type = WidgetType::flatBtn; + widgets[WIDX_ROTATE].type = WidgetType::empty; if (rtd.HasFlag(RtdFlag::cannotHaveGaps)) { - widgets[WIDX_PREVIOUS_SECTION].type = WindowWidgetType::Empty; - widgets[WIDX_NEXT_SECTION].type = WindowWidgetType::Empty; + widgets[WIDX_PREVIOUS_SECTION].type = WidgetType::empty; + widgets[WIDX_NEXT_SECTION].type = WidgetType::empty; } else { - widgets[WIDX_PREVIOUS_SECTION].type = WindowWidgetType::FlatBtn; - widgets[WIDX_NEXT_SECTION].type = WindowWidgetType::FlatBtn; + widgets[WIDX_PREVIOUS_SECTION].type = WidgetType::flatBtn; + widgets[WIDX_NEXT_SECTION].type = WidgetType::flatBtn; } switch (_rideConstructionState) { case RideConstructionState::Front: - widgets[WIDX_CONSTRUCT].type = WindowWidgetType::ImgBtn; - widgets[WIDX_NEXT_SECTION].type = WindowWidgetType::Empty; + widgets[WIDX_CONSTRUCT].type = WidgetType::imgBtn; + widgets[WIDX_NEXT_SECTION].type = WidgetType::empty; break; case RideConstructionState::Back: - widgets[WIDX_CONSTRUCT].type = WindowWidgetType::ImgBtn; - widgets[WIDX_PREVIOUS_SECTION].type = WindowWidgetType::Empty; + widgets[WIDX_CONSTRUCT].type = WidgetType::imgBtn; + widgets[WIDX_PREVIOUS_SECTION].type = WidgetType::empty; break; case RideConstructionState::Place: - widgets[WIDX_CONSTRUCT].type = WindowWidgetType::ImgBtn; - widgets[WIDX_DEMOLISH].type = WindowWidgetType::Empty; - widgets[WIDX_NEXT_SECTION].type = WindowWidgetType::Empty; - widgets[WIDX_PREVIOUS_SECTION].type = WindowWidgetType::Empty; - widgets[WIDX_ROTATE].type = WindowWidgetType::FlatBtn; + widgets[WIDX_CONSTRUCT].type = WidgetType::imgBtn; + widgets[WIDX_DEMOLISH].type = WidgetType::empty; + widgets[WIDX_NEXT_SECTION].type = WidgetType::empty; + widgets[WIDX_PREVIOUS_SECTION].type = WidgetType::empty; + widgets[WIDX_ROTATE].type = WidgetType::flatBtn; break; case RideConstructionState::EntranceExit: - widgets[WIDX_DEMOLISH].type = WindowWidgetType::Empty; - widgets[WIDX_NEXT_SECTION].type = WindowWidgetType::Empty; - widgets[WIDX_PREVIOUS_SECTION].type = WindowWidgetType::Empty; + widgets[WIDX_DEMOLISH].type = WidgetType::empty; + widgets[WIDX_NEXT_SECTION].type = WidgetType::empty; + widgets[WIDX_PREVIOUS_SECTION].type = WidgetType::empty; break; default: pressed_widgets = pressedWidgets; @@ -3766,7 +3766,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -3778,20 +3778,19 @@ namespace OpenRCT2::Ui::Windows { case TrackCurve::LeftSmall: if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } break; case TrackCurve::Left: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3801,19 +3800,18 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftLarge: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3823,24 +3821,22 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::None: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3850,29 +3846,27 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightLarge: - if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3883,33 +3877,31 @@ namespace OpenRCT2::Ui::Windows break; case TrackCurve::Right: if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3919,39 +3911,37 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightSmall: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3962,44 +3952,41 @@ namespace OpenRCT2::Ui::Windows break; case TrackCurve::RightVerySmall: if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } - else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) - && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } @@ -4017,7 +4004,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -4029,20 +4016,20 @@ namespace OpenRCT2::Ui::Windows { case TrackCurve::RightSmall: if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } break; case TrackCurve::Right: if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4052,19 +4039,19 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightLarge: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4075,23 +4062,23 @@ namespace OpenRCT2::Ui::Windows break; case TrackCurve::None: if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4101,30 +4088,29 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftLarge: - if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4134,35 +4120,33 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::Left: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4172,40 +4156,38 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftSmall: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4215,45 +4197,42 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftVerySmall: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) - && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) - && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) - && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4271,28 +4250,28 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } - if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } - if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - if (!WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) && w->widgets[WIDX_CHAIN_LIFT].type != WindowWidgetType::Empty + if (!WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) && w->widgets[WIDX_CHAIN_LIFT].type != WidgetType::empty && _currentTrackHasLiftHill) { w->OnMouseDown(WIDX_CHAIN_LIFT); } - if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_STRAIGHT); } @@ -4302,7 +4281,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -4311,20 +4290,19 @@ namespace OpenRCT2::Ui::Windows { case TrackPitch::Down60: if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_VERTICAL) - && w->widgets[WIDX_SLOPE_DOWN_VERTICAL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_SLOPE_DOWN_VERTICAL].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_VERTICAL); } break; case TrackPitch::Down25: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) - && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } break; case TrackPitch::None: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } @@ -4333,8 +4311,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) - && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4344,17 +4321,16 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Up25: - if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) - && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4364,15 +4340,15 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Up60: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } - else if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } @@ -4381,8 +4357,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) - && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4393,7 +4368,7 @@ namespace OpenRCT2::Ui::Windows break; case TrackPitch::Up90: if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) - && w->widgets[WIDX_SLOPE_UP_VERTICAL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_SLOPE_UP_VERTICAL].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4407,7 +4382,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -4416,20 +4391,19 @@ namespace OpenRCT2::Ui::Windows { case TrackPitch::Up60: if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_UP_VERTICAL) - && w->widgets[WIDX_SLOPE_UP_VERTICAL].type != WindowWidgetType::Empty) + && w->widgets[WIDX_SLOPE_UP_VERTICAL].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_VERTICAL); } break; case TrackPitch::Up25: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) - && w->widgets[WIDX_SLOPE_UP_STEEP].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } break; case TrackPitch::None: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } @@ -4438,8 +4412,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) - && w->widgets[WIDX_SLOPE_UP_STEEP].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4449,17 +4422,16 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Down25: - if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) - && w->widgets[WIDX_SLOPE_UP_STEEP].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4469,15 +4441,15 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Down60: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } - else if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } @@ -4486,8 +4458,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) - && w->widgets[WIDX_SLOPE_UP_STEEP].type != WindowWidgetType::Empty) + !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4498,7 +4469,7 @@ namespace OpenRCT2::Ui::Windows break; case TrackPitch::Down90: if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) - && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WindowWidgetType::Empty) + && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4512,8 +4483,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) - || w->widgets[WIDX_CHAIN_LIFT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) || w->widgets[WIDX_CHAIN_LIFT].type == WidgetType::empty) { return; } @@ -4526,7 +4496,7 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); if (w == nullptr || WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) - || w->widgets[WIDX_BANK_STRAIGHT].type == WindowWidgetType::Empty) + || w->widgets[WIDX_BANK_STRAIGHT].type == WidgetType::empty) { return; } @@ -4534,17 +4504,17 @@ namespace OpenRCT2::Ui::Windows switch (_currentTrackRollEnd) { case TrackRoll::None: - if (!WidgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_LEFT); } break; case TrackRoll::Right: - if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_STRAIGHT); } - else if (!WidgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_LEFT); } @@ -4563,7 +4533,7 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); if (w == nullptr || WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) - || w->widgets[WIDX_BANK_STRAIGHT].type == WindowWidgetType::Empty) + || w->widgets[WIDX_BANK_STRAIGHT].type == WidgetType::empty) { return; } @@ -4571,17 +4541,17 @@ namespace OpenRCT2::Ui::Windows switch (_currentTrackRollEnd) { case TrackRoll::None: - if (!WidgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_RIGHT); } break; case TrackRoll::Left: - if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WindowWidgetType::Empty) + if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_STRAIGHT); } - else if (!WidgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WindowWidgetType::Empty) + else if (!WidgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_RIGHT); } @@ -4600,7 +4570,7 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); if (w == nullptr || WidgetIsDisabled(*w, WIDX_PREVIOUS_SECTION) - || w->widgets[WIDX_PREVIOUS_SECTION].type == WindowWidgetType::Empty) + || w->widgets[WIDX_PREVIOUS_SECTION].type == WidgetType::empty) { return; } @@ -4612,8 +4582,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_NEXT_SECTION) - || w->widgets[WIDX_NEXT_SECTION].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_NEXT_SECTION) || w->widgets[WIDX_NEXT_SECTION].type == WidgetType::empty) { return; } @@ -4625,7 +4594,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WidgetType::empty) { return; } @@ -4637,7 +4606,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WindowWidgetType::Empty) + if (w == nullptr || WidgetIsDisabled(*w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WidgetType::empty) { return; } diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 0bd3e7bf9a..f552bae988 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -66,18 +66,18 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _rideListWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {340, 197}, WindowWidgetType::Resize, WindowColour::secondary ), // tab page background - makeWidget({315, 60}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_TOGGLE_OPEN_CLOSE), STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle - makeWidget({150, 46}, {124, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // current information type - makeWidget({262, 47}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP), // information type dropdown button - makeWidget({280, 46}, { 54, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_SORT, STR_RIDE_LIST_SORT_TIP ), // sort button + makeWidget({ 0, 43}, {340, 197}, WidgetType::resize, WindowColour::secondary ), // tab page background + makeWidget({315, 60}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_TOGGLE_OPEN_CLOSE), STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle + makeWidget({150, 46}, {124, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // current information type + makeWidget({262, 47}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP), // information type dropdown button + makeWidget({280, 46}, { 54, 12}, WidgetType::button, WindowColour::secondary, STR_SORT, STR_RIDE_LIST_SORT_TIP ), // sort button makeTab ({ 3, 17}, STR_LIST_RIDES_TIP ), // tab 1 makeTab ({ 34, 17}, STR_LIST_SHOPS_AND_STALLS_TIP ), // tab 2 makeTab ({ 65, 17}, STR_LIST_KIOSKS_AND_FACILITIES_TIP), // tab 3 - makeWidget({ 3, 60}, {334, 177}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), // list - makeWidget({320, 62}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_CLOSE_BUTTON_0) ), - makeWidget({320, 76}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_OPEN_BUTTON_0) ), - makeWidget({315, 90}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_QUICK_DEMOLISH_RIDE ) + makeWidget({ 3, 60}, {334, 177}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), // list + makeWidget({320, 62}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_CLOSE_BUTTON_0) ), + makeWidget({320, 76}, { 14, 14}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_G2_RCT1_OPEN_BUTTON_0) ), + makeWidget({315, 90}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_QUICK_DEMOLISH_RIDE ) ); // clang-format on @@ -481,9 +481,9 @@ namespace OpenRCT2::Ui::Windows if (ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE) { - widgets[WIDX_OPEN_CLOSE_ALL].type = WindowWidgetType::Empty; - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::ImgBtn; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::ImgBtn; + widgets[WIDX_OPEN_CLOSE_ALL].type = WidgetType::empty; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::imgBtn; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::imgBtn; const auto& rideManager = GetRideManager(); auto allClosed = true; @@ -509,14 +509,14 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_OPEN_CLOSE_ALL].type = WindowWidgetType::FlatBtn; - widgets[WIDX_CLOSE_LIGHT].type = WindowWidgetType::Empty; - widgets[WIDX_OPEN_LIGHT].type = WindowWidgetType::Empty; + widgets[WIDX_OPEN_CLOSE_ALL].type = WidgetType::flatBtn; + widgets[WIDX_CLOSE_LIGHT].type = WidgetType::empty; + widgets[WIDX_OPEN_LIGHT].type = WidgetType::empty; widgets[WIDX_QUICK_DEMOLISH].top = widgets[WIDX_OPEN_CLOSE_ALL].bottom + 3; } widgets[WIDX_QUICK_DEMOLISH].bottom = widgets[WIDX_QUICK_DEMOLISH].top + 23; - widgets[WIDX_QUICK_DEMOLISH].type = NetworkGetMode() != NETWORK_MODE_CLIENT ? WindowWidgetType::FlatBtn - : WindowWidgetType::Empty; + widgets[WIDX_QUICK_DEMOLISH].type = NetworkGetMode() != NETWORK_MODE_CLIENT ? WidgetType::flatBtn + : WidgetType::empty; } /** diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 6df910d7e2..6884bd40b1 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -42,10 +42,10 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _savePromptWidgets = makeWidgets( makeWindowShim(kStringIdNone, WW_SAVE, WH_SAVE), - makeWidget({ 2, 19}, {256, 12}, WindowWidgetType::LabelCentred, WindowColour::primary, kStringIdEmpty ), // question/label - makeWidget({ 8, 35}, { 78, 14}, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_SAVE ), // save - makeWidget({ 91, 35}, { 78, 14}, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_DONT_SAVE), // don't save - makeWidget({174, 35}, { 78, 14}, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL ) // cancel + makeWidget({ 2, 19}, {256, 12}, WidgetType::labelCentred, WindowColour::primary, kStringIdEmpty ), // question/label + makeWidget({ 8, 35}, { 78, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_SAVE ), // save + makeWidget({ 91, 35}, { 78, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_DONT_SAVE), // don't save + makeWidget({174, 35}, { 78, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL ) // cancel ); // clang-format on @@ -61,8 +61,8 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _quitPromptWidgets = makeWidgets( makeWindowShim(STR_QUIT_GAME_PROMPT_TITLE, WW_QUIT, WH_QUIT), - makeWidget({ 8, 19}, {78, 14}, WindowWidgetType::Button, WindowColour::primary, STR_OK ), // ok - makeWidget({91, 19}, {78, 14}, WindowWidgetType::Button, WindowColour::primary, STR_CANCEL) // cancel + makeWidget({ 8, 19}, {78, 14}, WidgetType::button, WindowColour::primary, STR_OK ), // ok + makeWidget({91, 19}, {78, 14}, WidgetType::button, WindowColour::primary, STR_CANCEL) // cancel ); // clang-format on diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index 25571785f5..6b4684e4c5 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -105,18 +105,18 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _scenarioSelectWidgets = makeWidgets( makeWindowShim(kWindowTitle, kWindowWidth, kWindowHeight), - makeWidget({ kTabWidth + 1, kWidgetsStart }, { kWindowWidth, 284 }, WindowWidgetType::Resize, WindowColour::secondary), // tab content panel - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 0) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 01 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 1) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 02 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 2) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 03 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 3) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 04 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 4) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 05 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 5) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 06 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 6) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 07 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 7) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 08 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 8) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 09 - makeRemapWidget({ 3, kTabsStart + (kTabHeight * 8) }, { kTabWidth, kTabHeight}, WindowWidgetType::Tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 10 - makeWidget({ kTabWidth + 3, kWidgetsStart + 1 }, { kWindowWidth - kPreviewPaneWidthRegular, 362 }, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL) // level list + makeWidget({ kTabWidth + 1, kWidgetsStart }, { kWindowWidth, 284 }, WidgetType::resize, WindowColour::secondary), // tab content panel + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 0) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 01 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 1) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 02 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 2) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 03 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 3) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 04 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 4) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 05 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 5) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 06 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 6) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 07 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 7) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 08 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 8) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 09 + makeRemapWidget({ 3, kTabsStart + (kTabHeight * 8) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 10 + makeWidget({ kTabWidth + 3, kWidgetsStart + 1 }, { kWindowWidth - kPreviewPaneWidthRegular, 362 }, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL) // level list ); // clang-format on @@ -314,7 +314,7 @@ namespace OpenRCT2::Ui::Windows for (uint32_t i = 0; i < std::size(kScenarioOriginStringIds); i++) { const Widget& widget = widgets[WIDX_TAB1 + i]; - if (widget.type == WindowWidgetType::Empty) + if (widget.type == WidgetType::empty) continue; auto ft = Formatter(); @@ -884,11 +884,11 @@ namespace OpenRCT2::Ui::Windows auto& widget = widgets[i + WIDX_TAB1]; if (!(showPages & (1 << i))) { - widget.type = WindowWidgetType::Empty; + widget.type = WidgetType::empty; continue; } - widget.type = WindowWidgetType::Tab; + widget.type = WidgetType::tab; widget.top = y; widget.bottom = y + (kTabHeight - 1); y += kTabHeight; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 177b286d80..6b7545310e 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -111,18 +111,18 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowSceneryBaseWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WINDOW_SCENERY_MIN_WIDTH, WINDOW_SCENERY_MIN_HEIGHT), - makeWidget ({ 0, 43}, {634, 99}, WindowWidgetType::Resize, WindowColour::secondary ), // 8 0x009DE2C8 - makeWidget ({ 2, 62}, {607, 80}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), // 1000000 0x009DE418 - makeWidget ({609, 59}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428 - makeWidget ({609, 83}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_SCENERY_PAINTBRUSH_TIP ), // 4000000 0x009DE438 - makeWidget ({615, 108}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_COLOUR ), // 8000000 0x009DE448 - makeWidget ({615, 120}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR), // 10000000 0x009DE458 - makeWidget ({615, 132}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_TERTIARY_COLOUR ), // 20000000 0x009DE468 - makeWidget ({609, 145}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_EYEDROPPER), STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478 - makeWidget ({609, 169}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_SCENERY_CLUSTER), STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478 - makeWidget ({ 4, 46}, {211, 14}, WindowWidgetType::TextBox, WindowColour::secondary ), - makeWidget ({218, 46}, { 70, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_OBJECT_SEARCH_CLEAR ), - makeWidget ({539, 46}, { 70, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_RESTRICT_SCENERY, STR_RESTRICT_SCENERY_TIP ) + makeWidget ({ 0, 43}, {634, 99}, WidgetType::resize, WindowColour::secondary ), // 8 0x009DE2C8 + makeWidget ({ 2, 62}, {607, 80}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), // 1000000 0x009DE418 + makeWidget ({609, 59}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428 + makeWidget ({609, 83}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_SCENERY_PAINTBRUSH_TIP ), // 4000000 0x009DE438 + makeWidget ({615, 108}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_COLOUR ), // 8000000 0x009DE448 + makeWidget ({615, 120}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR), // 10000000 0x009DE458 + makeWidget ({615, 132}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SELECT_TERTIARY_COLOUR ), // 20000000 0x009DE468 + makeWidget ({609, 145}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_EYEDROPPER), STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478 + makeWidget ({609, 169}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_SCENERY_CLUSTER), STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478 + makeWidget ({ 4, 46}, {211, 14}, WidgetType::textBox, WindowColour::secondary ), + makeWidget ({218, 46}, { 70, 14}, WidgetType::button, WindowColour::secondary, STR_OBJECT_SEARCH_CLEAR ), + makeWidget ({539, 46}, { 70, 14}, WidgetType::button, WindowColour::secondary, STR_RESTRICT_SCENERY, STR_RESTRICT_SCENERY_TIP ) ); // clang-format on @@ -689,32 +689,32 @@ namespace OpenRCT2::Ui::Windows if (gWindowSceneryScatterEnabled) pressed_widgets |= (1uLL << WIDX_SCENERY_BUILD_CLUSTER_BUTTON); - widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_RESTRICT_SCENERY].type = WindowWidgetType::Empty; + widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WidgetType::empty; + widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].type = WidgetType::empty; + widgets[WIDX_RESTRICT_SCENERY].type = WidgetType::empty; const auto tabSelectedScenery = GetSelectedScenery(tabIndex); if (!tabSelectedScenery.IsUndefined()) { if (tabSelectedScenery.SceneryType == SCENERY_TYPE_SMALL) { - widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].type = WidgetType::flatBtn; auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry( tabSelectedScenery.EntryIndex); if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ROTATABLE)) { - widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WidgetType::flatBtn; } } else if (tabSelectedScenery.SceneryType >= SCENERY_TYPE_LARGE) { - widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WindowWidgetType::FlatBtn; + widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WidgetType::flatBtn; } if (gLegacyScene == LegacyScene::scenarioEditor || getGameState().cheats.sandboxMode) { - widgets[WIDX_RESTRICT_SCENERY].type = WindowWidgetType::Button; + widgets[WIDX_RESTRICT_SCENERY].type = WidgetType::button; if (IsSceneryItemRestricted(tabSelectedScenery)) pressed_widgets |= (1uLL << WIDX_RESTRICT_SCENERY); else @@ -726,15 +726,15 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].image = GetColourButtonImage(_scenerySecondaryColour); widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].image = GetColourButtonImage(_sceneryTertiaryColour); - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::empty; + widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WidgetType::empty; + widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WidgetType::empty; if (_sceneryPaintEnabled) { // repaint coloured scenery tool is on - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; - widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; - widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::colourBtn; + widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WidgetType::colourBtn; + widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WidgetType::colourBtn; } else if (!tabSelectedScenery.IsUndefined()) { @@ -744,7 +744,7 @@ namespace OpenRCT2::Ui::Windows tabSelectedScenery.EntryIndex); if (bannerEntry->flags & BANNER_ENTRY_FLAG_HAS_PRIMARY_COLOUR) { - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::colourBtn; } } else if (tabSelectedScenery.SceneryType == SCENERY_TYPE_LARGE) @@ -754,28 +754,28 @@ namespace OpenRCT2::Ui::Windows if (sceneryEntry->flags & LARGE_SCENERY_FLAG_HAS_PRIMARY_COLOUR && !(sceneryEntry->flags & LARGE_SCENERY_FLAG_HIDE_PRIMARY_REMAP_BUTTON)) - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::colourBtn; if (sceneryEntry->flags & LARGE_SCENERY_FLAG_HAS_SECONDARY_COLOUR && !(sceneryEntry->flags & LARGE_SCENERY_FLAG_HIDE_SECONDARY_REMAP_BUTTON)) - widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WidgetType::colourBtn; if (sceneryEntry->flags & LARGE_SCENERY_FLAG_HAS_TERTIARY_COLOUR) - widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WidgetType::colourBtn; } else if (tabSelectedScenery.SceneryType == SCENERY_TYPE_WALL) { auto* wallEntry = OpenRCT2::ObjectManager::GetObjectEntry(tabSelectedScenery.EntryIndex); if (wallEntry->flags & (WALL_SCENERY_HAS_PRIMARY_COLOUR | WALL_SCENERY_HAS_GLASS)) { - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::colourBtn; if (wallEntry->flags & WALL_SCENERY_HAS_SECONDARY_COLOUR) { - widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WidgetType::colourBtn; if (wallEntry->flags2 & WALL_SCENERY_2_NO_SELECT_PRIMARY_COLOUR) - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::Empty; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::empty; if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) - widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WidgetType::colourBtn; } } } @@ -786,12 +786,12 @@ namespace OpenRCT2::Ui::Windows if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_HAS_PRIMARY_COLOUR | SMALL_SCENERY_FLAG_HAS_GLASS)) { - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::colourBtn; if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR)) - widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WidgetType::colourBtn; if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_HAS_TERTIARY_COLOUR)) - widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; + widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WidgetType::colourBtn; } } } @@ -844,8 +844,8 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].right = windowWidth - 8; const bool canFit = widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].top < height; - widgets[WIDX_SCENERY_EYEDROPPER_BUTTON].type = canFit ? WindowWidgetType::FlatBtn : WindowWidgetType::Empty; - widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].type = canFit ? WindowWidgetType::FlatBtn : WindowWidgetType::Empty; + widgets[WIDX_SCENERY_EYEDROPPER_BUTTON].type = canFit ? WidgetType::flatBtn : WidgetType::empty; + widgets[WIDX_SCENERY_BUILD_CLUSTER_BUTTON].type = canFit ? WidgetType::flatBtn : WidgetType::empty; } void OnDraw(RenderTarget& rt) override diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index e211dc7ea6..5742f1f890 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -41,14 +41,14 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _sceneryScatterWidgets = makeWidgets( makeWindowShim(STR_SCENERY_SCATTER, 86, 100), - makeWidget ({20, 17}, {44, 32}, WindowWidgetType::ImgBtn, WindowColour::secondary, ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box - makeRemapWidget({21, 18}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size - makeRemapWidget({47, 32}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size + makeWidget ({20, 17}, {44, 32}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box + makeRemapWidget({21, 18}, {16, 16}, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size + makeRemapWidget({47, 32}, {16, 16}, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size - makeWidget ({ 3, 55}, {80, 42}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_SCATTER_TOOL_DENSITY ), - makeRemapWidget({ 7, 68}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW ), // low amount - makeRemapWidget({31, 68}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM), // medium amount - makeRemapWidget({55, 68}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH ) // high amount + makeWidget ({ 3, 55}, {80, 42}, WidgetType::groupbox, WindowColour::secondary, STR_SCATTER_TOOL_DENSITY ), + makeRemapWidget({ 7, 68}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW ), // low amount + makeRemapWidget({31, 68}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM), // medium amount + makeRemapWidget({55, 68}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH ) // high amount ); // clang-format on diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index ac0e25020f..5c8bf05eac 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -65,11 +65,11 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _serverListWidgets = makeWidgets( makeWindowShim(STR_SERVER_LIST, 340, 90), - makeWidget({100, 20}, {245, 12}, WindowWidgetType::TextBox, WindowColour::secondary ), // player name text box - makeWidget({ 6, 37}, {489, 226}, WindowWidgetType::Scroll, WindowColour::secondary ), // server list - makeWidget({ 6, 53}, {101, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_FETCH_SERVERS ), // fetch servers button - makeWidget({112, 53}, {101, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_ADD_SERVER ), // add server button - makeWidget({218, 53}, {101, 14}, WindowWidgetType::Button, WindowColour::secondary, STR_START_SERVER ) // start server button + makeWidget({100, 20}, {245, 12}, WidgetType::textBox, WindowColour::secondary ), // player name text box + makeWidget({ 6, 37}, {489, 226}, WidgetType::scroll, WindowColour::secondary ), // server list + makeWidget({ 6, 53}, {101, 14}, WidgetType::button, WindowColour::secondary, STR_FETCH_SERVERS ), // fetch servers button + makeWidget({112, 53}, {101, 14}, WidgetType::button, WindowColour::secondary, STR_ADD_SERVER ), // add server button + makeWidget({218, 53}, {101, 14}, WidgetType::button, WindowColour::secondary, STR_START_SERVER ) // start server button ); // clang-format on diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 19bc09d115..0f08fb714f 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -48,15 +48,15 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _windowServerStartWidgets = makeWidgets( makeWindowShim(STR_START_SERVER, WW, WH), - makeWidget({ 120, 20 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::secondary), // port text box - makeWidget({ 120, 36 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::secondary), // name text box - makeWidget({ 120, 52 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::secondary), // description text box - makeWidget({ 120, 68 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::secondary), // greeting text box - makeWidget({ 120, 84 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::secondary), // password text box - makeSpinnerWidgets({ 120, 100 }, { 173, 12 }, WindowWidgetType::Spinner, WindowColour::secondary,STR_SERVER_MAX_PLAYERS_VALUE), // max players (3 widgets) - makeWidget({ 6, 117 }, { 287, 14 }, WindowWidgetType::Checkbox, WindowColour::secondary, STR_ADVERTISE,STR_ADVERTISE_SERVER_TIP), // advertise checkbox - makeWidget({ 6, WH - 6 - 13 }, { 101, 14 }, WindowWidgetType::Button, WindowColour::secondary,STR_NEW_GAME), // start server button - makeWidget({ 112, WH - 6 - 13 }, { 101, 14 }, WindowWidgetType::Button, WindowColour::secondary, STR_LOAD_GAME) // None + makeWidget({ 120, 20 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // port text box + makeWidget({ 120, 36 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // name text box + makeWidget({ 120, 52 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // description text box + makeWidget({ 120, 68 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // greeting text box + makeWidget({ 120, 84 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // password text box + makeSpinnerWidgets({ 120, 100 }, { 173, 12 }, WidgetType::spinner, WindowColour::secondary,STR_SERVER_MAX_PLAYERS_VALUE), // max players (3 widgets) + makeWidget({ 6, 117 }, { 287, 14 }, WidgetType::checkbox, WindowColour::secondary, STR_ADVERTISE,STR_ADVERTISE_SERVER_TIP), // advertise checkbox + makeWidget({ 6, WH - 6 - 13 }, { 101, 14 }, WidgetType::button, WindowColour::secondary,STR_NEW_GAME), // start server button + makeWidget({ 112, WH - 6 - 13 }, { 101, 14 }, WidgetType::button, WindowColour::secondary, STR_LOAD_GAME) // None ); // clang-format on diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 458525f676..016e5d3e83 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -44,9 +44,9 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _shortcutWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({0, 43}, {350, 287}, WindowWidgetType::Resize, WindowColour::secondary), - makeWidget({4, 47}, {412, 215}, WindowWidgetType::Scroll, WindowColour::primary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ), - makeWidget({4, WH-15}, {150, 12}, WindowWidgetType::Button, WindowColour::primary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP) + makeWidget({0, 43}, {350, 287}, WidgetType::resize, WindowColour::secondary), + makeWidget({4, 47}, {412, 215}, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ), + makeWidget({4, WH-15}, {150, 12}, WidgetType::button, WindowColour::primary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP) ); // clang-format on @@ -62,7 +62,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_shortcut_change_widgets = makeWidgets( makeWindowShim(CHANGE_WINDOW_TITLE, CHANGE_WW, CHANGE_WH), - makeWidget({ 75, 56 }, { 100, 14 }, WindowWidgetType::Button, WindowColour::primary, STR_SHORTCUT_REMOVE, STR_SHORTCUT_REMOVE_TIP) + makeWidget({ 75, 56 }, { 100, 14 }, WidgetType::button, WindowColour::primary, STR_SHORTCUT_REMOVE, STR_SHORTCUT_REMOVE_TIP) ); // clang-format on @@ -580,9 +580,9 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowResetShortcutKeysPromptWidgets = makeWidgets( makeWindowShim(STR_SHORTCUT_ACTION_RESET, RESET_PROMPT_WW, RESET_PROMPT_WH), - makeWidget({ 2, 30 }, { RESET_PROMPT_WW - 4, 12 }, WindowWidgetType::LabelCentred, WindowColour::primary, STR_RESET_SHORTCUT_KEYS_PROMPT), - makeWidget({ 8, RESET_PROMPT_WH - 22 }, { 85, 14 }, WindowWidgetType::Button, WindowColour::primary, STR_RESET), - makeWidget({ RESET_PROMPT_WW - 95, RESET_PROMPT_WH - 22 }, { 85, 14 }, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) + makeWidget({ 2, 30 }, { RESET_PROMPT_WW - 4, 12 }, WidgetType::labelCentred, WindowColour::primary, STR_RESET_SHORTCUT_KEYS_PROMPT), + makeWidget({ 8, RESET_PROMPT_WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_RESET), + makeWidget({ RESET_PROMPT_WW - 95, RESET_PROMPT_WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); // clang-format on diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index e4f862fc8e..0ff17cbc0b 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -51,11 +51,11 @@ namespace OpenRCT2::Ui::Windows // 0x9AEE00 static constexpr auto _signWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 3, 17}, {85, 60}, WindowWidgetType::Viewport, WindowColour::secondary ), // Viewport - makeWidget({WW - 25, 19}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_CHANGE_SIGN_TEXT_TIP ), // change sign button - makeWidget({WW - 25, 67}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_SIGN_TIP ), // demolish button - makeWidget({ 5, WH - 16}, {12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, kWidgetContentEmpty, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // Main colour - makeWidget({ 17, WH - 16}, {12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, kWidgetContentEmpty, STR_SELECT_TEXT_COLOUR_TIP ) // Text colour + makeWidget({ 3, 17}, {85, 60}, WidgetType::viewport, WindowColour::secondary ), // Viewport + makeWidget({WW - 25, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_CHANGE_SIGN_TEXT_TIP ), // change sign button + makeWidget({WW - 25, 67}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_SIGN_TIP ), // demolish button + makeWidget({ 5, WH - 16}, {12, 12}, WidgetType::colourBtn, WindowColour::secondary, kWidgetContentEmpty, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // Main colour + makeWidget({ 17, WH - 16}, {12, 12}, WidgetType::colourBtn, WindowColour::secondary, kWidgetContentEmpty, STR_SELECT_TEXT_COLOUR_TIP ) // Text colour ); // clang-format on @@ -252,38 +252,38 @@ namespace OpenRCT2::Ui::Windows { auto* wallEntry = OpenRCT2::ObjectManager::GetObjectEntry(_sceneryEntry); - main_colour_btn->type = WindowWidgetType::Empty; - text_colour_btn->type = WindowWidgetType::Empty; + main_colour_btn->type = WidgetType::empty; + text_colour_btn->type = WidgetType::empty; if (wallEntry == nullptr) { return; } if (wallEntry->flags & WALL_SCENERY_HAS_PRIMARY_COLOUR) { - main_colour_btn->type = WindowWidgetType::ColourBtn; + main_colour_btn->type = WidgetType::colourBtn; } if (wallEntry->flags & WALL_SCENERY_HAS_SECONDARY_COLOUR) { - text_colour_btn->type = WindowWidgetType::ColourBtn; + text_colour_btn->type = WidgetType::colourBtn; } } else { auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(_sceneryEntry); - main_colour_btn->type = WindowWidgetType::Empty; - text_colour_btn->type = WindowWidgetType::Empty; + main_colour_btn->type = WidgetType::empty; + text_colour_btn->type = WidgetType::empty; if (sceneryEntry == nullptr) { return; } if (sceneryEntry->flags & LARGE_SCENERY_FLAG_HAS_PRIMARY_COLOUR) { - main_colour_btn->type = WindowWidgetType::ColourBtn; + main_colour_btn->type = WidgetType::colourBtn; } if (sceneryEntry->flags & LARGE_SCENERY_FLAG_HAS_SECONDARY_COLOUR) { - text_colour_btn->type = WindowWidgetType::ColourBtn; + text_colour_btn->type = WidgetType::colourBtn; } } diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 791dee9d5b..87283101f3 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -87,7 +87,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kMainStaffWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43 }, { 190, 137 }, WindowWidgetType::Resize, WindowColour::secondary), + makeWidget({ 0, 43 }, { 190, 137 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_STAFF_OVERVIEW_TIP), makeTab({ 34, 17 }, STR_STAFF_OPTIONS_TIP), makeTab({ 65, 17 }, STR_STAFF_STATS_TIP) @@ -95,24 +95,24 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _staffOverviewWidgets = makeWidgets( kMainStaffWidgets, - makeWidget ({ 3, 47}, {162, 120}, WindowWidgetType::Viewport, WindowColour::secondary ), // Viewport - makeWidget ({ 3, WH - 13}, {162, 11}, WindowWidgetType::LabelCentred, WindowColour::secondary ), // Label at bottom of viewport - makeWidget ({WW - 25, 45}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PICKUP_BTN), STR_PICKUP_TIP ), // Pickup Button - makeWidget ({WW - 25, 69}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PATROL_BTN), STR_SET_PATROL_TIP ), // Patrol Button - makeWidget ({WW - 25, 93}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_STAFF_TIP ), // Rename Button - makeWidget ({WW - 25, 117}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP), // Locate Button - makeWidget ({WW - 25, 141}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_FIRE_STAFF_TIP ) // Fire Button + makeWidget ({ 3, 47}, {162, 120}, WidgetType::viewport, WindowColour::secondary ), // Viewport + makeWidget ({ 3, WH - 13}, {162, 11}, WidgetType::labelCentred, WindowColour::secondary ), // Label at bottom of viewport + makeWidget ({WW - 25, 45}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PICKUP_BTN), STR_PICKUP_TIP ), // Pickup Button + makeWidget ({WW - 25, 69}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PATROL_BTN), STR_SET_PATROL_TIP ), // Patrol Button + makeWidget ({WW - 25, 93}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_NAME_STAFF_TIP ), // Rename Button + makeWidget ({WW - 25, 117}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP), // Locate Button + makeWidget ({WW - 25, 141}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_FIRE_STAFF_TIP ) // Fire Button ); //0x9AF910 static constexpr auto _staffOptionsWidgets = makeWidgets( kMainStaffWidgets, - makeWidget ({ 5, 50}, {180, 12}, WindowWidgetType::Checkbox, WindowColour::secondary ), // Checkbox 1 - makeWidget ({ 5, 67}, {180, 12}, WindowWidgetType::Checkbox, WindowColour::secondary ), // Checkbox 2 - makeWidget ({ 5, 84}, {180, 12}, WindowWidgetType::Checkbox, WindowColour::secondary ), // Checkbox 3 - makeWidget ({ 5, 101}, {180, 12}, WindowWidgetType::Checkbox, WindowColour::secondary ), // Checkbox 4 - makeWidget ({ 5, 50}, {180, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Costume Dropdown - makeWidget ({WW - 17, 51}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_COSTUME_TIP) // Costume Dropdown Button + makeWidget ({ 5, 50}, {180, 12}, WidgetType::checkbox, WindowColour::secondary ), // Checkbox 1 + makeWidget ({ 5, 67}, {180, 12}, WidgetType::checkbox, WindowColour::secondary ), // Checkbox 2 + makeWidget ({ 5, 84}, {180, 12}, WidgetType::checkbox, WindowColour::secondary ), // Checkbox 3 + makeWidget ({ 5, 101}, {180, 12}, WidgetType::checkbox, WindowColour::secondary ), // Checkbox 4 + makeWidget ({ 5, 50}, {180, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Costume Dropdown + makeWidget ({WW - 17, 51}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH, STR_SELECT_COSTUME_TIP) // Costume Dropdown Button ); // 0x9AF9F4 @@ -829,12 +829,12 @@ namespace OpenRCT2::Ui::Windows { case StaffType::Entertainer: { - widgets[WIDX_CHECKBOX_1].type = WindowWidgetType::Empty; - widgets[WIDX_CHECKBOX_2].type = WindowWidgetType::Empty; - widgets[WIDX_CHECKBOX_3].type = WindowWidgetType::Empty; - widgets[WIDX_CHECKBOX_4].type = WindowWidgetType::Empty; - widgets[WIDX_COSTUME_BOX].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_COSTUME_BTN].type = WindowWidgetType::Button; + widgets[WIDX_CHECKBOX_1].type = WidgetType::empty; + widgets[WIDX_CHECKBOX_2].type = WidgetType::empty; + widgets[WIDX_CHECKBOX_3].type = WidgetType::empty; + widgets[WIDX_CHECKBOX_4].type = WidgetType::empty; + widgets[WIDX_COSTUME_BOX].type = WidgetType::dropdownMenu; + widgets[WIDX_COSTUME_BTN].type = WidgetType::button; auto pos = std::find_if(_availableCostumes.begin(), _availableCostumes.end(), [staff](auto costume) { return costume.index == staff->AnimationObjectIndex; @@ -856,28 +856,28 @@ namespace OpenRCT2::Ui::Windows break; } case StaffType::Handyman: - widgets[WIDX_CHECKBOX_1].type = WindowWidgetType::Checkbox; + widgets[WIDX_CHECKBOX_1].type = WidgetType::checkbox; widgets[WIDX_CHECKBOX_1].text = STR_STAFF_OPTION_SWEEP_FOOTPATHS; - widgets[WIDX_CHECKBOX_2].type = WindowWidgetType::Checkbox; + widgets[WIDX_CHECKBOX_2].type = WidgetType::checkbox; widgets[WIDX_CHECKBOX_2].text = STR_STAFF_OPTION_WATER_GARDENS; - widgets[WIDX_CHECKBOX_3].type = WindowWidgetType::Checkbox; + widgets[WIDX_CHECKBOX_3].type = WidgetType::checkbox; widgets[WIDX_CHECKBOX_3].text = STR_STAFF_OPTION_EMPTY_LITTER; - widgets[WIDX_CHECKBOX_4].type = WindowWidgetType::Checkbox; + widgets[WIDX_CHECKBOX_4].type = WidgetType::checkbox; widgets[WIDX_CHECKBOX_4].text = STR_STAFF_OPTION_MOW_GRASS; - widgets[WIDX_COSTUME_BOX].type = WindowWidgetType::Empty; - widgets[WIDX_COSTUME_BTN].type = WindowWidgetType::Empty; + widgets[WIDX_COSTUME_BOX].type = WidgetType::empty; + widgets[WIDX_COSTUME_BTN].type = WidgetType::empty; OptionsSetCheckboxValues(); break; case StaffType::Mechanic: - widgets[WIDX_CHECKBOX_1].type = WindowWidgetType::Checkbox; + widgets[WIDX_CHECKBOX_1].type = WidgetType::checkbox; widgets[WIDX_CHECKBOX_1].text = STR_INSPECT_RIDES; - widgets[WIDX_CHECKBOX_2].type = WindowWidgetType::Checkbox; + widgets[WIDX_CHECKBOX_2].type = WidgetType::checkbox; widgets[WIDX_CHECKBOX_2].text = STR_FIX_RIDES; - widgets[WIDX_CHECKBOX_3].type = WindowWidgetType::Empty; - widgets[WIDX_CHECKBOX_4].type = WindowWidgetType::Empty; - widgets[WIDX_COSTUME_BOX].type = WindowWidgetType::Empty; - widgets[WIDX_COSTUME_BTN].type = WindowWidgetType::Empty; - widgets[WIDX_COSTUME_BTN].type = WindowWidgetType::Empty; + widgets[WIDX_CHECKBOX_3].type = WidgetType::empty; + widgets[WIDX_CHECKBOX_4].type = WidgetType::empty; + widgets[WIDX_COSTUME_BOX].type = WidgetType::empty; + widgets[WIDX_COSTUME_BTN].type = WidgetType::empty; + widgets[WIDX_COSTUME_BTN].type = WidgetType::empty; OptionsSetCheckboxValues(); break; case StaffType::Security: diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index b02d3c4ea7..e0cd1fe8e6 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -37,8 +37,8 @@ namespace OpenRCT2::Ui::Windows // 0x9AFB4C static constexpr auto _staffFireWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 10, WH - 20}, {85, 14}, WindowWidgetType::Button, WindowColour::primary, STR_YES ), - makeWidget({WW - 95, WH - 20}, {85, 14}, WindowWidgetType::Button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) + makeWidget({ 10, WH - 20}, {85, 14}, WidgetType::button, WindowColour::primary, STR_YES ), + makeWidget({WW - 95, WH - 20}, {85, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); // clang-format on diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index e63b835df7..2bd887572b 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -81,17 +81,17 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _staffListWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, { WW, WH - 43}, WindowWidgetType::Resize, WindowColour::secondary ), // tab content panel + makeWidget({ 0, 43}, { WW, WH - 43}, WidgetType::resize, WindowColour::secondary ), // tab content panel makeTab ({ 3, 17}, STR_STAFF_HANDYMEN_TAB_TIP ), // handymen tab makeTab ({ 34, 17}, STR_STAFF_MECHANICS_TAB_TIP ), // mechanics tab makeTab ({ 65, 17}, STR_STAFF_SECURITY_TAB_TIP ), // security guards tab makeTab ({ 96, 17}, STR_STAFF_ENTERTAINERS_TAB_TIP ), // entertainers tab - makeWidget({ 3, 72}, {WW - 6, 195}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), // staff list - makeWidget({130, 58}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::secondary, kStringIdNone, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker - makeWidget({165, 17}, { 145, 13}, WindowWidgetType::Button, WindowColour::primary , kStringIdNone, STR_HIRE_STAFF_TIP ), // hire button - makeWidget({243, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_QUICK_FIRE_STAFF ), // quick fire staff - makeWidget({267, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_PATROL_BTN), STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool - makeWidget({291, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_MAP), STR_SHOW_STAFF_ON_MAP_TIP) // show staff on map button + makeWidget({ 3, 72}, {WW - 6, 195}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), // staff list + makeWidget({130, 58}, { 12, 12}, WidgetType::colourBtn, WindowColour::secondary, kStringIdNone, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker + makeWidget({165, 17}, { 145, 13}, WidgetType::button, WindowColour::primary , kStringIdNone, STR_HIRE_STAFF_TIP ), // hire button + makeWidget({243, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_QUICK_FIRE_STAFF ), // quick fire staff + makeWidget({267, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PATROL_BTN), STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool + makeWidget({291, 46}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_MAP), STR_SHOW_STAFF_ON_MAP_TIP) // show staff on map button ); // clang-format on @@ -124,7 +124,7 @@ namespace OpenRCT2::Ui::Windows WindowInitScrollWidgets(*this); WindowSetResize(*this, { WW, WH }, { MAX_WW, MAX_WH }); - widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WindowWidgetType::Empty; + widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WidgetType::empty; RefreshList(); } @@ -248,11 +248,11 @@ namespace OpenRCT2::Ui::Windows SetWidgetPressed(_selectedTab + WIDX_STAFF_LIST_HANDYMEN_TAB, true); widgets[WIDX_STAFF_LIST_HIRE_BUTTON].text = GetStaffNamingConvention(GetSelectedStaffType()).ActionHire; - widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WindowWidgetType::Empty; + widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WidgetType::empty; if (GetSelectedStaffType() != StaffType::Entertainer) { - widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WindowWidgetType::ColourBtn; + widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WidgetType::colourBtn; widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = GetColourButtonImage( StaffGetColour(GetSelectedStaffType())); } diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 05dc315d5e..9b016998e6 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -36,8 +36,8 @@ namespace OpenRCT2::Ui::Windows static constexpr auto _textInputWidgets = makeWidgets( makeWindowShim(kStringIdNone, WW, WH), - makeWidget({ 170, 68 }, { 71, 14 }, WindowWidgetType::Button, WindowColour::secondary, STR_CANCEL), - makeWidget({ 10, 68 }, { 71, 14 }, WindowWidgetType::Button, WindowColour::secondary, STR_OK)); + makeWidget({ 170, 68 }, { 71, 14 }, WidgetType::button, WindowColour::secondary, STR_CANCEL), + makeWidget({ 10, 68 }, { 71, 14 }, WidgetType::button, WindowColour::secondary, STR_OK)); class TextInputWindow final : public Window { diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index e2b4e62f63..57156e24f3 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -79,7 +79,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _themesWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 43}, {320, 64}, WindowWidgetType::Resize, WindowColour::secondary ), // tab content panel + makeWidget({ 0, 43}, {320, 64}, WidgetType::resize, WindowColour::secondary ), // tab content panel makeTab ({ 3, 17}, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab makeTab ({ 34, 17}, STR_THEMES_TAB_MAIN_TIP ), // main ui tab makeTab ({ 65, 17}, STR_THEMES_TAB_PARK_TIP ), // park tab @@ -89,20 +89,20 @@ namespace OpenRCT2::Ui::Windows makeTab ({189, 17}, STR_THEMES_TAB_MISC_TIP ), // misc tab makeTab ({220, 17}, STR_THEMES_TAB_PROMPTS_TIP ), // prompts tab makeTab ({251, 17}, STR_THEMES_TAB_FEATURES_TIP ), // features tab - makeWidget({ 5, 46}, {kWindowHeaderWidth, 15}, WindowWidgetType::TableHeader, WindowColour::secondary, STR_THEMES_HEADER_WINDOW ), // Window header - makeWidget({157, 46}, { 79, 15}, WindowWidgetType::TableHeader, WindowColour::secondary, STR_THEMES_HEADER_PALETTE ), // Palette header - makeWidget({236, 46}, { 80, 15}, WindowWidgetType::TableHeader, WindowColour::secondary, STR_THEMES_HEADER_TRANSPARENCY ), // Transparency header - makeWidget({125, 60}, {175, 12}, WindowWidgetType::DropdownMenu, WindowColour::secondary ), // Preset colour schemes - makeWidget({288, 61}, { 11, 10}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), - makeWidget({ 10, 82}, { 91, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_THEMES_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP), // Duplicate button - makeWidget({110, 82}, { 91, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button - makeWidget({210, 82}, { 91, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::ColourBtn, WindowColour::secondary ), // colour button mask - makeWidget({ 3, 60}, {314, 44}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL ), // staff list - makeWidget({ 10, 54}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights - makeWidget({ 10, 69}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights - makeWidget({ 10, 84}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font - makeWidget({ 10, 99}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ) // rct1 bottom toolbar + makeWidget({ 5, 46}, {kWindowHeaderWidth, 15}, WidgetType::tableHeader, WindowColour::secondary, STR_THEMES_HEADER_WINDOW ), // Window header + makeWidget({157, 46}, { 79, 15}, WidgetType::tableHeader, WindowColour::secondary, STR_THEMES_HEADER_PALETTE ), // Palette header + makeWidget({236, 46}, { 80, 15}, WidgetType::tableHeader, WindowColour::secondary, STR_THEMES_HEADER_TRANSPARENCY ), // Transparency header + makeWidget({125, 60}, {175, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // Preset colour schemes + makeWidget({288, 61}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), + makeWidget({ 10, 82}, { 91, 12}, WidgetType::button, WindowColour::secondary, STR_THEMES_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP), // Duplicate button + makeWidget({110, 82}, { 91, 12}, WidgetType::button, WindowColour::secondary, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button + makeWidget({210, 82}, { 91, 12}, WidgetType::button, WindowColour::secondary, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button + makeWidget({ 0, 0}, { 1, 1}, WidgetType::colourBtn, WindowColour::secondary ), // colour button mask + makeWidget({ 3, 60}, {314, 44}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), // staff list + makeWidget({ 10, 54}, {290, 12}, WidgetType::checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights + makeWidget({ 10, 69}, {290, 12}, WidgetType::checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights + makeWidget({ 10, 84}, {290, 12}, WidgetType::checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font + makeWidget({ 10, 99}, {290, 12}, WidgetType::checkbox, WindowColour::secondary, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ) // rct1 bottom toolbar ); // clang-format on @@ -322,37 +322,37 @@ namespace OpenRCT2::Ui::Windows if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS) { - widgets[WIDX_THEMES_HEADER_WINDOW].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_HEADER_PALETTE].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_HEADER_TRANSPARENCY].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_LIST].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_RIDE_LIGHTS].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_PARK_LIGHTS].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_SCENARIO_FONT].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_BOTTOM_TOOLBAR].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_DUPLICATE_BUTTON].type = WindowWidgetType::Button; - widgets[WIDX_THEMES_DELETE_BUTTON].type = WindowWidgetType::Button; - widgets[WIDX_THEMES_RENAME_BUTTON].type = WindowWidgetType::Button; - widgets[WIDX_THEMES_PRESETS].type = WindowWidgetType::DropdownMenu; - widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WindowWidgetType::Button; - widgets[WIDX_THEMES_COLOURBTN_MASK].type = WindowWidgetType::Empty; + widgets[WIDX_THEMES_HEADER_WINDOW].type = WidgetType::empty; + widgets[WIDX_THEMES_HEADER_PALETTE].type = WidgetType::empty; + widgets[WIDX_THEMES_HEADER_TRANSPARENCY].type = WidgetType::empty; + widgets[WIDX_THEMES_LIST].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_RIDE_LIGHTS].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_PARK_LIGHTS].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_SCENARIO_FONT].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_BOTTOM_TOOLBAR].type = WidgetType::empty; + widgets[WIDX_THEMES_DUPLICATE_BUTTON].type = WidgetType::button; + widgets[WIDX_THEMES_DELETE_BUTTON].type = WidgetType::button; + widgets[WIDX_THEMES_RENAME_BUTTON].type = WidgetType::button; + widgets[WIDX_THEMES_PRESETS].type = WidgetType::dropdownMenu; + widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WidgetType::button; + widgets[WIDX_THEMES_COLOURBTN_MASK].type = WidgetType::empty; } else if (_selected_tab == WINDOW_THEMES_TAB_FEATURES) { - widgets[WIDX_THEMES_HEADER_WINDOW].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_HEADER_PALETTE].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_HEADER_TRANSPARENCY].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_LIST].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_RIDE_LIGHTS].type = WindowWidgetType::Checkbox; - widgets[WIDX_THEMES_RCT1_PARK_LIGHTS].type = WindowWidgetType::Checkbox; - widgets[WIDX_THEMES_RCT1_SCENARIO_FONT].type = WindowWidgetType::Checkbox; - widgets[WIDX_THEMES_RCT1_BOTTOM_TOOLBAR].type = WindowWidgetType::Checkbox; - widgets[WIDX_THEMES_DUPLICATE_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_DELETE_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RENAME_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_PRESETS].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_COLOURBTN_MASK].type = WindowWidgetType::Empty; + widgets[WIDX_THEMES_HEADER_WINDOW].type = WidgetType::empty; + widgets[WIDX_THEMES_HEADER_PALETTE].type = WidgetType::empty; + widgets[WIDX_THEMES_HEADER_TRANSPARENCY].type = WidgetType::empty; + widgets[WIDX_THEMES_LIST].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_RIDE_LIGHTS].type = WidgetType::checkbox; + widgets[WIDX_THEMES_RCT1_PARK_LIGHTS].type = WidgetType::checkbox; + widgets[WIDX_THEMES_RCT1_SCENARIO_FONT].type = WidgetType::checkbox; + widgets[WIDX_THEMES_RCT1_BOTTOM_TOOLBAR].type = WidgetType::checkbox; + widgets[WIDX_THEMES_DUPLICATE_BUTTON].type = WidgetType::empty; + widgets[WIDX_THEMES_DELETE_BUTTON].type = WidgetType::empty; + widgets[WIDX_THEMES_RENAME_BUTTON].type = WidgetType::empty; + widgets[WIDX_THEMES_PRESETS].type = WidgetType::empty; + widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_THEMES_COLOURBTN_MASK].type = WidgetType::empty; WidgetSetCheckboxValue(*this, WIDX_THEMES_RCT1_RIDE_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE); WidgetSetCheckboxValue(*this, WIDX_THEMES_RCT1_PARK_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_PARK); @@ -363,20 +363,20 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_THEMES_HEADER_WINDOW].type = WindowWidgetType::TableHeader; - widgets[WIDX_THEMES_HEADER_PALETTE].type = WindowWidgetType::TableHeader; - widgets[WIDX_THEMES_HEADER_TRANSPARENCY].type = WindowWidgetType::TableHeader; - widgets[WIDX_THEMES_LIST].type = WindowWidgetType::Scroll; - widgets[WIDX_THEMES_RCT1_RIDE_LIGHTS].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_PARK_LIGHTS].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_SCENARIO_FONT].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RCT1_BOTTOM_TOOLBAR].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_DUPLICATE_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_DELETE_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_RENAME_BUTTON].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_PRESETS].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WindowWidgetType::Empty; - widgets[WIDX_THEMES_COLOURBTN_MASK].type = WindowWidgetType::Empty; + widgets[WIDX_THEMES_HEADER_WINDOW].type = WidgetType::tableHeader; + widgets[WIDX_THEMES_HEADER_PALETTE].type = WidgetType::tableHeader; + widgets[WIDX_THEMES_HEADER_TRANSPARENCY].type = WidgetType::tableHeader; + widgets[WIDX_THEMES_LIST].type = WidgetType::scroll; + widgets[WIDX_THEMES_RCT1_RIDE_LIGHTS].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_PARK_LIGHTS].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_SCENARIO_FONT].type = WidgetType::empty; + widgets[WIDX_THEMES_RCT1_BOTTOM_TOOLBAR].type = WidgetType::empty; + widgets[WIDX_THEMES_DUPLICATE_BUTTON].type = WidgetType::empty; + widgets[WIDX_THEMES_DELETE_BUTTON].type = WidgetType::empty; + widgets[WIDX_THEMES_RENAME_BUTTON].type = WidgetType::empty; + widgets[WIDX_THEMES_PRESETS].type = WidgetType::empty; + widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WidgetType::empty; + widgets[WIDX_THEMES_COLOURBTN_MASK].type = WidgetType::empty; } } @@ -657,7 +657,7 @@ namespace OpenRCT2::Ui::Windows } else { - widgets[WIDX_THEMES_COLOURBTN_MASK].type = WindowWidgetType::ColourBtn; + widgets[WIDX_THEMES_COLOURBTN_MASK].type = WidgetType::colourBtn; widgets[WIDX_THEMES_COLOURBTN_MASK].left = _button_offset_x + widgets[WIDX_THEMES_LIST].left + _button_size; widgets[WIDX_THEMES_COLOURBTN_MASK].top = GetTotalColoursUpTo(_classIndex) * (_button_size + 2) diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index cccfe6a90a..b9bdacba5c 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -278,31 +278,31 @@ namespace OpenRCT2::Ui::Windows static constexpr auto kMainTileInspectorWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({3, 57}, {WW - 6, WH - PADDING_BOTTOM - 58}, WindowWidgetType::Scroll, WindowColour::secondary, SCROLL_VERTICAL), /* Element list */ + makeWidget({3, 57}, {WW - 6, WH - PADDING_BOTTOM - 58}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL), /* Element list */ /* X and Y spinners */ - makeWidget ({ 4, 24}, {38, 14}, WindowWidgetType::Label, WindowColour::secondary, STR_TILE_INSPECTOR_X_LABEL), - makeSpinnerWidgets({20, 23}, {51, 12}, WindowWidgetType::Spinner, WindowColour::secondary), /* Spinner X (3 widgets) */ - makeWidget ({74, 24}, {38, 14}, WindowWidgetType::Label, WindowColour::secondary, STR_TILE_INSPECTOR_Y_LABEL), - makeSpinnerWidgets({90, 23}, {51, 12}, WindowWidgetType::Spinner, WindowColour::secondary), /* Spinner Y (3 widgets) */ + makeWidget ({ 4, 24}, {38, 14}, WidgetType::label, WindowColour::secondary, STR_TILE_INSPECTOR_X_LABEL), + makeSpinnerWidgets({20, 23}, {51, 12}, WidgetType::spinner, WindowColour::secondary), /* Spinner X (3 widgets) */ + makeWidget ({74, 24}, {38, 14}, WidgetType::label, WindowColour::secondary, STR_TILE_INSPECTOR_Y_LABEL), + makeSpinnerWidgets({90, 23}, {51, 12}, WidgetType::spinner, WindowColour::secondary), /* Spinner Y (3 widgets) */ /* Top buttons */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 0, ToolbarButtonSize, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_REMOVE_SELECTED_ELEMENT_TIP ), /* Remove button */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 1, ToolbarButtonHalfSize, WindowWidgetType::Button, WindowColour::secondary, STR_UP, STR_MOVE_SELECTED_ELEMENT_UP_TIP), /* Move up */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 1 + ScreenSize{0, 12}, ToolbarButtonHalfSize, WindowWidgetType::Button, WindowColour::secondary, STR_DOWN, STR_MOVE_SELECTED_ELEMENT_DOWN_TIP), /* Move down */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 2, ToolbarButtonSize, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_SELECTED_ELEMENT_TIP), /* Rotate button */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 3, ToolbarButtonSize, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_SORT), STR_TILE_INSPECTOR_SORT_TIP), /* Sort button */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 4, ToolbarButtonSize, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_PASTE), STR_TILE_INSPECTOR_PASTE_TIP), /* Paste button */ - makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 5, ToolbarButtonSize, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_COPY), STR_TILE_INSPECTOR_COPY_TIP), /* Copy button */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 0, ToolbarButtonSize, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_REMOVE_SELECTED_ELEMENT_TIP ), /* Remove button */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 1, ToolbarButtonHalfSize, WidgetType::button, WindowColour::secondary, STR_UP, STR_MOVE_SELECTED_ELEMENT_UP_TIP), /* Move up */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 1 + ScreenSize{0, 12}, ToolbarButtonHalfSize, WidgetType::button, WindowColour::secondary, STR_DOWN, STR_MOVE_SELECTED_ELEMENT_DOWN_TIP), /* Move down */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 2, ToolbarButtonSize, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_SELECTED_ELEMENT_TIP), /* Rotate button */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 3, ToolbarButtonSize, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_SORT), STR_TILE_INSPECTOR_SORT_TIP), /* Sort button */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 4, ToolbarButtonSize, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_PASTE), STR_TILE_INSPECTOR_PASTE_TIP), /* Paste button */ + makeWidget(ToolbarButtonAnchor + ToolbarButtonOffsetX * 5, ToolbarButtonSize, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_COPY), STR_TILE_INSPECTOR_COPY_TIP), /* Copy button */ /* Column headers */ - makeWidget(InvisibleFlagColumnXY, InvisibleFlagColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_INVISIBLE_SHORT, STR_TILE_INSPECTOR_FLAG_INVISIBLE), /* Invisible flag */ - makeWidget(TypeColumnXY, TypeColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_ELEMENT_TYPE), /* Type */ - makeWidget(BaseHeightColumnXY, BaseHeightColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_BASE_HEIGHT_SHORT, STR_TILE_INSPECTOR_BASE_HEIGHT), /* Base height */ - makeWidget(ClearanceHeightColumnXY, ClearanceHeightColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_CLEARANGE_HEIGHT_SHORT, STR_TILE_INSPECTOR_CLEARANCE_HEIGHT), /* Clearance height */ - makeWidget(DirectionColumnXY, DirectionColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_DIRECTION_SHORT, STR_TILE_INSPECTOR_DIRECTION), /* Direction */ - makeWidget(GhostFlagColumnXY, GhostFlagColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_FLAG_GHOST_SHORT, STR_TILE_INSPECTOR_FLAG_GHOST), /* Ghost flag */ - makeWidget(LastFlagColumnXY, LastFlagColumnSize, WindowWidgetType::TableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_FLAG_LAST_SHORT, STR_TILE_INSPECTOR_FLAG_LAST), /* Last of tile flag */ + makeWidget(InvisibleFlagColumnXY, InvisibleFlagColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_INVISIBLE_SHORT, STR_TILE_INSPECTOR_FLAG_INVISIBLE), /* Invisible flag */ + makeWidget(TypeColumnXY, TypeColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_ELEMENT_TYPE), /* Type */ + makeWidget(BaseHeightColumnXY, BaseHeightColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_BASE_HEIGHT_SHORT, STR_TILE_INSPECTOR_BASE_HEIGHT), /* Base height */ + makeWidget(ClearanceHeightColumnXY, ClearanceHeightColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_CLEARANGE_HEIGHT_SHORT, STR_TILE_INSPECTOR_CLEARANCE_HEIGHT), /* Clearance height */ + makeWidget(DirectionColumnXY, DirectionColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_DIRECTION_SHORT, STR_TILE_INSPECTOR_DIRECTION), /* Direction */ + makeWidget(GhostFlagColumnXY, GhostFlagColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_FLAG_GHOST_SHORT, STR_TILE_INSPECTOR_FLAG_GHOST), /* Ghost flag */ + makeWidget(LastFlagColumnXY, LastFlagColumnSize, WidgetType::tableHeader, WindowColour::secondary, STR_TILE_INSPECTOR_FLAG_LAST_SHORT, STR_TILE_INSPECTOR_FLAG_LAST), /* Last of tile flag */ /* Group boxes */ - makeWidget({6, 0}, {WW - 12, 0}, WindowWidgetType::Groupbox, WindowColour::secondary, kStringIdNone, kStringIdNone ), /* Details group box */ - makeWidget({6, 0}, {WW - 12, 0}, WindowWidgetType::Groupbox, WindowColour::secondary, STR_TILE_INSPECTOR_GROUPBOX_PROPERTIES, kStringIdNone ) /* Properties group box */ + makeWidget({6, 0}, {WW - 12, 0}, WidgetType::groupbox, WindowColour::secondary, kStringIdNone, kStringIdNone ), /* Details group box */ + makeWidget({6, 0}, {WW - 12, 0}, WidgetType::groupbox, WindowColour::secondary, STR_TILE_INSPECTOR_GROUPBOX_PROPERTIES, kStringIdNone ) /* Properties group box */ ); static constexpr auto DefaultWidgets = makeWidgets( @@ -315,14 +315,14 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t SurfaceDetailsHeight = 20 + NumSurfaceDetails * 11; static constexpr auto SurfaceWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_SURFACE_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(PropertyRowCol({ 12, 0 }, 1, 0), PropertyButtonSize, WindowWidgetType::Button, WindowColour::secondary, STR_TILE_INSPECTOR_SURFACE_REMOVE_FENCES), // WIDX_SURFACE_BUTTON_REMOVE_FENCES - makeWidget(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WindowWidgetType::Button, WindowColour::secondary, STR_TILE_INSPECTOR_SURFACE_RESTORE_FENCES), // WIDX_SURFACE_BUTTON_RESTORE_FENCES - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 1, 0), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_N - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 2, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_E - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 1, 2), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_S - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 0, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_W - makeWidget(PropertyRowCol({ 12, 0 }, 4, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_SURFACE_DIAGONAL) // WIDX_SURFACE_CHECK_DIAGONAL + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_SURFACE_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(PropertyRowCol({ 12, 0 }, 1, 0), PropertyButtonSize, WidgetType::button, WindowColour::secondary, STR_TILE_INSPECTOR_SURFACE_REMOVE_FENCES), // WIDX_SURFACE_BUTTON_REMOVE_FENCES + makeWidget(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WidgetType::button, WindowColour::secondary, STR_TILE_INSPECTOR_SURFACE_RESTORE_FENCES), // WIDX_SURFACE_BUTTON_RESTORE_FENCES + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 1, 0), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_N + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 2, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_E + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 1, 2), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_S + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 3, 1), 0, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SURFACE_CHECK_CORNER_W + makeWidget(PropertyRowCol({ 12, 0 }, 4, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_SURFACE_DIAGONAL) // WIDX_SURFACE_CHECK_DIAGONAL ); constexpr int32_t NumPathProperties = 6; @@ -331,18 +331,18 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t PathDetailsHeight = 20 + NumPathDetails * 11; static constexpr auto PathWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_PATH_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(PropertyRowCol({ 12, 0 }, 1, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_PATH_BROKEN), // WIDX_PATH_CHECK_BROKEN - makeWidget(PropertyRowCol({ 12, 0 }, 2, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_PATH_SLOPED), // WIDX_PATH_CHECK_SLOPED - makeWidget(PropertyRowCol({ 12, 0 }, 3, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_PATH_JUNCTION_RAILINGS), // WIDX_PATH_CHECK_JUNCTION_RAILINGS - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 3, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_NE - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 4, 2), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_E - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 3, 3), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_SE - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 2, 4), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_S - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 1, 3), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_SW - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 0, 2), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_W - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 1, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_NW - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 2, 0), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary) // WIDX_PATH_CHECK_EDGE_N + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_PATH_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(PropertyRowCol({ 12, 0 }, 1, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_PATH_BROKEN), // WIDX_PATH_CHECK_BROKEN + makeWidget(PropertyRowCol({ 12, 0 }, 2, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_PATH_SLOPED), // WIDX_PATH_CHECK_SLOPED + makeWidget(PropertyRowCol({ 12, 0 }, 3, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_PATH_JUNCTION_RAILINGS), // WIDX_PATH_CHECK_JUNCTION_RAILINGS + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 3, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_NE + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 4, 2), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_E + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 3, 3), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_SE + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 2, 4), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_S + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 1, 3), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_SW + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 0, 2), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_W + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 1, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_PATH_CHECK_EDGE_NW + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 4, 1), 2, 0), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary) // WIDX_PATH_CHECK_EDGE_N ); constexpr int32_t NumTrackProperties = 5; @@ -351,11 +351,11 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t TrackDetailsHeight = 20 + NumTrackDetails * 11; static constexpr auto TrackWidgets = makeWidgets( kMainTileInspectorWidgets, - makeWidget(PropertyRowCol({ 12, 0}, 0, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_ENTIRE_TRACK_PIECE), // WIDX_TRACK_CHECK_APPLY_TO_ALL - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_TRACK_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(PropertyRowCol({ 12, 0}, 2, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_CHAIN_LIFT), // WIDX_TRACK_CHECK_CHAIN_LIFT - makeWidget(PropertyRowCol({ 12, 0}, 3, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_BRAKE_CLOSED), // WIDX_TRACK_CHECK_BRAKE_CLOSED - makeWidget(PropertyRowCol({ 12, 0}, 4, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_IS_INDESTRUCTIBLE) // WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE + makeWidget(PropertyRowCol({ 12, 0}, 0, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_ENTIRE_TRACK_PIECE), // WIDX_TRACK_CHECK_APPLY_TO_ALL + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_TRACK_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(PropertyRowCol({ 12, 0}, 2, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_CHAIN_LIFT), // WIDX_TRACK_CHECK_CHAIN_LIFT + makeWidget(PropertyRowCol({ 12, 0}, 3, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_BRAKE_CLOSED), // WIDX_TRACK_CHECK_BRAKE_CLOSED + makeWidget(PropertyRowCol({ 12, 0}, 4, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_TRACK_IS_INDESTRUCTIBLE) // WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE ); constexpr int32_t NumSceneryProperties = 4; // The checkbox groups both count for 2 rows @@ -364,15 +364,15 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t SceneryDetailsHeight = 20 + NumSceneryDetails * 11; static constexpr auto SceneryWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 0), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_N - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 2, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_E - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 2), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_S - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 0, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_W - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 1, 0), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_COLLISION_N - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 2, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_COLLISION_E - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 1, 2), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_COLLISION_S - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 0, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary) // WIDX_SCENERY_CHECK_COLLISION_W + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 0), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_N + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 2, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_E + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 2), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_S + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 0, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_QUARTER_W + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 1, 0), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_COLLISION_N + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 2, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_COLLISION_E + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 1, 2), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_SCENERY_CHECK_COLLISION_S + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 2, 1), 0, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary) // WIDX_SCENERY_CHECK_COLLISION_W ); constexpr int32_t NumEntranceProperties = 2; @@ -381,8 +381,8 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t EntranceDetailsHeight = 20 + NumEntranceDetails * 11; static constexpr auto EntranceWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_ENTRANCE_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(PropertyRowCol({ 12, 0 }, 1, 0), PropertyButtonSize, WindowWidgetType::Button, WindowColour::secondary, STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE, STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE_TIP) // WIDX_ENTRANCE_BUTTON_MAKE_USABLE + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_ENTRANCE_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(PropertyRowCol({ 12, 0 }, 1, 0), PropertyButtonSize, WidgetType::button, WindowColour::secondary, STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE, STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE_TIP) // WIDX_ENTRANCE_BUTTON_MAKE_USABLE ); constexpr int32_t NumWallProperties = 4; @@ -391,11 +391,11 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t WallDetailsHeight = 20 + NumWallDetails * 11; static constexpr auto WallWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_WALL_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WindowWidgetType::DropdownMenu, WindowColour::secondary), // WIDX_WALL_DROPDOWN_SLOPE - makeWidget(PropertyRowCol({ 12 + PropertyButtonSize.width - 12, 0 }, 1, 1), { 11, 12}, WindowWidgetType::Button, WindowColour::secondary, STR_DROPDOWN_GLYPH), // WIDX_WALL_DROPDOWN_SLOPE_BUTTON - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 2, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_WALL_SPINNER_ANIMATION_FRAME{,_INCREASE,_DECREASE} - makeWidget(PropertyRowCol({ 12, 0 }, 3, 0), PropertyFullWidth, WindowWidgetType::Checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_WALL_ANIMATION_IS_BACKWARDS) // WIDX_WALL_ANIMATION_IS_BACKWARDS + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_WALL_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(PropertyRowCol({ 12, 0 }, 1, 1), PropertyButtonSize, WidgetType::dropdownMenu, WindowColour::secondary), // WIDX_WALL_DROPDOWN_SLOPE + makeWidget(PropertyRowCol({ 12 + PropertyButtonSize.width - 12, 0 }, 1, 1), { 11, 12}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH), // WIDX_WALL_DROPDOWN_SLOPE_BUTTON + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 2, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_WALL_SPINNER_ANIMATION_FRAME{,_INCREASE,_DECREASE} + makeWidget(PropertyRowCol({ 12, 0 }, 3, 0), PropertyFullWidth, WidgetType::checkbox, WindowColour::secondary, STR_TILE_INSPECTOR_WALL_ANIMATION_IS_BACKWARDS) // WIDX_WALL_ANIMATION_IS_BACKWARDS ); constexpr int32_t NumLargeSceneryProperties = 1; @@ -404,7 +404,7 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t LargeSceneryDetailsHeight = 20 + NumLargeSceneryDetails * 11; static constexpr auto LargeSceneryWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary) // WIDX_LARGE_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary) // WIDX_LARGE_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE} ); constexpr int32_t NumBannerProperties = 3; @@ -413,11 +413,11 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t BannerDetailsHeight = 20 + NumBannerDetails * 11; static constexpr auto BannerWidgets = makeWidgets( kMainTileInspectorWidgets, - makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WindowWidgetType::Spinner, WindowColour::secondary), // WIDX_BANNER_SPINNER_HEIGHT{,_INCREASE,_DECREASE} - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 3, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_BANNER_CHECK_BLOCK_NE - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 3, 3), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_BANNER_CHECK_BLOCK_SE - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 3), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary), // WIDX_BANNER_CHECK_BLOCK_SW - makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 1), { 12, 12 }, WindowWidgetType::Checkbox, WindowColour::secondary) // WIDX_BANNER_CHECK_BLOCK_NW + makeSpinnerWidgets(PropertyRowCol({ 12, 0 }, 0, 1), PropertyButtonSize, WidgetType::spinner, WindowColour::secondary), // WIDX_BANNER_SPINNER_HEIGHT{,_INCREASE,_DECREASE} + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 3, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_BANNER_CHECK_BLOCK_NE + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 3, 3), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_BANNER_CHECK_BLOCK_SE + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 3), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary), // WIDX_BANNER_CHECK_BLOCK_SW + makeWidget(CheckboxGroupOffset(PropertyRowCol({ 12, 0 }, 1, 1), 1, 1), { 12, 12 }, WidgetType::checkbox, WindowColour::secondary) // WIDX_BANNER_CHECK_BLOCK_NW ); static constexpr std::span PageWidgets[] = { @@ -2142,14 +2142,14 @@ static uint64_t PageDisabledWidgets[] = { if (tileInspectorPage == TileInspectorPage::Default) { - widgets[WIDX_GROUPBOX_DETAILS].type = WindowWidgetType::Empty; - widgets[WIDX_GROUPBOX_PROPERTIES].type = WindowWidgetType::Empty; + widgets[WIDX_GROUPBOX_DETAILS].type = WidgetType::empty; + widgets[WIDX_GROUPBOX_PROPERTIES].type = WidgetType::empty; widgets[WIDX_LIST].bottom = height - PADDING_BOTTOM; } else { - widgets[WIDX_GROUPBOX_DETAILS].type = WindowWidgetType::Groupbox; - widgets[WIDX_GROUPBOX_PROPERTIES].type = WindowWidgetType::Groupbox; + widgets[WIDX_GROUPBOX_DETAILS].type = WidgetType::groupbox; + widgets[WIDX_GROUPBOX_PROPERTIES].type = WidgetType::groupbox; auto pageIndex = EnumValue(tileInspectorPage) - 1; widgets[WIDX_GROUPBOX_DETAILS].text = PageGroupBoxSettings[pageIndex].string_id; widgets[WIDX_GROUPBOX_DETAILS].top = height - PageGroupBoxSettings[pageIndex].details_top_offset; diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 539b0471a6..395ea35797 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -21,7 +21,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto _titleExitWidgets = makeWidgets( - makeWidget({ 0, 0 }, { 40, 64 }, WindowWidgetType::ImgBtn, WindowColour::tertiary, ImageId(SPR_MENU_EXIT), STR_EXIT)); + makeWidget({ 0, 0 }, { 40, 64 }, WidgetType::imgBtn, WindowColour::tertiary, ImageId(SPR_MENU_EXIT), STR_EXIT)); class TitleExitWindow final : public Window { diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index 452f86f120..37c5ed6e10 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -25,7 +25,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto _titleLogoWidgets = makeWidgets( - makeWidget({ 0, 0 }, { WW + 1, WH + 1 }, WindowWidgetType::ImgBtn, WindowColour::primary)); + makeWidget({ 0, 0 }, { WW + 1, WH + 1 }, WidgetType::imgBtn, WindowColour::primary)); class TitleLogoWindow final : public Window { diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index e6bec5e2a1..1457a8e776 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -47,11 +47,11 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _titleMenuWidgets = makeWidgets( - makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WindowWidgetType::ImgBtn, WindowColour::tertiary, ImageId(SPR_MENU_NEW_GAME), STR_START_NEW_GAME_TIP), - makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WindowWidgetType::ImgBtn, WindowColour::tertiary, ImageId(SPR_MENU_LOAD_GAME), STR_CONTINUE_SAVED_GAME_TIP), - makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WindowWidgetType::ImgBtn, WindowColour::tertiary, ImageId(SPR_G2_MENU_MULTIPLAYER), STR_SHOW_MULTIPLAYER_TIP), - makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WindowWidgetType::ImgBtn, WindowColour::tertiary, ImageId(SPR_MENU_TOOLBOX), STR_GAME_TOOLS_TIP), - makeWidget({0, 0}, UpdateButtonDims, WindowWidgetType::Empty, WindowColour::secondary, STR_UPDATE_AVAILABLE) + makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WidgetType::imgBtn, WindowColour::tertiary, ImageId(SPR_MENU_NEW_GAME), STR_START_NEW_GAME_TIP), + makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WidgetType::imgBtn, WindowColour::tertiary, ImageId(SPR_MENU_LOAD_GAME), STR_CONTINUE_SAVED_GAME_TIP), + makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WidgetType::imgBtn, WindowColour::tertiary, ImageId(SPR_G2_MENU_MULTIPLAYER), STR_SHOW_MULTIPLAYER_TIP), + makeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WidgetType::imgBtn, WindowColour::tertiary, ImageId(SPR_MENU_TOOLBOX), STR_GAME_TOOLS_TIP), + makeWidget({0, 0}, UpdateButtonDims, WidgetType::empty, WindowColour::secondary, STR_UPDATE_AVAILABLE) ); // clang-format on @@ -94,13 +94,13 @@ namespace OpenRCT2::Ui::Windows SetWidgets(_titleMenuWidgets); #ifdef DISABLE_NETWORK - widgets[WIDX_MULTIPLAYER].type = WindowWidgetType::Empty; + widgets[WIDX_MULTIPLAYER].type = WidgetType::empty; #endif int32_t x = 0; for (Widget* widget = widgets.data(); widget != &widgets[WIDX_NEW_VERSION]; widget++) { - if (widget->type != WindowWidgetType::Empty) + if (widget->type != WidgetType::empty) { widget->left = x; widget->right = x + MenuButtonDims.width - 1; @@ -268,7 +268,7 @@ namespace OpenRCT2::Ui::Windows windowPos + ScreenCoordsXY{ width - 1, MenuButtonDims.height + UpdateButtonDims.height - 1 } }; if (OpenRCT2::GetContext()->HasNewVersionInfo()) { - widgets[WIDX_NEW_VERSION].type = WindowWidgetType::Button; + widgets[WIDX_NEW_VERSION].type = WidgetType::button; _filterRect.Point1.y = windowPos.y; } } diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index a02d80bc44..13ca723944 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -20,7 +20,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto _windowTitleOptionsWidgets = makeWidgets( - makeWidget({ 0, 0 }, { 80, 15 }, WindowWidgetType::Button, WindowColour::tertiary, STR_OPTIONS, STR_OPTIONS_TIP)); + makeWidget({ 0, 0 }, { 80, 15 }, WidgetType::button, WindowColour::tertiary, STR_OPTIONS, STR_OPTIONS_TIP)); class TitleOptionsWindow final : public Window { diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index 276f4832ca..8eab8f3989 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -26,7 +26,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto _tooltipWidgets = makeWidgets( - makeWidget({ 0, 0 }, { 200, 32 }, WindowWidgetType::ImgBtn, WindowColour::primary)); + makeWidget({ 0, 0 }, { 200, 32 }, WidgetType::imgBtn, WindowColour::primary)); class TooltipWindow final : public Window { diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 561fedd3b0..63c6d375b9 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -236,34 +236,34 @@ namespace OpenRCT2::Ui::Windows #pragma endregion static constexpr auto _topToolbarWidgets = makeWidgets( - makeRemapWidget({ 0, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP ), // Pause - makeRemapWidget({ 60, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP ), // File menu - makeRemapWidget({250, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute - makeRemapWidget({100, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::secondary , SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out - makeRemapWidget({130, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::secondary , SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in - makeRemapWidget({190, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::secondary , SPR_TAB_TOOLBAR, STR_ROTATE_ANTI_CLOCKWISE ), // Rotate camera anti-clockwise - makeRemapWidget({160, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::secondary , SPR_TOOLBAR_ROTATE, STR_ROTATE_CLOCKWISE ), // Rotate camera clockwise - makeRemapWidget({220, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::secondary , SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu - makeRemapWidget({267, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::secondary , SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map - makeRemapWidget({297, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::tertiary , SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land - makeRemapWidget({327, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::tertiary , SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water - makeRemapWidget({357, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::tertiary , SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery - makeRemapWidget({387, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::tertiary , SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path - makeRemapWidget({490, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::tertiary , SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride - makeRemapWidget({520, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides - makeRemapWidget({550, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park - makeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff - makeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests - makeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::tertiary , SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_CHEATS_TIP ), // Cheats - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_DEBUG_TIP ), // Debug - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), // Finances - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP ), // Research - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP ), // News - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network - makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat - makeWidget ({ 0, 0}, {10, 1}, WindowWidgetType::Empty, WindowColour::primary ) // Artificial widget separator + makeRemapWidget({ 0, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP ), // Pause + makeRemapWidget({ 60, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP ), // File menu + makeRemapWidget({250, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute + makeRemapWidget({100, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::secondary , SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out + makeRemapWidget({130, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::secondary , SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in + makeRemapWidget({190, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::secondary , SPR_TAB_TOOLBAR, STR_ROTATE_ANTI_CLOCKWISE ), // Rotate camera anti-clockwise + makeRemapWidget({160, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::secondary , SPR_TOOLBAR_ROTATE, STR_ROTATE_CLOCKWISE ), // Rotate camera clockwise + makeRemapWidget({220, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::secondary , SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu + makeRemapWidget({267, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::secondary , SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map + makeRemapWidget({297, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::tertiary , SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land + makeRemapWidget({327, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::tertiary , SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water + makeRemapWidget({357, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::tertiary , SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery + makeRemapWidget({387, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::tertiary , SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path + makeRemapWidget({490, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::tertiary , SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride + makeRemapWidget({520, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides + makeRemapWidget({550, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park + makeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff + makeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests + makeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::tertiary , SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_CHEATS_TIP ), // Cheats + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_DEBUG_TIP ), // Debug + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), // Finances + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP ), // Research + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::quaternary, SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP ), // News + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network + makeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WidgetType::trnBtn, WindowColour::primary , SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat + makeWidget ({ 0, 0}, {10, 1}, WidgetType::empty, WindowColour::primary ) // Artificial widget separator ); // clang-format on @@ -588,69 +588,68 @@ namespace OpenRCT2::Ui::Windows void ResetWidgetToDefaultState() { // Enable / disable buttons - widgets[WIDX_PAUSE].type = WindowWidgetType::TrnBtn; - widgets[WIDX_FILE_MENU].type = WindowWidgetType::TrnBtn; - widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::TrnBtn; - widgets[WIDX_ZOOM_IN].type = WindowWidgetType::TrnBtn; - widgets[WIDX_ROTATE_CLOCKWISE].type = WindowWidgetType::TrnBtn; - widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WindowWidgetType::TrnBtn; - widgets[WIDX_VIEW_MENU].type = WindowWidgetType::TrnBtn; - widgets[WIDX_MAP].type = WindowWidgetType::TrnBtn; - widgets[WIDX_MUTE].type = WindowWidgetType::TrnBtn; - widgets[WIDX_CHAT].type = WindowWidgetType::TrnBtn; - widgets[WIDX_LAND].type = WindowWidgetType::TrnBtn; - widgets[WIDX_WATER].type = WindowWidgetType::TrnBtn; - widgets[WIDX_SCENERY].type = WindowWidgetType::TrnBtn; - widgets[WIDX_PATH].type = WindowWidgetType::TrnBtn; - widgets[WIDX_CONSTRUCT_RIDE].type = WindowWidgetType::TrnBtn; - widgets[WIDX_RIDES].type = WindowWidgetType::TrnBtn; - widgets[WIDX_PARK].type = WindowWidgetType::TrnBtn; - widgets[WIDX_STAFF].type = WindowWidgetType::TrnBtn; - widgets[WIDX_GUESTS].type = WindowWidgetType::TrnBtn; - widgets[WIDX_CLEAR_SCENERY].type = WindowWidgetType::TrnBtn; - widgets[WIDX_FINANCES].type = WindowWidgetType::TrnBtn; - widgets[WIDX_RESEARCH].type = WindowWidgetType::TrnBtn; - widgets[WIDX_FASTFORWARD].type = WindowWidgetType::TrnBtn; - widgets[WIDX_CHEATS].type = WindowWidgetType::TrnBtn; - widgets[WIDX_DEBUG].type = Config::Get().general.DebuggingTools ? WindowWidgetType::TrnBtn - : WindowWidgetType::Empty; - widgets[WIDX_NEWS].type = WindowWidgetType::TrnBtn; - widgets[WIDX_NETWORK].type = WindowWidgetType::TrnBtn; + widgets[WIDX_PAUSE].type = WidgetType::trnBtn; + widgets[WIDX_FILE_MENU].type = WidgetType::trnBtn; + widgets[WIDX_ZOOM_OUT].type = WidgetType::trnBtn; + widgets[WIDX_ZOOM_IN].type = WidgetType::trnBtn; + widgets[WIDX_ROTATE_CLOCKWISE].type = WidgetType::trnBtn; + widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WidgetType::trnBtn; + widgets[WIDX_VIEW_MENU].type = WidgetType::trnBtn; + widgets[WIDX_MAP].type = WidgetType::trnBtn; + widgets[WIDX_MUTE].type = WidgetType::trnBtn; + widgets[WIDX_CHAT].type = WidgetType::trnBtn; + widgets[WIDX_LAND].type = WidgetType::trnBtn; + widgets[WIDX_WATER].type = WidgetType::trnBtn; + widgets[WIDX_SCENERY].type = WidgetType::trnBtn; + widgets[WIDX_PATH].type = WidgetType::trnBtn; + widgets[WIDX_CONSTRUCT_RIDE].type = WidgetType::trnBtn; + widgets[WIDX_RIDES].type = WidgetType::trnBtn; + widgets[WIDX_PARK].type = WidgetType::trnBtn; + widgets[WIDX_STAFF].type = WidgetType::trnBtn; + widgets[WIDX_GUESTS].type = WidgetType::trnBtn; + widgets[WIDX_CLEAR_SCENERY].type = WidgetType::trnBtn; + widgets[WIDX_FINANCES].type = WidgetType::trnBtn; + widgets[WIDX_RESEARCH].type = WidgetType::trnBtn; + widgets[WIDX_FASTFORWARD].type = WidgetType::trnBtn; + widgets[WIDX_CHEATS].type = WidgetType::trnBtn; + widgets[WIDX_DEBUG].type = Config::Get().general.DebuggingTools ? WidgetType::trnBtn : WidgetType::empty; + widgets[WIDX_NEWS].type = WidgetType::trnBtn; + widgets[WIDX_NETWORK].type = WidgetType::trnBtn; } void HideDisabledButtons() { if (!Config::Get().interface.ToolbarShowMute) - widgets[WIDX_MUTE].type = WindowWidgetType::Empty; + widgets[WIDX_MUTE].type = WidgetType::empty; if (!Config::Get().interface.ToolbarShowChat) - widgets[WIDX_CHAT].type = WindowWidgetType::Empty; + widgets[WIDX_CHAT].type = WidgetType::empty; if (!Config::Get().interface.ToolbarShowResearch) - widgets[WIDX_RESEARCH].type = WindowWidgetType::Empty; + widgets[WIDX_RESEARCH].type = WidgetType::empty; if (!Config::Get().interface.ToolbarShowCheats) - widgets[WIDX_CHEATS].type = WindowWidgetType::Empty; + widgets[WIDX_CHEATS].type = WidgetType::empty; if (!Config::Get().interface.ToolbarShowNews) - widgets[WIDX_NEWS].type = WindowWidgetType::Empty; + widgets[WIDX_NEWS].type = WidgetType::empty; if (!Config::Get().interface.ToolbarShowZoom) { - widgets[WIDX_ZOOM_IN].type = WindowWidgetType::Empty; - widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::Empty; + widgets[WIDX_ZOOM_IN].type = WidgetType::empty; + widgets[WIDX_ZOOM_OUT].type = WidgetType::empty; } if (!Config::Get().interface.ToolbarShowRotateAnticlockwise) - widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WindowWidgetType::Empty; + widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WidgetType::empty; if (gLegacyScene == LegacyScene::scenarioEditor || gLegacyScene == LegacyScene::trackDesignsManager) { - widgets[WIDX_PAUSE].type = WindowWidgetType::Empty; + widgets[WIDX_PAUSE].type = WidgetType::empty; } if ((getGameState().park.Flags & PARK_FLAGS_NO_MONEY) || !Config::Get().interface.ToolbarShowFinances) - widgets[WIDX_FINANCES].type = WindowWidgetType::Empty; + widgets[WIDX_FINANCES].type = WidgetType::empty; } void ApplyEditorMode() @@ -660,41 +659,41 @@ namespace OpenRCT2::Ui::Windows return; } - widgets[WIDX_PARK].type = WindowWidgetType::Empty; - widgets[WIDX_STAFF].type = WindowWidgetType::Empty; - widgets[WIDX_GUESTS].type = WindowWidgetType::Empty; - widgets[WIDX_FINANCES].type = WindowWidgetType::Empty; - widgets[WIDX_RESEARCH].type = WindowWidgetType::Empty; - widgets[WIDX_NEWS].type = WindowWidgetType::Empty; - widgets[WIDX_NETWORK].type = WindowWidgetType::Empty; + widgets[WIDX_PARK].type = WidgetType::empty; + widgets[WIDX_STAFF].type = WidgetType::empty; + widgets[WIDX_GUESTS].type = WidgetType::empty; + widgets[WIDX_FINANCES].type = WidgetType::empty; + widgets[WIDX_RESEARCH].type = WidgetType::empty; + widgets[WIDX_NEWS].type = WidgetType::empty; + widgets[WIDX_NETWORK].type = WidgetType::empty; auto& gameState = getGameState(); if (gameState.editorStep != EditorStep::LandscapeEditor) { - widgets[WIDX_LAND].type = WindowWidgetType::Empty; - widgets[WIDX_WATER].type = WindowWidgetType::Empty; + widgets[WIDX_LAND].type = WidgetType::empty; + widgets[WIDX_WATER].type = WidgetType::empty; } if (gameState.editorStep != EditorStep::RollercoasterDesigner) { - widgets[WIDX_RIDES].type = WindowWidgetType::Empty; - widgets[WIDX_CONSTRUCT_RIDE].type = WindowWidgetType::Empty; - widgets[WIDX_FASTFORWARD].type = WindowWidgetType::Empty; + widgets[WIDX_RIDES].type = WidgetType::empty; + widgets[WIDX_CONSTRUCT_RIDE].type = WidgetType::empty; + widgets[WIDX_FASTFORWARD].type = WidgetType::empty; } if (gameState.editorStep != EditorStep::LandscapeEditor && gameState.editorStep != EditorStep::RollercoasterDesigner) { - widgets[WIDX_MAP].type = WindowWidgetType::Empty; - widgets[WIDX_SCENERY].type = WindowWidgetType::Empty; - widgets[WIDX_PATH].type = WindowWidgetType::Empty; - widgets[WIDX_CLEAR_SCENERY].type = WindowWidgetType::Empty; + widgets[WIDX_MAP].type = WidgetType::empty; + widgets[WIDX_SCENERY].type = WidgetType::empty; + widgets[WIDX_PATH].type = WidgetType::empty; + widgets[WIDX_CLEAR_SCENERY].type = WidgetType::empty; - widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::Empty; - widgets[WIDX_ZOOM_IN].type = WindowWidgetType::Empty; - widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WindowWidgetType::Empty; - widgets[WIDX_ROTATE_CLOCKWISE].type = WindowWidgetType::Empty; - widgets[WIDX_VIEW_MENU].type = WindowWidgetType::Empty; + widgets[WIDX_ZOOM_OUT].type = WidgetType::empty; + widgets[WIDX_ZOOM_IN].type = WidgetType::empty; + widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WidgetType::empty; + widgets[WIDX_ROTATE_CLOCKWISE].type = WidgetType::empty; + widgets[WIDX_VIEW_MENU].type = WidgetType::empty; } } @@ -703,14 +702,14 @@ namespace OpenRCT2::Ui::Windows switch (NetworkGetMode()) { case NETWORK_MODE_NONE: - widgets[WIDX_NETWORK].type = WindowWidgetType::Empty; - widgets[WIDX_CHAT].type = WindowWidgetType::Empty; + widgets[WIDX_NETWORK].type = WidgetType::empty; + widgets[WIDX_CHAT].type = WidgetType::empty; break; case NETWORK_MODE_CLIENT: - widgets[WIDX_PAUSE].type = WindowWidgetType::Empty; + widgets[WIDX_PAUSE].type = WidgetType::empty; [[fallthrough]]; case NETWORK_MODE_SERVER: - widgets[WIDX_FASTFORWARD].type = WindowWidgetType::Empty; + widgets[WIDX_FASTFORWARD].type = WidgetType::empty; break; } } @@ -755,7 +754,7 @@ namespace OpenRCT2::Ui::Windows void ApplyMapRotation() { // Set map button to the right image. - if (widgets[WIDX_MAP].type != WindowWidgetType::Empty) + if (widgets[WIDX_MAP].type != WidgetType::empty) { static constexpr uint32_t _imageIdByRotation[] = { SPR_G2_MAP_NORTH, @@ -796,7 +795,7 @@ namespace OpenRCT2::Ui::Windows for (auto widgetIndex : toolbarItems) { auto* widget = &widgets[widgetIndex]; - if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR) + if (widget->type == WidgetType::empty && widgetIndex != WIDX_SEPARATOR) continue; if (firstItem && widgetIndex == WIDX_SEPARATOR) @@ -816,7 +815,7 @@ namespace OpenRCT2::Ui::Windows for (auto widgetIndex : toolbarItems) { auto* widget = &widgets[widgetIndex]; - if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR) + if (widget->type == WidgetType::empty && widgetIndex != WIDX_SEPARATOR) continue; if (firstItem && widgetIndex == WIDX_SEPARATOR) @@ -884,7 +883,7 @@ namespace OpenRCT2::Ui::Windows ScreenCoordsXY screenPos{}; // Draw staff button image (setting masks to the staff colours) - if (widgets[WIDX_STAFF].type != WindowWidgetType::Empty) + if (widgets[WIDX_STAFF].type != WidgetType::empty) { screenPos = { windowPos.x + widgets[WIDX_STAFF].left, windowPos.y + widgets[WIDX_STAFF].top }; imgId = SPR_TOOLBAR_STAFF; @@ -894,7 +893,7 @@ namespace OpenRCT2::Ui::Windows } // Draw fast forward button - if (widgets[WIDX_FASTFORWARD].type != WindowWidgetType::Empty) + if (widgets[WIDX_FASTFORWARD].type != WidgetType::empty) { screenPos = { windowPos.x + widgets[WIDX_FASTFORWARD].left + 0, windowPos.y + widgets[WIDX_FASTFORWARD].top + 0 }; @@ -913,7 +912,7 @@ namespace OpenRCT2::Ui::Windows } // Draw cheats button - if (widgets[WIDX_CHEATS].type != WindowWidgetType::Empty) + if (widgets[WIDX_CHEATS].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_CHEATS].left - 1, widgets[WIDX_CHEATS].top - 1 }; if (WidgetIsPressed(*this, WIDX_CHEATS)) @@ -931,7 +930,7 @@ namespace OpenRCT2::Ui::Windows } // Draw chat button - if (widgets[WIDX_CHAT].type != WindowWidgetType::Empty) + if (widgets[WIDX_CHAT].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_CHAT].left, widgets[WIDX_CHAT].top - 2 }; if (WidgetIsPressed(*this, WIDX_CHAT)) @@ -940,7 +939,7 @@ namespace OpenRCT2::Ui::Windows } // Draw debug button - if (widgets[WIDX_DEBUG].type != WindowWidgetType::Empty) + if (widgets[WIDX_DEBUG].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_DEBUG].left, widgets[WIDX_DEBUG].top - 1 }; if (WidgetIsPressed(*this, WIDX_DEBUG)) @@ -949,7 +948,7 @@ namespace OpenRCT2::Ui::Windows } // Draw research button - if (widgets[WIDX_RESEARCH].type != WindowWidgetType::Empty) + if (widgets[WIDX_RESEARCH].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_RESEARCH].left - 1, widgets[WIDX_RESEARCH].top }; if (WidgetIsPressed(*this, WIDX_RESEARCH)) @@ -958,7 +957,7 @@ namespace OpenRCT2::Ui::Windows } // Draw finances button - if (widgets[WIDX_FINANCES].type != WindowWidgetType::Empty) + if (widgets[WIDX_FINANCES].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_FINANCES].left + 3, widgets[WIDX_FINANCES].top + 1 }; if (WidgetIsPressed(*this, WIDX_FINANCES)) @@ -967,7 +966,7 @@ namespace OpenRCT2::Ui::Windows } // Draw news button - if (widgets[WIDX_NEWS].type != WindowWidgetType::Empty) + if (widgets[WIDX_NEWS].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_NEWS].left + 3, widgets[WIDX_NEWS].top + 0 }; if (WidgetIsPressed(*this, WIDX_NEWS)) @@ -976,7 +975,7 @@ namespace OpenRCT2::Ui::Windows } // Draw network button - if (widgets[WIDX_NETWORK].type != WindowWidgetType::Empty) + if (widgets[WIDX_NETWORK].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_NETWORK].left + 3, widgets[WIDX_NETWORK].top + 0 }; if (WidgetIsPressed(*this, WIDX_NETWORK)) @@ -993,7 +992,7 @@ namespace OpenRCT2::Ui::Windows DrawTextBasic(rt, screenPos + ScreenCoordsXY{ 23, 1 }, STR_COMMA16, ft, { colour, TextAlignment::RIGHT }); } - if (widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type != WindowWidgetType::Empty) + if (widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_ROTATE_ANTI_CLOCKWISE].left + 2, diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index d65eb6968e..12076a8e13 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -43,14 +43,14 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _trackManageWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 10, 24}, {110, 12}, WindowWidgetType::Button, WindowColour::primary, STR_TRACK_MANAGE_RENAME), - makeWidget({130, 24}, {110, 12}, WindowWidgetType::Button, WindowColour::primary, STR_TRACK_MANAGE_DELETE) + makeWidget({ 10, 24}, {110, 12}, WidgetType::button, WindowColour::primary, STR_TRACK_MANAGE_RENAME), + makeWidget({130, 24}, {110, 12}, WidgetType::button, WindowColour::primary, STR_TRACK_MANAGE_DELETE) ); static constexpr auto _trackDeletePromptWidgets = makeWidgets( makeWindowShim(STR_DELETE_FILE, WW_DELETE_PROMPT, WH_DELETE_PROMPT), - makeWidget({ 10, 54}, {110, 12}, WindowWidgetType::Button, WindowColour::primary, STR_TRACK_MANAGE_DELETE), - makeWidget({130, 54}, {110, 12}, WindowWidgetType::Button, WindowColour::primary, STR_CANCEL ) + makeWidget({ 10, 54}, {110, 12}, WidgetType::button, WindowColour::primary, STR_TRACK_MANAGE_DELETE), + makeWidget({130, 54}, {110, 12}, WidgetType::button, WindowColour::primary, STR_CANCEL ) ); // clang-format on diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 6099cd459b..e74e5756b4 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -69,10 +69,10 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _trackPlaceWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({173, 83}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), - makeWidget({173, 59}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_MIRROR_ARROW), STR_MIRROR_IMAGE_TIP ), - makeWidget({ 4, 109}, {192, 12}, WindowWidgetType::Button, WindowColour::primary, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP), - makeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::primary) + makeWidget({173, 83}, { 24, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), + makeWidget({173, 59}, { 24, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_MIRROR_ARROW), STR_MIRROR_IMAGE_TIP ), + makeWidget({ 4, 109}, {192, 12}, WidgetType::button, WindowColour::primary, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP), + makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary) ); // clang-format on diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 1d3c69ba78..48588a70bb 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -56,13 +56,13 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _trackListWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 4, 18}, {218, 13}, WindowWidgetType::TableHeader, WindowColour::primary, STR_SELECT_OTHER_RIDE ), - makeWidget({ 4, 32}, {124, 13}, WindowWidgetType::TextBox, WindowColour::secondary ), - makeWidget({130, 32}, { 92, 13}, WindowWidgetType::Button, WindowColour::primary, STR_OBJECT_SEARCH_CLEAR ), - makeWidget({ 4, 46}, {218, 381}, WindowWidgetType::Scroll, WindowColour::primary, SCROLL_VERTICAL, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP), - makeWidget({224, 18}, {372, 219}, WindowWidgetType::FlatBtn, WindowColour::primary ), - makeWidget({572, 405}, { ROTATE_AND_SCENERY_BUTTON_SIZE, ROTATE_AND_SCENERY_BUTTON_SIZE}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), - makeWidget({572, 381}, { ROTATE_AND_SCENERY_BUTTON_SIZE, ROTATE_AND_SCENERY_BUTTON_SIZE}, WindowWidgetType::FlatBtn, WindowColour::primary, ImageId(SPR_SCENERY), STR_TOGGLE_SCENERY_TIP ) + makeWidget({ 4, 18}, {218, 13}, WidgetType::tableHeader, WindowColour::primary, STR_SELECT_OTHER_RIDE ), + makeWidget({ 4, 32}, {124, 13}, WidgetType::textBox, WindowColour::secondary ), + makeWidget({130, 32}, { 92, 13}, WidgetType::button, WindowColour::primary, STR_OBJECT_SEARCH_CLEAR ), + makeWidget({ 4, 46}, {218, 381}, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP), + makeWidget({224, 18}, {372, 219}, WidgetType::flatBtn, WindowColour::primary ), + makeWidget({572, 405}, { ROTATE_AND_SCENERY_BUTTON_SIZE, ROTATE_AND_SCENERY_BUTTON_SIZE}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), + makeWidget({572, 381}, { ROTATE_AND_SCENERY_BUTTON_SIZE, ROTATE_AND_SCENERY_BUTTON_SIZE}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_SCENERY), STR_TOGGLE_SCENERY_TIP ) ); // clang-format on @@ -403,8 +403,8 @@ namespace OpenRCT2::Ui::Windows { pressed_widgets |= 1uLL << WIDX_TRACK_PREVIEW; disabled_widgets &= ~(1uLL << WIDX_TRACK_PREVIEW); - widgets[WIDX_ROTATE].type = WindowWidgetType::FlatBtn; - widgets[WIDX_TOGGLE_SCENERY].type = WindowWidgetType::FlatBtn; + widgets[WIDX_ROTATE].type = WidgetType::flatBtn; + widgets[WIDX_TOGGLE_SCENERY].type = WidgetType::flatBtn; if (gTrackDesignSceneryToggle) { pressed_widgets &= ~(1uLL << WIDX_TOGGLE_SCENERY); @@ -418,8 +418,8 @@ namespace OpenRCT2::Ui::Windows { pressed_widgets &= ~(1uLL << WIDX_TRACK_PREVIEW); disabled_widgets |= (1uLL << WIDX_TRACK_PREVIEW); - widgets[WIDX_ROTATE].type = WindowWidgetType::Empty; - widgets[WIDX_TOGGLE_SCENERY].type = WindowWidgetType::Empty; + widgets[WIDX_ROTATE].type = WidgetType::empty; + widgets[WIDX_TOGGLE_SCENERY].type = WidgetType::empty; } // When debugging tools are on, shift everything up a bit to make room for displaying the path. diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 689918ff67..e630600cb2 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -65,21 +65,21 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _transparancyWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 2, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_VEGETATION), STR_SEE_THROUGH_VEGETATION), - makeWidget({ 27, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_SCENERY), STR_SEE_THROUGH_SCENERY), - makeWidget({ 52, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_FOOTPATH), STR_SEE_THROUGH_PATHS), - makeWidget({ 77, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_RIDE), STR_SEE_THROUGH_RIDES), - makeWidget({102, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_VEHICLES), STR_SEE_THROUGH_VEHICLES), - makeWidget({127, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_SUPPORTS), STR_SEE_THROUGH_SUPPORTS), - makeWidget({152, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, ImageId(SPR_GUESTS), STR_SEE_THROUGH_GUESTS), - makeWidget({177, 17}, HIDE_SIZE, WindowWidgetType::FlatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SEE_THROUGH_STAFF), + makeWidget({ 2, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_VEGETATION), STR_SEE_THROUGH_VEGETATION), + makeWidget({ 27, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_SCENERY), STR_SEE_THROUGH_SCENERY), + makeWidget({ 52, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_FOOTPATH), STR_SEE_THROUGH_PATHS), + makeWidget({ 77, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE), STR_SEE_THROUGH_RIDES), + makeWidget({102, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_VEHICLES), STR_SEE_THROUGH_VEHICLES), + makeWidget({127, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_SUPPORTS), STR_SEE_THROUGH_SUPPORTS), + makeWidget({152, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_GUESTS), STR_SEE_THROUGH_GUESTS), + makeWidget({177, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, 0xFFFFFFFF, STR_SEE_THROUGH_STAFF), - makeWidget({ 2, 42}, INVISIBLE_SIZE, WindowWidgetType::FlatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_VEGETATION), - makeWidget({ 27, 42}, INVISIBLE_SIZE, WindowWidgetType::FlatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_SCENERY), - makeWidget({ 52, 42}, INVISIBLE_SIZE, WindowWidgetType::FlatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_PATHS), - makeWidget({ 77, 42}, INVISIBLE_SIZE, WindowWidgetType::FlatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_RIDES), - makeWidget({102, 42}, INVISIBLE_SIZE, WindowWidgetType::FlatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_VEHICLES), - makeWidget({127, 42}, INVISIBLE_SIZE, WindowWidgetType::FlatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_SUPPORTS) + makeWidget({ 2, 42}, INVISIBLE_SIZE, WidgetType::flatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_VEGETATION), + makeWidget({ 27, 42}, INVISIBLE_SIZE, WidgetType::flatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_SCENERY), + makeWidget({ 52, 42}, INVISIBLE_SIZE, WidgetType::flatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_PATHS), + makeWidget({ 77, 42}, INVISIBLE_SIZE, WidgetType::flatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_RIDES), + makeWidget({102, 42}, INVISIBLE_SIZE, WidgetType::flatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_VEHICLES), + makeWidget({127, 42}, INVISIBLE_SIZE, WidgetType::flatBtn, WindowColour::tertiary, kStringIdNone, STR_INVISIBLE_SUPPORTS) ); // clang-format on diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 9093473c24..428b262477 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -55,14 +55,14 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _viewClippingWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({ 11, 19}, { 159, 11}, WindowWidgetType::Checkbox, WindowColour::primary, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP ), // clip enable/disable check box - makeWidget ({ 5, 36}, {WW - 10, 65}, WindowWidgetType::Groupbox, WindowColour::primary, STR_VIEW_CLIPPING_VERTICAL_CLIPPING ), - makeSpinnerWidgets({ 90, 51}, { 79, 12}, WindowWidgetType::Spinner, WindowColour::primary, kStringIdNone, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE ), // clip height (3 widgets) - makeWidget ({ 11, 66}, { 158, 13}, WindowWidgetType::Scroll, WindowColour::primary, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP ), // clip height scrollbar - makeWidget ({ 11, 83}, { 159, 11}, WindowWidgetType::Checkbox, WindowColour::primary, STR_VIEW_CLIPPING_VERTICAL_CLIPPING_SEE_THROUGH, STR_VIEW_CLIPPING_VERTICAL_CLIPPING_SEE_THROUGH_TIP), // clip height enable/disable see-through check box - makeWidget ({ 5, 107}, {WW - 10, 60}, WindowWidgetType::Groupbox, WindowColour::primary, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING ), - makeWidget ({ 11, 122}, { 158, 17}, WindowWidgetType::Button, WindowColour::primary, STR_VIEW_CLIPPING_SELECT_AREA ), // selector - makeWidget ({ 11, 143}, { 158, 18}, WindowWidgetType::Button, WindowColour::primary, STR_VIEW_CLIPPING_CLEAR_SELECTION ) // clear + makeWidget ({ 11, 19}, { 159, 11}, WidgetType::checkbox, WindowColour::primary, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP ), // clip enable/disable check box + makeWidget ({ 5, 36}, {WW - 10, 65}, WidgetType::groupbox, WindowColour::primary, STR_VIEW_CLIPPING_VERTICAL_CLIPPING ), + makeSpinnerWidgets({ 90, 51}, { 79, 12}, WidgetType::spinner, WindowColour::primary, kStringIdNone, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE ), // clip height (3 widgets) + makeWidget ({ 11, 66}, { 158, 13}, WidgetType::scroll, WindowColour::primary, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP ), // clip height scrollbar + makeWidget ({ 11, 83}, { 159, 11}, WidgetType::checkbox, WindowColour::primary, STR_VIEW_CLIPPING_VERTICAL_CLIPPING_SEE_THROUGH, STR_VIEW_CLIPPING_VERTICAL_CLIPPING_SEE_THROUGH_TIP), // clip height enable/disable see-through check box + makeWidget ({ 5, 107}, {WW - 10, 60}, WidgetType::groupbox, WindowColour::primary, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING ), + makeWidget ({ 11, 122}, { 158, 17}, WidgetType::button, WindowColour::primary, STR_VIEW_CLIPPING_SELECT_AREA ), // selector + makeWidget ({ 11, 143}, { 158, 18}, WidgetType::button, WindowColour::primary, STR_VIEW_CLIPPING_CLEAR_SELECTION ) // clear ); // clang-format on diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 00f20e80c8..3be74a090c 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -46,12 +46,12 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _viewportWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget({ 0, 14}, { WW - 1, WH - 1}, WindowWidgetType::Resize, WindowColour::secondary ), // resize - makeWidget({ 3, 17}, {WW - 26, WH - 3}, WindowWidgetType::Viewport, WindowColour::primary ), // viewport - makeWidget({WW - 25, 17}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::primary , ImageId(SPR_G2_ZOOM_IN), STR_ZOOM_IN_TIP ), // zoom in - makeWidget({WW - 25, 41}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::primary , ImageId(SPR_G2_ZOOM_OUT), STR_ZOOM_OUT_TIP ), // zoom out - makeWidget({WW - 25, 65}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::primary , ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP), // locate - makeWidget({WW - 25, 89}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::primary , ImageId(SPR_ROTATE_ARROW),STR_LOCATE_SUBJECT_TIP) // rotate + makeWidget({ 0, 14}, { WW - 1, WH - 1}, WidgetType::resize, WindowColour::secondary ), // resize + makeWidget({ 3, 17}, {WW - 26, WH - 3}, WidgetType::viewport, WindowColour::primary ), // viewport + makeWidget({WW - 25, 17}, VIEWPORT_BUTTON, WidgetType::flatBtn, WindowColour::primary , ImageId(SPR_G2_ZOOM_IN), STR_ZOOM_IN_TIP ), // zoom in + makeWidget({WW - 25, 41}, VIEWPORT_BUTTON, WidgetType::flatBtn, WindowColour::primary , ImageId(SPR_G2_ZOOM_OUT), STR_ZOOM_OUT_TIP ), // zoom out + makeWidget({WW - 25, 65}, VIEWPORT_BUTTON, WidgetType::flatBtn, WindowColour::primary , ImageId(SPR_LOCATE), STR_LOCATE_SUBJECT_TIP), // locate + makeWidget({WW - 25, 89}, VIEWPORT_BUTTON, WidgetType::flatBtn, WindowColour::primary , ImageId(SPR_ROTATE_ARROW),STR_LOCATE_SUBJECT_TIP) // rotate ); // clang-format on diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 112fbab2ff..0e3d2f7665 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -42,9 +42,9 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _waterWidgets = makeWidgets( makeWindowShim(WINDOW_TITLE, WW, WH), - makeWidget ({16, 17}, {44, 32}, WindowWidgetType::ImgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0), kStringIdNone), // preview box - makeRemapWidget({17, 18}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP), // decrement size - makeRemapWidget({43, 32}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP) // increment size + makeWidget ({16, 17}, {44, 32}, WidgetType::imgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0), kStringIdNone), // preview box + makeRemapWidget({17, 18}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP), // decrement size + makeRemapWidget({43, 32}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP) // increment size ); // clang-format on diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index e82b526fa3..26e0ff8384 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -21,33 +21,33 @@ namespace OpenRCT2 using WidgetIndex = uint16_t; constexpr WidgetIndex kWidgetIndexNull = 0xFFFF; - enum class WindowWidgetType : uint8_t + enum class WidgetType : uint8_t { - Empty = 0, - Frame = 1, - Resize = 2, - ImgBtn = 3, - ColourBtn = 6, - TrnBtn = 7, - Tab = 8, - FlatBtn = 9, - Button = 10, - LabelCentred = 12, // Centred text - TableHeader = 13, // Left-aligned textual button - Label = 14, // Left-aligned text - Spinner = 15, - DropdownMenu = 16, - Viewport = 17, - Groupbox = 19, - Caption = 20, - CloseBox = 21, - Scroll = 22, - Checkbox = 23, - Placeholder = 25, - ProgressBar = 29, - Custom = 28, - TextBox = 27, - HorizontalSeparator = 30, + empty = 0, + frame = 1, + resize = 2, + imgBtn = 3, + colourBtn = 6, + trnBtn = 7, + tab = 8, + flatBtn = 9, + button = 10, + labelCentred = 12, // Centred text + tableHeader = 13, // Left-aligned textual button + label = 14, // Left-aligned text + spinner = 15, + dropdownMenu = 16, + viewport = 17, + groupbox = 19, + caption = 20, + closeBox = 21, + scroll = 22, + checkbox = 23, + placeholder = 25, + progressBar = 29, + custom = 28, + textBox = 27, + horizontalSeparator = 30, }; using WidgetFlags = uint32_t; @@ -75,7 +75,7 @@ namespace OpenRCT2 struct Widget { - WindowWidgetType type{}; + WidgetType type{}; uint8_t colour{}; int16_t left{}; int16_t right{}; diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index e0c59c7f6d..08be8c8628 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -227,7 +227,7 @@ static constexpr float kWindowScrollLocations[][2] = { for (i = 0; i < widget_index; i++) { const auto& widget = w.widgets[i]; - if (widget.type == WindowWidgetType::Scroll) + if (widget.type == WidgetType::scroll) result++; } return result; @@ -832,7 +832,7 @@ static constexpr float kWindowScrollLocations[][2] = { mainWind->height = height; viewport->width = width; viewport->height = height; - if (!mainWind->widgets.empty() && mainWind->widgets[WC_MAIN_WINDOW__0].type == WindowWidgetType::Viewport) + if (!mainWind->widgets.empty() && mainWind->widgets[WC_MAIN_WINDOW__0].type == WidgetType::viewport) { mainWind->widgets[WC_MAIN_WINDOW__0].right = width; mainWind->widgets[WC_MAIN_WINDOW__0].bottom = height; diff --git a/src/openrct2/interface/WindowBase.cpp b/src/openrct2/interface/WindowBase.cpp index 6da8b110bd..5db2a2fff4 100644 --- a/src/openrct2/interface/WindowBase.cpp +++ b/src/openrct2/interface/WindowBase.cpp @@ -77,7 +77,7 @@ namespace OpenRCT2 // Frame auto& frameWidget = widgets[0]; - if (frameWidget.type == WindowWidgetType::Frame) + if (frameWidget.type == WidgetType::frame) { frameWidget.right = width - 1; frameWidget.bottom = height - 1; @@ -85,13 +85,13 @@ namespace OpenRCT2 // Title/caption auto& titleWidget = widgets[1]; - bool hasTitleWidget = titleWidget.type == WindowWidgetType::Caption; + bool hasTitleWidget = titleWidget.type == WidgetType::caption; if (hasTitleWidget) titleWidget.right = width - 2; // Close button auto& closeButton = widgets[2]; - if (closeButton.type == WindowWidgetType::CloseBox || closeButton.type == WindowWidgetType::Empty) + if (closeButton.type == WidgetType::closeBox || closeButton.type == WidgetType::empty) { bool translucent = colours[closeButton.colour].hasFlag(ColourFlag::translucent); repositionCloseButton(closeButton, width, translucent); @@ -101,7 +101,7 @@ namespace OpenRCT2 if (widgets.size() >= 4) { auto& pageWidget = widgets[3]; - if (pageWidget.type == WindowWidgetType::Resize) + if (pageWidget.type == WidgetType::resize) { pageWidget.right = width - 1; pageWidget.bottom = height - 1;