You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: dependencies/README.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,7 +27,7 @@ remove it.
27
27
### Dear ImGui & ImPlot
28
28
29
29
These are not dependencies however, they are currently vendored since they are hardcoded into the experimental glfw backend. Once the current backends are further along to where Dear ImGui can be entirely integrated on the user side,
30
-
these will most likely be removed. We are currently using v1.92.6 of Dear ImGui and v0.17 of ImPlot
30
+
these will most likely be removed. We are currently using v1.92.7 of Dear ImGui and v1.0 of ImPlot
IM_ASSERT((flags & 0x0F) == 0 && "Misuse of legacy hardcoded ImDrawCornerFlags values!"); // If this assert triggers on legacy code: see comments in ImDrawList::PathRect().
1772
+
if ((flags & ImDrawFlags_RoundCornersMask_) == 0)
1773
+
flags |= ImDrawFlags_RoundCornersAll;
1774
+
1786
1775
if (rounding < 0.5f || (flags & ImDrawFlags_RoundCornersMask_) == ImDrawFlags_RoundCornersNone)
IM_ASSERT(Fonts.Size > 0 && "Cannot use MergeMode for the first font"); // When using MergeMode make sure that a font has already been added before.
3048
+
IM_ASSERT(Fonts.Size > 0 && "Cannot use MergeMode for the first font!"); // When using MergeMode make sure that a font has already been added before.
3060
3049
font = font_cfg_in->DstFont ? font_cfg_in->DstFont : Fonts.back();
3061
3050
ImFontAtlasFontDiscardBakes(this, font, 0); // Need to discard bakes if the font was already used, because baked->FontLoaderDatas[] will change size. (#9162)
// Adding w/ Implicit RefSize: | OK (same scale) | OK (same scale) |
3078
+
// Adding w/ Explicit RefSize: | KO | OK (custom scale) |
3079
+
if (font_cfg_in->MergeMode && font_cfg_in->SizePixels > 0)
3080
+
IM_ASSERT((font->Flags & ImFontFlags_ImplicitRefSize) == 0 && "Cannot use MergeMode with an explicit reference size when the destination font used an implicit reference size!");
// NB: Transfer ownership of 'ttf_data' to ImFontAtlas, unless font_cfg_template->FontDataOwnedByAtlas == false. Owned TTF buffer will be deleted after Build().
3220
+
// NB: Transfer ownership of 'font_data' to ImFontAtlas, unless font_cfg_template->FontDataOwnedByAtlas == false. Owned TTF buffer will be deleted after Build().
if (ctx->FrameCount == 0 && old_font == NULL) // While this should work either way, we save ourselves the bother / debugging confusion of running ImGui code so early when it is not needed.
3267
+
// While this should work either way, we save ourselves the bother / debugging confusion of running ImGui code so early when it is not needed.
3268
+
// Also fixes erroneously rewriting style.FontSizeBase during init if adding default fonts.
0 commit comments