mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 02:42:18 -05:00
Code Issues Projects Releases Wiki Activity

Update SoH's input editor window for the gui rework, and set it as what's opened by the Controller Configuration button. (#4352)

Browse Source
This commit is contained in:
Malkierian 2024-10-10 16:11:19 -07:00 committed by GitHub
parent 7891ac2d6a
commit a6110dbc51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View File

@ -2145,7 +2145,6 @@ void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) {
} }
void SohInputEditorWindow::DrawElement() { void SohInputEditorWindow::DrawElement() {
ImGui::Begin("Controller Configuration###sohControllerConfigWindowV1", &mIsVisible);
ImGui::BeginTabBar("##ControllerConfigPortTabs"); ImGui::BeginTabBar("##ControllerConfigPortTabs");
DrawLinkTab(); DrawLinkTab();
DrawIvanTab(); DrawIvanTab();
@ -2154,5 +2153,4 @@ void SohInputEditorWindow::DrawElement() {
DrawDebugPortTab(3); DrawDebugPortTab(3);
} }
ImGui::EndTabBar(); ImGui::EndTabBar();
ImGui::End();
} }

2
soh/soh/OTRGlobals.cpp
View File

@ -336,7 +336,7 @@ OTRGlobals::OTRGlobals() {
context->InitCrashHandler(); context->InitCrashHandler();
context->InitConsole(); context->InitConsole();
auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>(CVAR_CONTROLLER_CONFIGURATION_WINDOW_OPEN, "Input Editor"); auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>(CVAR_CONTROLLER_CONFIGURATION_WINDOW_OPEN, "Controller Configuration");
context->InitWindow({ sohInputEditorWindow }); context->InitWindow({ sohInputEditorWindow });
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();

2
soh/soh/SohGui.cpp
View File

@ -161,7 +161,7 @@ namespace SohGui {
SPDLOG_ERROR("Could not find console window"); SPDLOG_ERROR("Could not find console window");
} }
mInputEditorWindow = gui->GetGuiWindow("Input Editor"); mInputEditorWindow = gui->GetGuiWindow("Controller Configuration");
if (mInputEditorWindow == nullptr) { if (mInputEditorWindow == nullptr) {
SPDLOG_ERROR("Could not find input editor window"); SPDLOG_ERROR("Could not find input editor window");
} }