Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
This commit is contained in:
ocornut
2024-09-04 16:58:44 +02:00
16 changed files with 123 additions and 63 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.1 WIP
// dear imgui, v1.91.1
// (widgets code)
/*
@@ -8231,9 +8231,10 @@ int ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_get
const ImRect inner_bb(frame_bb.Min + style.FramePadding, frame_bb.Max - style.FramePadding);
const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0));
ItemSize(total_bb, style.FramePadding.y);
if (!ItemAdd(total_bb, 0, &frame_bb))
if (!ItemAdd(total_bb, id, &frame_bb, ImGuiItemFlags_NoNav))
return -1;
const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.InFlags);
bool hovered;
ButtonBehavior(frame_bb, id, &hovered, NULL);
// Determine scale from values if not specified
if (scale_min == FLT_MAX || scale_max == FLT_MAX)