Fixed bad merge from Master

This commit is contained in:
omar 2017-10-20 18:16:53 +02:00
parent 1172ff62e1
commit 0ea66dc260
1 changed files with 1 additions and 1 deletions

View File

@ -2383,7 +2383,7 @@ bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id)
return false;
if (!IsMouseHoveringRect(bb.Min, bb.Max))
return false;
if (!g.NavDisableMouseHover || !IsWindowContentHoverable(window, ImGuiHoveredFlags_Default))
if (g.NavDisableMouseHover || !IsWindowContentHoverable(window, ImGuiHoveredFlags_Default))
return false;
SetHoveredID(id);