Internals: Tooltips: renamed internal flags (expecting to expose later when we publish priority stuff).
diff --git a/imgui.cpp b/imgui.cpp
index f97ca3b..60ce9ec 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10065,12 +10065,12 @@
SetNextWindowPos(tooltip_pos);
SetNextWindowBgAlpha(g.Style.Colors[ImGuiCol_PopupBg].w * 0.60f);
//PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * 0.60f); // This would be nice but e.g ColorButton with checkboard has issue with transparent colors :(
- tooltip_flags |= ImGuiTooltipFlags_OverridePreviousTooltip;
+ tooltip_flags |= ImGuiTooltipFlags_OverridePrevious;
}
char window_name[16];
ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", g.TooltipOverrideCount);
- if (tooltip_flags & ImGuiTooltipFlags_OverridePreviousTooltip)
+ if (tooltip_flags & ImGuiTooltipFlags_OverridePrevious)
if (ImGuiWindow* window = FindWindowByName(window_name))
if (window->Active)
{
@@ -10096,7 +10096,7 @@
void ImGui::SetTooltipV(const char* fmt, va_list args)
{
- if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None))
+ if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePrevious, ImGuiWindowFlags_None))
return;
TextV(fmt, args);
EndTooltip();
diff --git a/imgui_internal.h b/imgui_internal.h
index f581867..af3b644 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -927,7 +927,7 @@
enum ImGuiTooltipFlags_
{
ImGuiTooltipFlags_None = 0,
- ImGuiTooltipFlags_OverridePreviousTooltip = 1 << 0, // Override will clear/ignore previously submitted tooltip (defaults to append)
+ ImGuiTooltipFlags_OverridePrevious = 1 << 1, // Clear/ignore previously submitted tooltip (defaults to append)
};
// FIXME: this is in development, not exposed/functional as a generic feature yet.
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 7e67d44..5445dc7 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -5831,7 +5831,7 @@
{
ImGuiContext& g = *GImGui;
- if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None))
+ if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePrevious, ImGuiWindowFlags_None))
return;
const char* text_end = text ? FindRenderedTextEnd(text, NULL) : text;
if (text_end > text)