Skip to content

fix(mcm): navigator reliability and settings UI fixes #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codepuncher merged 2 commits into from
Jun 17, 2026
Merged

fix(mcm): navigator reliability and settings UI fixes #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cca3cb4
fix(mcm): allow EnsureCachePopulated to retry when SKI_ConfigManager …
codepuncher Jun 17, 2026
9b3d4f5
fix(menu-ui): fix IsFrameworkInstalled latch; snapshot mod cache on c…
codepuncher Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 37 additions & 25 deletions src/MCMNavigator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ namespace MCMNavigator
constexpr auto kModListPanel = "_root.ConfigPanelFader.configPanel.contentHolder.modListPanel.";
constexpr auto kModList = "_root.ConfigPanelFader.configPanel.contentHolder.modListPanel.modListFader.list.";

constexpr auto kGfxAlpha = "_root.ConfigPanelFader.configPanel._alpha";
constexpr auto kGfxSetState = "_root.ConfigPanelFader.configPanel.contentHolder.modListPanel.setState";
constexpr auto kGfxDisableSelect = "_root.ConfigPanelFader.configPanel.contentHolder.modListPanel.modListFader.list.disableSelection";
constexpr auto kGfxTitleText = "_root.ConfigPanelFader.configPanel.contentHolder.modListPanel._titleText";
constexpr auto kGfxState = "_root.ConfigPanelFader.configPanel.contentHolder.modListPanel._state";

