mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-29 03:00:05 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_demo.cpp # imgui_internal.h
This commit is contained in:
commit
1d942eb6c9
14 changed files with 194 additions and 100 deletions
|
|
@ -5029,7 +5029,9 @@ const ImWchar* ImFontAtlas::GetGlyphRangesVietnamese()
|
|||
|
||||
void ImFontGlyphRangesBuilder::AddText(const char* text, const char* text_end)
|
||||
{
|
||||
while (text_end ? (text < text_end) : *text)
|
||||
if (text_end == NULL)
|
||||
text_end = text + strlen(text);
|
||||
while (text < text_end)
|
||||
{
|
||||
unsigned int c = 0;
|
||||
int c_len = ImTextCharFromUtf8(&c, text, text_end);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue