|
|
@ -5421,11 +5421,14 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) |
|
|
|
|
|
|
|
|
|
|
|
// Close from platform window
|
|
|
|
// Close from platform window
|
|
|
|
if (p_open != NULL && window->Viewport->PlatformRequestClose && window->Viewport != GetMainViewport()) |
|
|
|
if (p_open != NULL && window->Viewport->PlatformRequestClose && window->Viewport != GetMainViewport()) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (!window->DockIsActive || window->DockTabIsVisible) |
|
|
|
{ |
|
|
|
{ |
|
|
|
window->Viewport->PlatformRequestClose = false; |
|
|
|
window->Viewport->PlatformRequestClose = false; |
|
|
|
g.NavWindowingToggleLayer = false; // Assume user mapped PlatformRequestClose on ALT-F4 so we disable ALT for menu toggle. False positive not an issue.
|
|
|
|
g.NavWindowingToggleLayer = false; // Assume user mapped PlatformRequestClose on ALT-F4 so we disable ALT for menu toggle. False positive not an issue.
|
|
|
|
*p_open = false; |
|
|
|
*p_open = false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Title bar
|
|
|
|
// Title bar
|
|
|
|
if (!(flags & ImGuiWindowFlags_NoTitleBar) && !window->DockIsActive) |
|
|
|
if (!(flags & ImGuiWindowFlags_NoTitleBar) && !window->DockIsActive) |
|
|
|