mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-14 00:34:18 +00:00
Nav, Combo: removed unnecessary window->LastNavIds[] assignment in combo code. + minor renaming.
This commit is contained in:
parent
838c16533d
commit
5b4bc985ad
3 changed files with 6 additions and 12 deletions
|
|
@ -8529,7 +8529,7 @@ ImVec2 ImGui::FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& s
|
|||
}
|
||||
|
||||
// Note that this is used for popups, which can overlap the non work-area of individual viewports.
|
||||
ImRect ImGui::GetWindowAllowedExtentRect(ImGuiWindow* window)
|
||||
ImRect ImGui::GetPopupAllowedExtentRect(ImGuiWindow* window)
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
IM_UNUSED(window);
|
||||
|
|
@ -8543,7 +8543,7 @@ ImVec2 ImGui::FindBestWindowPosForPopup(ImGuiWindow* window)
|
|||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
|
||||
ImRect r_outer = GetWindowAllowedExtentRect(window);
|
||||
ImRect r_outer = GetPopupAllowedExtentRect(window);
|
||||
if (window->Flags & ImGuiWindowFlags_ChildMenu)
|
||||
{
|
||||
// Child menus typically request _any_ position within the parent menu item, and then we move the new menu outside the parent bounds.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue