Skip to content

refactor: break apart menu #1330

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
doodlum merged 3 commits into from
Jul 29, 2025
Merged

refactor: break apart menu #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
663ad1f
refactor: break apart menu
alandtse Jul 29, 2025
979ab72
chore: address ai comments
alandtse Jul 29, 2025
0ab4f7f
refactor: break apart DrawMenuVisitor::operator()
alandtse Jul 29, 2025
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
2 changes: 1 addition & 1 deletion src/Features/PerformanceOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void PerformanceOverlay::DrawSettings()
ImGui::Text("Opens performance overlay in a separate window that stays open\neven when the main menu is closed. ");
ImGui::Text("Toggle with ");
ImGui::SameLine();
ImGui::TextColored(themeSettings.StatusPalette.CurrentHotkey, "%s", Menu::KeyIdToString(menuSettings.OverlayToggleKey));
ImGui::TextColored(themeSettings.StatusPalette.CurrentHotkey, "%s", Util::Input::KeyIdToString(menuSettings.OverlayToggleKey));
}

if (this->settings.ShowInOverlay) {
Expand Down
5 changes: 2 additions & 3 deletions src/Features/VR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,6 @@ void VR::ProcessVRButtonEvent(const Menu::KeyEvent& event)

ImGuiIO& io = ImGui::GetIO();
(void)event;
auto menu = globals::menu;
bool isPrimary = RE::BSOpenVRControllerDevice::IsPrimaryController(event.device);
bool isSecondary = RE::BSOpenVRControllerDevice::IsSecondaryController(event.device);
bool& testMode = settings.VRMenuControllerDiagnosticsTestMode;
Expand All @@ -1726,8 +1725,8 @@ void VR::ProcessVRButtonEvent(const Menu::KeyEvent& event)
{ RE::BSOpenVRControllerDevice::Keys::kGrip, ImGuiMouseButton_Right, false, ImGuiKey_None, false },
{ RE::BSOpenVRControllerDevice::Keys::kTouchpadClick, ImGuiMouseButton_Middle, false, ImGuiKey_None, false },
{ RE::BSOpenVRControllerDevice::Keys::kJoystickTrigger, ImGuiMouseButton_Middle, false, ImGuiKey_None, false },
{ RE::BSOpenVRControllerDevice::Keys::kBY, -1, true, menu->VirtualKeyToImGuiKey(VK_TAB), isSecondary }, // Shift+Tab for secondary
{ RE::BSOpenVRControllerDevice::Keys::kXA, -1, true, menu->VirtualKeyToImGuiKey(VK_RETURN), false },
{ RE::BSOpenVRControllerDevice::Keys::kBY, -1, true, Util::Input::VirtualKeyToImGuiKey(VK_TAB), isSecondary }, // Shift+Tab for secondary
{ RE::BSOpenVRControllerDevice::Keys::kXA, -1, true, Util::Input::VirtualKeyToImGuiKey(VK_RETURN), false },
};

// Use separate state arrays for each controller
Expand Down
3 changes: 2 additions & 1 deletion src/Features/WeatherPicker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "Feature.h"
#include "Menu.h"
#include "Utils/Game.h"
#include "Utils/UI.h"
#include <nlohmann/json.hpp>

NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
Expand Down Expand Up @@ -46,7 +47,7 @@ void WeatherPicker::DrawSettings()
ImGui::Text("Opens weather details in a separate window that stays open\neven when the main menu is closed. ");
ImGui::Text("Toggle with ");
ImGui::SameLine();
ImGui::TextColored(themeSettings.StatusPalette.CurrentHotkey, "%s", Menu::KeyIdToString(menuSettings.OverlayToggleKey));
ImGui::TextColored(themeSettings.StatusPalette.CurrentHotkey, "%s", Util::Input::KeyIdToString(menuSettings.OverlayToggleKey));
}
ImGui::Spacing();

Expand Down
Loading