Allow pressing shift to not hide menu

TheIndra55 · Mar 16, 2024 · ca07aa1 · ca07aa1
1 parent 44df0c8
commit ca07aa1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/menu/Menu.cpp b/src/menu/Menu.cpp
@@ -63,7 +63,7 @@ void Menu::OnPresent()
 	ImGui::NewFrame();
 
 	// Draw the menu
-	if (m_focus)
+	if (m_visible)
 	{
 		Draw();
 	}
@@ -79,7 +79,7 @@ void Menu::OnMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	if (msg == WM_KEYUP && wParam == VK_F8)
 	{
-		SetFocus(!m_focus);
+		SetFocus(!m_focus, ImGui::IsKeyDown(ImGuiKey_LeftShift));
 	}
 
 	if (m_focus)
@@ -92,7 +92,7 @@ void Menu::Draw() noexcept
 {
 	auto& modules = Hook::GetInstance().GetModules();
 
-	if (ImGui::BeginMainMenuBar())
+	if (m_focus && ImGui::BeginMainMenuBar())
 	{
 		// Draw all modules menus
 		for (auto& [hash, mod] : modules)
@@ -131,9 +131,15 @@ void Menu::DrawMenu() noexcept
 	}
 }
 
-void Menu::SetFocus(bool focus) noexcept
+void Menu::SetFocus(bool focus, bool dontHide) noexcept
 {
 	m_focus = focus;
+	m_visible = focus;
+
+	if (!focus && dontHide)
+	{
+		m_visible = true;
+	}
 
 	// Disable the cursor lock and game input
 	MouseHook::DisableCursorLock(focus);

diff --git a/src/menu/Menu.h b/src/menu/Menu.h
@@ -8,6 +8,8 @@ class Menu : public cdc::PCInternalResource
 {
 private:
 	bool m_initialized = false;
+
+	bool m_visible = false;
 	bool m_focus = false;
 
 public:
@@ -19,7 +21,7 @@ class Menu : public cdc::PCInternalResource
 	bool OnCreateDevice();
 	void OnDestroyDevice();
 
-	void SetFocus(bool focus) noexcept;
+	void SetFocus(bool focus, bool dontHide = false) noexcept;
 	bool HasFocus() const noexcept;
 
 private: