From e138e2fa111d3720fbe029bf008aa665cc444a5d Mon Sep 17 00:00:00 2001 From: Andreas Maerten <24669514+Yimura@users.noreply.github.com> Date: Sat, 15 Apr 2023 17:40:17 +0200 Subject: [PATCH] feat(ContextMenu): disable if GUI is open (#1239) --- src/services/context_menu/context_menu_service.cpp | 5 +++++ src/views/view_context_menu.cpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/services/context_menu/context_menu_service.cpp b/src/services/context_menu/context_menu_service.cpp index 05dd5fd2..084aad11 100644 --- a/src/services/context_menu/context_menu_service.cpp +++ b/src/services/context_menu/context_menu_service.cpp @@ -300,6 +300,11 @@ namespace big { while (g_running) { + if (g_gui->is_open()) + { + script::get_current()->yield(); + continue; + } if (!g.context_menu.enabled) { g_context_menu_service->enabled = false; diff --git a/src/views/view_context_menu.cpp b/src/views/view_context_menu.cpp index ec2c751d..f49e52a1 100644 --- a/src/views/view_context_menu.cpp +++ b/src/views/view_context_menu.cpp @@ -1,3 +1,4 @@ +#include "gui.hpp" #include "services/context_menu/context_menu_service.hpp" #include "view.hpp" @@ -26,7 +27,7 @@ namespace big void view::context_menu() { - if (const auto draw_list = ImGui::GetBackgroundDrawList(); draw_list) + if (const auto draw_list = ImGui::GetBackgroundDrawList(); draw_list && !g_gui->is_open()) { if (g_context_menu_service->enabled && g_context_menu_service->m_pointer && g_context_menu_service->m_pointer->m_navigation)