github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change soh override windows to use different cvar name (#5208)

Browse source
This commit is contained in:
Archez 2025-03-25 04:20:08 -04:00 • committed by GitHub
commit 890f3ccee6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/SohGui/SohGui.cpp
View file

@ -125,10 +125,10 @@ namespace SohGui {
SPDLOG_ERROR("Could not find stats window"); SPDLOG_ERROR("Could not find stats window");
} }
mConsoleWindow = std::make_shared<SohConsoleWindow>(CVAR_WINDOW("Console"), "Console##SoH", ImVec2(820, 630)); mConsoleWindow = std::make_shared<SohConsoleWindow>(CVAR_WINDOW("SohConsole"), "Console##SoH", ImVec2(820, 630));
gui->AddGuiWindow(mConsoleWindow); gui->AddGuiWindow(mConsoleWindow);
mGfxDebuggerWindow = std::make_shared<SohGfxDebuggerWindow>(CVAR_WINDOW("GfxDebugger"), "GfxDebugger##SoH", ImVec2(820, 630)); mGfxDebuggerWindow = std::make_shared<SohGfxDebuggerWindow>(CVAR_WINDOW("SohGfxDebugger"), "GfxDebugger##SoH", ImVec2(820, 630));
gui->AddGuiWindow(mGfxDebuggerWindow); gui->AddGuiWindow(mGfxDebuggerWindow);
mInputEditorWindow = gui->GetGuiWindow("Controller Configuration"); mInputEditorWindow = gui->GetGuiWindow("Controller Configuration");

2
soh/soh/SohGui/SohMenuBar.cpp
View file

@ -84,8 +84,6 @@ namespace SohGui {
std::unordered_map<Ship::WindowBackend, const char*> availableWindowBackendsMap; std::unordered_map<Ship::WindowBackend, const char*> availableWindowBackendsMap;
Ship::WindowBackend configWindowBackend; Ship::WindowBackend configWindowBackend;
extern std::shared_ptr<Ship::GuiWindow> mGfxDebuggerWindow;
void DrawSettingsMenu() { void DrawSettingsMenu() {
} }

4
soh/soh/SohGui/SohMenuDevTools.cpp
View file

@ -98,7 +98,7 @@ void SohMenu::AddMenuDevTools() {
path.sidebarName = "Console"; path.sidebarName = "Console";
AddSidebarEntry("Dev Tools", path.sidebarName, 1); AddSidebarEntry("Dev Tools", path.sidebarName, 1);
AddWidget(path, "Popout Console", WIDGET_WINDOW_BUTTON) AddWidget(path, "Popout Console", WIDGET_WINDOW_BUTTON)
.CVar(CVAR_WINDOW("Console")) .CVar(CVAR_WINDOW("SohConsole"))
.WindowName("Console##SoH") .WindowName("Console##SoH")
.Options(WindowButtonOptions().Tooltip("Enables the separate Console Window.")); .Options(WindowButtonOptions().Tooltip("Enables the separate Console Window."));
@ -162,7 +162,7 @@ void SohMenu::AddMenuDevTools() {
path.sidebarName = "Gfx Debugger"; path.sidebarName = "Gfx Debugger";
AddSidebarEntry("Dev Tools", path.sidebarName, 1); AddSidebarEntry("Dev Tools", path.sidebarName, 1);
AddWidget(path, "Popout Gfx Debugger", WIDGET_WINDOW_BUTTON) AddWidget(path, "Popout Gfx Debugger", WIDGET_WINDOW_BUTTON)
.CVar(CVAR_WINDOW("GfxDebugger")) .CVar(CVAR_WINDOW("SohGfxDebugger"))
.WindowName("GfxDebugger##SoH") .WindowName("GfxDebugger##SoH")
.Options(WindowButtonOptions().Tooltip("Enables the separate Gfx Debugger Window.")); .Options(WindowButtonOptions().Tooltip("Enables the separate Gfx Debugger Window."));
} }