From 79ef64430c1f7089c96a41fe1b2abce0a5836900 Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Wed, 27 Sep 2017 17:27:21 +0200
Subject: [PATCH] Nav: Fixed merge cc26db8ec7f87a21b705fa9821a3c9f76003c7e5

---
 imgui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imgui.cpp b/imgui.cpp
index 0e33fc4d1..f6199c7df 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2226,7 +2226,7 @@ bool ImGui::IsItemHovered()
     if (g.HoveredWindow == window)
         if (g.ActiveId == 0 || g.ActiveId == window->DC.LastItemId || g.ActiveIdAllowOverlap || g.ActiveId == window->MoveId)
             if (IsMouseHoveringRect(window->DC.LastItemRect.Min, window->DC.LastItemRect.Max))
-                if (IsWindowContentHoverable(window))
+                if (!g.NavDisableMouseHover && IsWindowContentHoverable(window))
                     return true;
 
     return false;