From 252f0941014a53e52eaade05cef3968858914020 Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Sun, 21 Aug 2016 15:26:40 +0200
Subject: [PATCH] Nav: Undo 87eb749cbc, agressively including nav focus test in
 IsItemHovered() (#323)

---
 imgui.cpp      | 17 +++++++----------
 imgui.h        |  3 +--
 imgui_demo.cpp |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index f2d08b29..f6a39491 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3942,6 +3942,9 @@ void ImGui::CaptureMouseFromApp(bool capture)
 bool ImGui::IsItemHovered()
 {
     ImGuiWindow* window = GetCurrentWindowRead();
+    ImGuiContext& g = *GImGui;
+    if (g.NavDisableMouseHover)
+        return IsItemFocused();
     return window->DC.LastItemHoveredAndUsable;
 }
 
@@ -3968,12 +3971,6 @@ bool ImGui::IsItemFocused()
     return g.NavId && !g.NavDisableHighlight && g.NavId == g.CurrentWindow->DC.LastItemId;
 }
 
-bool ImGui::IsItemHoveredOrFocused()
-{
-    ImGuiContext& g = *GImGui;
-    return g.NavDisableMouseHover ? IsItemFocused() : IsItemHovered();
-}
-
 bool ImGui::IsItemClicked(int mouse_button)
 {
     return IsMouseClicked(mouse_button) && IsItemHovered();
@@ -9889,7 +9886,7 @@ bool ImGui::ColorButton(const ImVec4& col, bool small_height, bool outline_borde
     RenderNavHighlight(bb, id);
     RenderFrame(bb.Min, bb.Max, GetColorU32(col), outline_border, style.FrameRounding);
 
-    if (IsItemHoveredOrFocused())
+    if (IsItemHovered())
         SetTooltip("Color:\n(%.2f,%.2f,%.2f,%.2f)\n#%02X%02X%02X%02X", col.x, col.y, col.z, col.w, IM_F32_TO_INT8_SAT(col.x), IM_F32_TO_INT8_SAT(col.y), IM_F32_TO_INT8_SAT(col.z), IM_F32_TO_INT8_SAT(col.z));
 
     return pressed;
@@ -10007,7 +10004,7 @@ bool ImGui::ColorEdit4(const char* label, float col[4], bool alpha)
         g.ColorEditModeStorage.SetInt(id, (edit_mode + 1) % 3); // Don't set local copy of 'edit_mode' right away!
 
     // Recreate our own tooltip over's ColorButton() one because we want to display correct alpha here
-    if (IsItemHoveredOrFocused())
+    if (IsItemHovered())
         SetTooltip("Color:\n(%.2f,%.2f,%.2f,%.2f)\n#%02X%02X%02X%02X", col[0], col[1], col[2], col[3], IM_F32_TO_INT8_SAT(col[0]), IM_F32_TO_INT8_SAT(col[1]), IM_F32_TO_INT8_SAT(col[2]), IM_F32_TO_INT8_SAT(col[3]));
 
     if (window->DC.ColorEditMode == ImGuiColorEditMode_UserSelectShowButton)
@@ -10666,7 +10663,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
                     }
                     ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL;
                     bool pcmd_node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "Draw %-4d %s vtx, tex = %p, clip_rect = (%.0f,%.0f)..(%.0f,%.0f)", pcmd->ElemCount, draw_list->IdxBuffer.Size > 0 ? "indexed" : "non-indexed", pcmd->TextureId, pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
-                    if (show_clip_rects && ImGui::IsItemHoveredOrFocused())
+                    if (show_clip_rects && ImGui::IsItemHovered())
                     {
                         ImRect clip_rect = pcmd->ClipRect;
                         ImRect vtxs_rect;
@@ -10690,7 +10687,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
                                 buf_p += sprintf(buf_p, "%s %04d { pos = (%8.2f,%8.2f), uv = (%.6f,%.6f), col = %08X }\n", (n == 0) ? "vtx" : "   ", vtx_i, v.pos.x, v.pos.y, v.uv.x, v.uv.y, v.col);
                             }
                             ImGui::Selectable(buf, false);
-                            if (ImGui::IsItemHoveredOrFocused())
+                            if (ImGui::IsItemHovered())
                                 overlay_draw_list->AddPolyline(triangles_pos, 3, IM_COL32(255,255,0,255), true, 1.0f, false);  // Add triangle without AA, more readable for large-thin triangle
                         }
                     ImGui::TreePop();
diff --git a/imgui.h b/imgui.h
index 02bec568..dfb0e5ce 100644
--- a/imgui.h
+++ b/imgui.h
@@ -395,11 +395,10 @@ namespace ImGui
     IMGUI_API void          PopClipRect();
 
     // Utilities
-    IMGUI_API bool          IsItemHovered();                                                    // is the last item hovered by mouse, and usable?
+    IMGUI_API bool          IsItemHovered();                                                    // is the last item hovered by mouse (and usable)? or we are currently using Nav and the item is focused.
     IMGUI_API bool          IsItemHoveredRect();                                                // is the last item hovered by mouse? even if another item is active or window is blocked by popup while we are hovering this
     IMGUI_API bool          IsItemActive();                                                     // is the last item active? (e.g. button being held, text field being edited- items that don't interact will always return false)
     IMGUI_API bool          IsItemFocused();                                                    // is the last item focused for keyboard/gamepad navigation?
-    IMGUI_API bool          IsItemHoveredOrFocused();                                           // select best suitable between IsItemHovered() when mouse is used and IsItemFocused() when navigation is used. useful for tooltips that needs to work with both controls.
     IMGUI_API bool          IsItemClicked(int mouse_button = 0);                                // is the last item clicked? (e.g. button/node just clicked on)
     IMGUI_API bool          IsItemVisible();                                                    // is the last item visible? (aka not out of sight due to clipping/scrolling.)
     IMGUI_API bool          IsAnyItemHovered();
diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index ff946e06..6dc663b3 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -763,7 +763,7 @@ void ImGui::ShowTestWindow(bool* p_open)
         }
     }
 
-    if (ImGui::CollapsingHeader("Graphs widgets"))
+    if (ImGui::CollapsingHeader("Plots widgets"))
     {
         static bool animate = true;
         ImGui::Checkbox("Animate", &animate);