bool CaseInsensitiveLess(const std::string& a, const std::string& b)
{
return std::ranges::lexicographical_compare(
Expand Down Expand Up @@ -106,15 +112,15 @@ namespace MCMNavigator
return true;
}

std::vector<std::string> CollectEntryNames(RE::GFxMovieView* view, const std::string& listPath, const char* memberName)
std::vector<std::string> CollectEntryNames(RE::GFxMovieView* view, const char* listPath, const char* memberName)
{
std::vector<std::string> names;
if (!view) {
return names;
}

RE::GFxValue listObj;
view->GetVariable(&listObj, listPath.c_str());
view->GetVariable(&listObj, listPath);
if (!listObj.IsObject()) {
return names;
}
Expand Down Expand Up @@ -142,15 +148,15 @@ namespace MCMNavigator
}

// Uses doSetSelectedIndex + onItemPress to select and click the entry.
bool SelectEntryByName(const std::string& listPath, const char* varName, std::string_view targetName)
bool SelectEntryByName(const char* listPath, const char* varName, std::string_view targetName)
{
auto* view = GetJournalView();
if (!view) {
return false;
}

RE::GFxValue listObj;
view->GetVariable(&listObj, listPath.c_str());
view->GetVariable(&listObj, listPath);
if (!listObj.IsObject()) {
return false;
}
Expand Down Expand Up @@ -207,9 +213,8 @@ namespace MCMNavigator
if (!view) {
return;
}
RE::GFxValue arg{ 4.0 }; // TRANSITION_TO_LIST state
const std::string setStatePath = std::string{ kModListPanel } + "setState";
view->Invoke(setStatePath.c_str(), nullptr, &arg, 1);
RE::GFxValue arg{ 4.0 }; // TRANSITION_TO_LIST state
view->Invoke(kGfxSetState, nullptr, &arg, 1);
}

void OpenMod()
Expand All @@ -228,9 +233,8 @@ namespace MCMNavigator

// Poll disableSelection — list is animating, not ready yet.
// Also retry if the mod list path doesn't resolve (MCM may still be fading in).
RE::GFxValue disabled;
const std::string disablePath = std::string{ kModList } + "disableSelection";
view->GetVariable(&disabled, disablePath.c_str());
RE::GFxValue disabled;
view->GetVariable(&disabled, kGfxDisableSelect);
if (!disabled.IsBool() || disabled.GetBool()) {
if (!DelayCallForUI(OpenMod, kModRetryFrames)) {
g_lock = false;
Expand All @@ -240,7 +244,7 @@ namespace MCMNavigator

// List is ready — but _entryList may still be empty if SkyUI hasn't
// populated the data yet. Retry until we have at least one entry.
auto mods = CollectEntryNames(view, std::string{ kModList }, "text");
auto mods = CollectEntryNames(view, kModList, "text");
if (mods.empty()) {
if (!DelayCallForUI(OpenMod, kModRetryFrames)) {
g_lock = false;
Expand All @@ -251,10 +255,8 @@ namespace MCMNavigator
std::ranges::sort(mods, CaseInsensitiveLess);
{
std::scoped_lock lock(g_cacheMutex);
if (g_modCache.empty()) {
g_modCache = std::move(mods);
logger::debug("MCMNavigator: cached {} mod names", g_modCache.size());
}
g_modCache = std::move(mods);
logger::debug("MCMNavigator: cached {} mod names from GFx", g_modCache.size());
}

if (!SelectEntryByName(kModList, "text", g_target.modName)) {
Expand All @@ -272,9 +274,8 @@ namespace MCMNavigator
if (!view) {
return false;
}
RE::GFxValue titleText;
const std::string titlePath = std::string{ kModListPanel } + "_titleText";
view->GetVariable(&titleText, titlePath.c_str());
RE::GFxValue titleText;
view->GetVariable(&titleText, kGfxTitleText);
return titleText.IsString() && HoldFast::CaseInsensitiveEqual(modName, titleText.GetString());
}

Expand All @@ -284,7 +285,7 @@ namespace MCMNavigator
if (!view || !IsMCMOpen()) {
return;
}
auto names = CollectEntryNames(view, std::string{ kModList }, "text");
auto names = CollectEntryNames(view, kModList, "text");
std::ranges::sort(names, CaseInsensitiveLess);
if (names.empty()) {
return;
Expand Down Expand Up @@ -354,9 +355,8 @@ namespace MCMNavigator
if (!view) {
return false;
}
RE::GFxValue alpha;
const std::string alphaPath = std::string{ kConfigPanel } + "_alpha";
view->GetVariable(&alpha, alphaPath.c_str());
RE::GFxValue alpha;
view->GetVariable(&alpha, kGfxAlpha);
return alpha.IsNumber() && alpha.GetNumber() == 100.0;
}

Expand All @@ -366,9 +366,8 @@ namespace MCMNavigator
if (!view) {
return false;
}
RE::GFxValue state;
const std::string statePath = std::string{ kModListPanel } + "_state";
view->GetVariable(&state, statePath.c_str());
RE::GFxValue state;
view->GetVariable(&state, kGfxState);
return state.IsNumber() && state.GetNumber() == 2.0;
}

Expand Down Expand Up @@ -433,6 +432,19 @@ namespace MCMNavigator
~ClearPapyrusPending() { g_papyrusPending = false; }
} clearPapyrusPending;

// Reset the eager-scheduled latch on any non-terminal exit so EnsureCachePopulated
// can retry. Terminal exits set g_skyUICacheDone = true, which suppresses the reset.
// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
const struct ClearEagerScheduled
{
Comment thread
codepuncher marked this conversation as resolved.
~ClearEagerScheduled()
{
if (!g_skyUICacheDone) {
g_papyrusEagerScheduled = false;
}
}
} clearEagerScheduled;

if (g_skyUICacheDone) {
return;
}
Expand Down
21 changes: 17 additions & 4 deletions src/MenuUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ namespace
{
bool IsFrameworkInstalled()
{
static const bool installed = SKSEMenuFramework::IsInstalled();
static std::atomic<bool> installed{ false };
if (!installed && SKSEMenuFramework::IsInstalled()) {
installed = true;
}
return installed;
}

Expand Down Expand Up @@ -144,25 +147,35 @@ namespace

const char* preview = modName.empty() || modName == HoldFast::kNoneName ? "None" : modName.c_str();

static const char* s_openLabel = nullptr;
static std::vector<std::string> s_cachedNames;

if (!ImGuiMCP::BeginCombo(modLabel, preview)) {
if (s_openLabel == modLabel) {
s_openLabel = nullptr;
s_cachedNames.clear();
}
return;
}

const auto cachedMods = MCMNavigator::GetCachedModNames();
if (s_openLabel != modLabel) {
s_openLabel = modLabel;
s_cachedNames = MCMNavigator::GetCachedModNames();
}

const bool noneSelected = modName.empty() || modName == HoldFast::kNoneName;
if (ImGuiMCP::Selectable("None", noneSelected)) {
modName = HoldFast::kNoneName;
changed = true;
}

if (cachedMods.empty()) {
if (s_cachedNames.empty()) {
ImGuiMCP::Selectable("(Open MCM once to populate)", false, ImGuiMCP::ImGuiSelectableFlags_Disabled);
ImGuiMCP::EndCombo();
return;
}

for (const auto& opt : cachedMods) {
for (const auto& opt : s_cachedNames) {
if (ImGuiMCP::Selectable(opt.c_str(), HoldFast::CaseInsensitiveEqual(opt, modName))) {
modName = opt;
changed = true;
Expand Down
Loading