Skip to content

Commit da6857f

Browse files
committed
update imgui to 1.92.2b
1 parent 7cd36c4 commit da6857f

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

imgui/backend/imgui_impl_dx11.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,8 @@ void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
212212
return;
213213
ImDrawVert* vtx_dst = (ImDrawVert*)vtx_resource.pData;
214214
ImDrawIdx* idx_dst = (ImDrawIdx*)idx_resource.pData;
215-
for (int n = 0; n < draw_data->CmdListsCount; n++)
215+
for (const ImDrawList* draw_list : draw_data->CmdLists)
216216
{
217-
const ImDrawList* draw_list = draw_data->CmdLists[n];
218217
memcpy(vtx_dst, draw_list->VtxBuffer.Data, draw_list->VtxBuffer.Size * sizeof(ImDrawVert));
219218
memcpy(idx_dst, draw_list->IdxBuffer.Data, draw_list->IdxBuffer.Size * sizeof(ImDrawIdx));
220219
vtx_dst += draw_list->VtxBuffer.Size;
@@ -286,9 +285,8 @@ void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
286285
int global_vtx_offset = 0;
287286
ImVec2 clip_off = draw_data->DisplayPos;
288287
ImVec2 clip_scale = draw_data->FramebufferScale;
289-
for (int n = 0; n < draw_data->CmdListsCount; n++)
288+
for (const ImDrawList* draw_list : draw_data->CmdLists)
290289
{
291-
const ImDrawList* draw_list = draw_data->CmdLists[n];
292290
for (int cmd_i = 0; cmd_i < draw_list->CmdBuffer.Size; cmd_i++)
293291
{
294292
const ImDrawCmd* pcmd = &draw_list->CmdBuffer[cmd_i];

imgui/binding/scripts/gen-enum.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$MetadataFileUri = "https://github.com/dearimgui/dear_bindings/releases/download/DearBindings_v0.16_ImGui_v1.92.1/dcimgui.json"
1+
$MetadataFileUri = "https://github.com/dearimgui/dear_bindings/releases/download/DearBindings_v0.16_ImGui_v1.92.2b/dcimgui.json"
22
$MetadataFile = "$PSScriptRoot/dcimgui.json"
3-
$MetadataFileHash = "5EE38CC7D175CCC5AEBB259B4BC970DE925E36FA7D3CBD03599E20A4195920CE"
3+
$MetadataFileHash = "807766655109B4BE4447A80F438ADE642088630E90CD57243043C1664A6A808C"
44
$CurrentMetadataFileHash = ""
55

66
Write-Output "Expected metadata file hash: $MetadataFileHash"

imgui/binding/src/Constants.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void imgui::binding::registerConstants(lua_State* const vm) {
161161
ctx.set_map_value(e, "HeightMask_"sv, ImGuiComboFlags_HeightMask_);
162162
}
163163
{
164-
auto const e = ctx.create_map(12);
164+
auto const e = ctx.create_map(14);
165165
ctx.set_map_value(m, "ImGuiTabBarFlags"sv, e);
166166
ctx.set_map_value(e, "None"sv, ImGuiTabBarFlags_None);
167167
ctx.set_map_value(e, "Reorderable"sv, ImGuiTabBarFlags_Reorderable);
@@ -171,7 +171,8 @@ void imgui::binding::registerConstants(lua_State* const vm) {
171171
ctx.set_map_value(e, "NoTabListScrollingButtons"sv, ImGuiTabBarFlags_NoTabListScrollingButtons);
172172
ctx.set_map_value(e, "NoTooltip"sv, ImGuiTabBarFlags_NoTooltip);
173173
ctx.set_map_value(e, "DrawSelectedOverline"sv, ImGuiTabBarFlags_DrawSelectedOverline);
174-
ctx.set_map_value(e, "FittingPolicyResizeDown"sv, ImGuiTabBarFlags_FittingPolicyResizeDown);
174+
ctx.set_map_value(e, "FittingPolicyMixed"sv, ImGuiTabBarFlags_FittingPolicyMixed);
175+
ctx.set_map_value(e, "FittingPolicyShrink"sv, ImGuiTabBarFlags_FittingPolicyShrink);
175176
ctx.set_map_value(e, "FittingPolicyScroll"sv, ImGuiTabBarFlags_FittingPolicyScroll);
176177
ctx.set_map_value(e, "FittingPolicyMask_"sv, ImGuiTabBarFlags_FittingPolicyMask_);
177178
ctx.set_map_value(e, "FittingPolicyDefault_"sv, ImGuiTabBarFlags_FittingPolicyDefault_);
@@ -545,7 +546,7 @@ void imgui::binding::registerConstants(lua_State* const vm) {
545546
ctx.set_map_value(e, "COUNT"sv, ImGuiCol_COUNT);
546547
}
547548
{
548-
auto const e = ctx.create_map(37);
549+
auto const e = ctx.create_map(39);
549550
ctx.set_map_value(m, "ImGuiStyleVar"sv, e);
550551
ctx.set_map_value(e, "Alpha"sv, ImGuiStyleVar_Alpha);
551552
ctx.set_map_value(e, "DisabledAlpha"sv, ImGuiStyleVar_DisabledAlpha);
@@ -572,6 +573,8 @@ void imgui::binding::registerConstants(lua_State* const vm) {
572573
ctx.set_map_value(e, "ImageBorderSize"sv, ImGuiStyleVar_ImageBorderSize);
573574
ctx.set_map_value(e, "TabRounding"sv, ImGuiStyleVar_TabRounding);
574575
ctx.set_map_value(e, "TabBorderSize"sv, ImGuiStyleVar_TabBorderSize);
576+
ctx.set_map_value(e, "TabMinWidthBase"sv, ImGuiStyleVar_TabMinWidthBase);
577+
ctx.set_map_value(e, "TabMinWidthShrink"sv, ImGuiStyleVar_TabMinWidthShrink);
575578
ctx.set_map_value(e, "TabBarBorderSize"sv, ImGuiStyleVar_TabBarBorderSize);
576579
ctx.set_map_value(e, "TabBarOverlineSize"sv, ImGuiStyleVar_TabBarOverlineSize);
577580
ctx.set_map_value(e, "TableAngledHeadersAngle"sv, ImGuiStyleVar_TableAngledHeadersAngle);

imgui/binding/src/ImGuiStyle.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ namespace imgui::binding {
138138
GET_SCALAR(ImageBorderSize);
139139
GET_SCALAR(TabRounding);
140140
GET_SCALAR(TabBorderSize);
141+
GET_SCALAR(TabMinWidthBase);
142+
GET_SCALAR(TabMinWidthShrink);
141143
GET_SCALAR(TabCloseButtonMinWidthSelected);
142144
GET_SCALAR(TabCloseButtonMinWidthUnselected);
143145
GET_SCALAR(TabBarBorderSize);
@@ -287,6 +289,8 @@ namespace imgui::binding {
287289
SET_SCALAR(ImageBorderSize);
288290
SET_SCALAR(TabRounding);
289291
SET_SCALAR(TabBorderSize);
292+
SET_SCALAR(TabMinWidthBase);
293+
SET_SCALAR(TabMinWidthShrink);
290294
SET_SCALAR(TabCloseButtonMinWidthSelected);
291295
SET_SCALAR(TabCloseButtonMinWidthUnselected);
292296
SET_SCALAR(TabBarBorderSize);

0 commit comments

Comments
 (0)