mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Close #13376: Open custom window at specified tab

Browse Source
This commit is contained in:
Sadret
2020-11-05 17:43:23 +01:00
committed by GitHub
parent eea57f2bfe
commit 2f4b1b9e3f
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
distribution/changelog.txt
View File

@@ -1,9 +1,10 @@
0.3.2+ (in development) 0.3.2+ (in development)
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Feature: [#13057] Make GameAction flags accessible by plugins. - Feature: [#13057] Make GameAction flags accessible by plugins.
- Change: [#13346] Change FootpathScenery to FootpathAddition in all occurrences - Feature: [#13376] Open custom window at specified tab.
- Fix: [#13334] Uninitialised variables in CustomTabDesc - Change: [#13346] Change FootpathScenery to FootpathAddition in all occurrences.
- Fix: [#13342] Rename tabChange to onTabChange in WindowDesc interface - Fix: [#13334] Uninitialised variables in CustomTabDesc.
- Fix: [#13342] Rename tabChange to onTabChange in WindowDesc interface.
- Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths. - Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths.
0.3.2 (2020-11-01) 0.3.2 (2020-11-01)

1
distribution/openrct2.d.ts vendored
View File

@@ -1866,6 +1866,7 @@ declare global {
widgets?: Widget[]; widgets?: Widget[];
colours?: number[]; colours?: number[];
tabs?: WindowTabDesc[]; tabs?: WindowTabDesc[];
tabIndex: number;
onClose?: () => void; onClose?: () => void;
onUpdate?: () => void; onUpdate?: () => void;

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

@@ -244,6 +244,7 @@ namespace OpenRCT2::Ui::Windows
std::vector<CustomWidgetDesc> Widgets; std::vector<CustomWidgetDesc> Widgets;
std::vector<colour_t> Colours; std::vector<colour_t> Colours;
std::vector<CustomTabDesc> Tabs; std::vector<CustomTabDesc> Tabs;
std::optional<int32_t> TabIndex;
// Event handlers // Event handlers
DukValue OnClose; DukValue OnClose;
@@ -271,6 +272,7 @@ namespace OpenRCT2::Ui::Windows
result.MaxHeight = GetOptionalInt(desc["maxHeight"]); result.MaxHeight = GetOptionalInt(desc["maxHeight"]);
result.Title = language_convert_string(desc["title"].as_string()); result.Title = language_convert_string(desc["title"].as_string());
result.Id = GetOptionalInt(desc["id"]); result.Id = GetOptionalInt(desc["id"]);
result.TabIndex = GetOptionalInt(desc["tabIndex"]);
if (desc["widgets"].is_array()) if (desc["widgets"].is_array())
{ {
@@ -392,6 +394,9 @@ namespace OpenRCT2::Ui::Windows
window->custom_info = new CustomWindowInfo(owner, desc); window->custom_info = new CustomWindowInfo(owner, desc);
window->enabled_widgets = (1 << WIDX_CLOSE); window->enabled_widgets = (1 << WIDX_CLOSE);
// Set window tab
window->page = desc.TabIndex.value_or(0);
// Set window colours // Set window colours
window->colours[0] = COLOUR_GREY; window->colours[0] = COLOUR_GREY;
window->colours[1] = COLOUR_GREY; window->colours[1] = COLOUR_GREY;

2
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -43,7 +43,7 @@
using namespace OpenRCT2; using namespace OpenRCT2;
using namespace OpenRCT2::Scripting; using namespace OpenRCT2::Scripting;
static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 9; static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 10;
struct ExpressionStringifier final struct ExpressionStringifier final
{ {