|
@@ -5573,7 +5573,9 @@ bool ImGui::BeginMenu(const char* label, bool enabled)
|
|
|
if (menuset_is_open)
|
|
|
g.NavWindow = window; // Odd hack to allow hovering across menus of a same menu-set (otherwise we wouldn't be able to hover parent)
|
|
|
|
|
|
- // The reference position stored in popup_pos will be used by Begin() to find a suitable position for the child menu (using FindBestWindowPosForPopup).
|
|
|
+ // The reference position stored in popup_pos will be used by Begin() to find a suitable position for the child menu,
|
|
|
+ // However the final position is going to be different! It is choosen by FindBestWindowPosForPopup().
|
|
|
+ // e.g. Menus tend to overlap each other horizontally to amplify relative Z-ordering.
|
|
|
ImVec2 popup_pos, pos = window->DC.CursorPos;
|
|
|
if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
|
|
|
{
|
|
@@ -5613,13 +5615,14 @@ bool ImGui::BeginMenu(const char* label, bool enabled)
|
|
|
{
|
|
|
if (ImGuiWindow* next_window = g.OpenPopupStack[g.BeginPopupStack.Size].Window)
|
|
|
{
|
|
|
+ // FIXME-DPI: Values should be derived from a master "scale" factor.
|
|
|
ImRect next_window_rect = next_window->Rect();
|
|
|
ImVec2 ta = g.IO.MousePos - g.IO.MouseDelta;
|
|
|
ImVec2 tb = (window->Pos.x < next_window->Pos.x) ? next_window_rect.GetTL() : next_window_rect.GetTR();
|
|
|
ImVec2 tc = (window->Pos.x < next_window->Pos.x) ? next_window_rect.GetBL() : next_window_rect.GetBR();
|
|
|
float extra = ImClamp(ImFabs(ta.x - tb.x) * 0.30f, 5.0f, 30.0f); // add a bit of extra slack.
|
|
|
- ta.x += (window->Pos.x < next_window->Pos.x) ? -0.5f : +0.5f; // to avoid numerical issues
|
|
|
- tb.y = ta.y + ImMax((tb.y - extra) - ta.y, -100.0f); // triangle is maximum 200 high to limit the slope and the bias toward large sub-menus // FIXME: Multiply by fb_scale?
|
|
|
+ ta.x += (window->Pos.x < next_window->Pos.x) ? -0.5f : +0.5f; // to avoid numerical issues
|
|
|
+ tb.y = ta.y + ImMax((tb.y - extra) - ta.y, -100.0f); // triangle is maximum 200 high to limit the slope and the bias toward large sub-menus // FIXME: Multiply by fb_scale?
|
|
|
tc.y = ta.y + ImMin((tc.y + extra) - ta.y, +100.0f);
|
|
|
moving_within_opened_triangle = ImTriangleContainsPoint(ta, tb, tc, g.IO.MousePos);
|
|
|
//window->DrawList->PushClipRectFullScreen(); window->DrawList->AddTriangleFilled(ta, tb, tc, moving_within_opened_triangle ? IM_COL32(0,128,0,128) : IM_COL32(128,0,0,128)); window->DrawList->PopClipRect(); // Debug
|