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

Post-merge fixes

Browse source
This commit is contained in:
Pepe20129 2025-05-05 17:35:17 +02:00
commit a20250d3bc
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
soh/soh/Enhancements/mod_menu.cpp
View file

@ -1,10 +1,12 @@
#include "mod_menu.h" #include "mod_menu.h"
#include "utils/StringHelper.h" #include "utils/StringHelper.h"
#include <libultraship/classes.h> #include <libultraship/classes.h>
#include "soh/SohGui/SohGui.hpp"
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/resource/type/Skeleton.h" #include "soh/resource/type/Skeleton.h"
#include <map> #include <map>
#include <ranges> #include <ranges>
extern "C" void gfx_texture_cache_clear(); extern "C" void gfx_texture_cache_clear();
std::shared_ptr<Ship::ArchiveManager> GetArchiveManager() { std::shared_ptr<Ship::ArchiveManager> GetArchiveManager() {
@ -17,6 +19,9 @@ std::map<std::string, bool> modFiles;
#define CVAR_ENABLED_MODS_DEFAULT "" #define CVAR_ENABLED_MODS_DEFAULT ""
#define CVAR_ENABLED_MODS_VALUE CVarGetString(CVAR_ENABLED_MODS_NAME, CVAR_ENABLED_MODS_DEFAULT) #define CVAR_ENABLED_MODS_VALUE CVarGetString(CVAR_ENABLED_MODS_NAME, CVAR_ENABLED_MODS_DEFAULT)
// "|" was chosen as the separator due to
// it being an invalid character in NTFS
// and being rarely used in ext4
#define SEPARATOR "|" #define SEPARATOR "|"
void SaveEnabledModsCVarValue() { void SaveEnabledModsCVarValue() {
@ -129,7 +134,7 @@ void DrawEnabledMods() {
} }
for (std::string file : enabledMods) { for (std::string file : enabledMods) {
if (ImGui::ArrowButton(file.c_str(), ImGuiDir_Left)) { if (UIWidgets::StateButton(file.c_str(), ICON_FA_ARROW_LEFT, ImVec2(25, 25), UIWidgets::ButtonOptions().Color(THEME_COLOR))) {
modFiles[file] = false; modFiles[file] = false;
GetArchiveManager()->RemoveArchive(file); GetArchiveManager()->RemoveArchive(file);
AfterModChange(); AfterModChange();
@ -146,7 +151,7 @@ void DrawDisabledMods() {
} }
for (std::string file : disabledMods) { for (std::string file : disabledMods) {
if (ImGui::ArrowButton(file.c_str(), ImGuiDir_Right)) { if (UIWidgets::StateButton(file.c_str(), ICON_FA_ARROW_RIGHT, ImVec2(25, 25), UIWidgets::ButtonOptions().Color(THEME_COLOR))) {
modFiles[file] = true; modFiles[file] = true;
GetArchiveManager()->AddArchive(file); GetArchiveManager()->AddArchive(file);
AfterModChange(); AfterModChange();
@ -156,7 +161,9 @@ void DrawDisabledMods() {
} }
void ModMenuWindow::DrawElement() { void ModMenuWindow::DrawElement() {
if (ImGui::Button("Update")) { ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
if (UIWidgets::Button("Update", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
UpdateModFiles(); UpdateModFiles();
} }
@ -186,6 +193,8 @@ void ModMenuWindow::DrawElement() {
ImGui::EndTable(); ImGui::EndTable();
} }
ImGui::EndDisabled();
} }
void ModMenuWindow::InitElement() { void ModMenuWindow::InitElement() {

8
soh/soh/SohGui/SohMenuEnhancements.cpp
View file

@ -1758,6 +1758,14 @@ void SohMenu::AddMenuEnhancements() {
.CVar(timer.timeEnable) .CVar(timer.timeEnable)
.Callback([](WidgetInfo& info) { TimeDisplayUpdateDisplayOptions(); }); .Callback([](WidgetInfo& info) { TimeDisplayUpdateDisplayOptions(); });
} }
// Mod Menu
path.sidebarName = "Mod Menu";
AddSidebarEntry("Enhancements", path.sidebarName, 1);
AddWidget(path, "Toggle Mod Menu Window", WIDGET_WINDOW_BUTTON)
.CVar(CVAR_WINDOW("ModMenu"))
.WindowName("Mod Menu")
.Options(WindowButtonOptions().Tooltip("Enables the separate Mod Menu Window."));
} }
} // namespace SohGui } // namespace SohGui