1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-09-24 11:38:34 +02:00

Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined

This commit is contained in:
omar 2017-08-26 00:31:17 +08:00
parent 92a6faca6f
commit a02210a455

View File

@ -3607,7 +3607,7 @@ bool ImGui::BeginPopupContextWindow(const char* str_id, int mouse_button, bool a
{ {
if (!str_id) if (!str_id)
str_id = "window_context"; str_id = "window_context";
if (IsMouseHoveringWindow() && IsMouseClicked(mouse_button)) if (IsWindowRectHovered() && IsMouseClicked(mouse_button))
if (also_over_items || !IsAnyItemHovered()) if (also_over_items || !IsAnyItemHovered())
OpenPopupEx(GImGui->CurrentWindow->GetID(str_id), true); OpenPopupEx(GImGui->CurrentWindow->GetID(str_id), true);
return BeginPopup(str_id); return BeginPopup(str_id);
@ -3617,7 +3617,7 @@ bool ImGui::BeginPopupContextVoid(const char* str_id, int mouse_button)
{ {
if (!str_id) if (!str_id)
str_id = "void_context"; str_id = "void_context";
if (!IsMouseHoveringAnyWindow() && IsMouseClicked(mouse_button)) if (!IsAnyWindowHovered() && IsMouseClicked(mouse_button))
OpenPopupEx(GImGui->CurrentWindow->GetID(str_id), true); OpenPopupEx(GImGui->CurrentWindow->GetID(str_id), true);
return BeginPopup(str_id); return BeginPopup(str_id);
} }