mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-13 21:19:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Viewport: Fix to allow changing/animated window name to be reflected in the OS e.g. task bar, so named documents can appear properly. (#1542)

Browse Source
This commit is contained in:
omar 2018-04-13 16:21:34 +02:00
parent 22d6f00110
commit f270d6c52c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
imgui.cpp
View File

@ -3596,15 +3596,15 @@ void ImGui::UpdatePlatformWindows()
// Update title bar // Update title bar
const char* title_begin = viewport->Window->Name; const char* title_begin = viewport->Window->Name;
const char* title_end = ImGui::FindRenderedTextEnd(title_begin); char* title_end = (char*)ImGui::FindRenderedTextEnd(title_begin);
const ImGuiID title_hash = ImHash(title_begin, (int)(title_end - title_begin)); const ImGuiID title_hash = ImHash(title_begin, (int)(title_end - title_begin));
if (viewport->LastNameHash != title_hash) if (viewport->LastNameHash != title_hash)
{ {
viewport->LastNameHash = title_hash; viewport->LastNameHash = title_hash;
char* title_displayed = ImStrdup(viewport->Window->Name); char title_end_backup_c = *title_end;
title_displayed[title_end - title_begin] = 0; *title_end = 0; // Cut existing buffer short instead of doing an alloc/free
g.PlatformIO.Platform_SetWindowTitle(viewport, title_displayed); g.PlatformIO.Platform_SetWindowTitle(viewport, title_begin);
ImGui::MemFree(title_displayed); *title_end = title_end_backup_c;
} }
// Update alpha // Update alpha
@ -6422,6 +6422,13 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window = CreateNewWindow(name, size_on_first_use, flags); window = CreateNewWindow(name, size_on_first_use, flags);
} }
// Update name when it changes (which can only happen with the "###" operator), but only if it is meant to be displayed to the end user, else there is no point.
if (!window_just_created && window->Viewport && window->Viewport->Window == window && strcmp(name, window->Name) != 0)
{
IM_DELETE(window->Name);
window->Name = ImStrdup(name);
}
// Automatically disable manual moving/resizing when NoInputs is set // Automatically disable manual moving/resizing when NoInputs is set
if (flags & ImGuiWindowFlags_NoInputs) if (flags & ImGuiWindowFlags_NoInputs)
flags |= ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize; flags |= ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;