Change menu toggle key behavior

TheIndra55 · Apr 3, 2022 · 0b8ccd8 · 0b8ccd8
1 parent 14c3448
commit 0b8ccd8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Hooking.cpp b/Hooking.cpp
@@ -712,14 +712,11 @@ LRESULT hooked_RegularWndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 
 	if (msg == WM_KEYUP && wparam == VK_F8)
 	{
-		// set menu focus
-		Hooking::GetInstance().GetMenu()->SetFocus(!Hooking::GetInstance().GetMenu()->IsFocus());
+		auto focus = menu->IsFocus();
 
-		// show menu if hidden
-		if (!menu->IsVisible())
-		{
-			menu->SetVisibility(true);
-		}
+		// set menu focus
+		menu->SetFocus(!focus);
+		menu->SetVisibility(!focus);
 
 		// disable game input
 #if TRAE

diff --git a/Menu.cpp b/Menu.cpp
@@ -348,6 +348,12 @@ void Menu::Process(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
     if (msg == WM_KEYUP && wparam == VK_F7)
     {
         m_visible = !m_visible;
+
+        // if menu is focussed and being hidden also stop focus
+        if (m_focus && !m_visible)
+        {
+            m_focus = false;
+        }
     }
 
     if (msg == WM_KEYUP && wparam == VK_F5)