mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-23 02:04:22 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
ocornut 2024-05-03 16:30:09 +02:00
commit 2f2d5070f5
7 changed files with 244 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui_widgets.cpp
View file

@ -1322,9 +1322,9 @@ void ImGui::ProgressBar(float fraction, const ImVec2& size_arg, const char* over
// Default displaying the fraction as percentage string, but user can override it
// Don't display text for indeterminate bars by default
char overlay_buf[32];
if (!is_indeterminate || overlay != NULL)
{
char overlay_buf[32];
if (!overlay)
{
ImFormatString(overlay_buf, IM_ARRAYSIZE(overlay_buf), "%.0f%%", fraction * 100 + 0.01f);