mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-06 09:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2023-03-14 16:38:22 +01:00
parent 9937660b1c f3f6295d53
commit 9e30fb0ec1
10 changed files with 111 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
imgui_widgets.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.89.4 WIP
// dear imgui, v1.89.4
// (widgets code)
/*
@@ -5766,7 +5766,8 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags
{
ImGuiContext& g = *GImGui;
BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None);
if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None))
return;
const char* text_end = text ? FindRenderedTextEnd(text, NULL) : text;
if (text_end > text)
{