Internals: Menus: Naming offset field + fix spacing/offset computation to handle more offsets.
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 268b9b8..9dd8914 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -216,6 +216,7 @@
- shortcuts: local-style shortcut api, e.g. parse "&Save"
- shortcuts,menus: global-style shortcut api e.g. "Save (CTRL+S)" -> explicit flag for recursing into closed menu
- shortcuts: programmatically access shortcuts "Focus("&Save"))
+ - menus: hovering a disabled BeginMenu or MenuItem won't close another menu
- menus: menu-bar: main menu-bar could affect clamping of windows position (~ akin to modifying DisplayMin)
- menus: hovering from menu to menu on a menu-bar has 1 frame without any menu, which is a little annoying. ideally either 0 either longer.
- menus: could merge draw call in most cases (how about storing an optional aabb in ImDrawCmd to move the burden of merging in a single spot).
diff --git a/imgui_internal.h b/imgui_internal.h
index 7edb312..dc72958 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -1038,12 +1038,14 @@
ImU32 TotalWidth;
ImU32 NextTotalWidth;
ImU16 Spacing;
- ImU16 Offsets[2]; // Offset of: Shortcut, Check mark (locked in Update)
- ImU16 Widths[3]; // Width of: Label, Shortcut, Check mark (accumulator for current frame)
+ ImU16 OffsetShortcut; // Offsets are locked in Update()
+ ImU16 OffsetMark;
+ ImU16 Widths[3]; // Width of: Label, Shortcut, Mark (accumulators for current frame)
ImGuiMenuColumns() { memset(this, 0, sizeof(*this)); }
void Update(float spacing, bool window_reappearing);
- float DeclColumns(float w_label, float w_shortcut, float w_checkmark);
+ float DeclColumns(float w_label, float w_shortcut, float w_mark);
+ void CalcNextTotalWidth(bool update_offsets);
};
// Internal state of the currently focused/edited text input box
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 7539b75..b5b6d9b 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -6595,27 +6595,39 @@
{
if (window_reappearing)
memset(Widths, 0, sizeof(Widths));
- TotalWidth = NextTotalWidth = 0;
Spacing = (ImU16)spacing;
- for (int i = 0; i < IM_ARRAYSIZE(Widths); i++)
- {
- if (i > 0 && Widths[i] > 0)
- TotalWidth += Spacing;
- if (i > 0)
- Offsets[i - 1] = (ImU16)TotalWidth;
- TotalWidth += Widths[i];
- Widths[i] = 0;
- }
+ CalcNextTotalWidth(true);
+ memset(Widths, 0, sizeof(Widths));
+ TotalWidth = NextTotalWidth;
+ NextTotalWidth = 0;
}
-float ImGuiMenuColumns::DeclColumns(float w_label, float w_shortcut, float w_checkmark)
+void ImGuiMenuColumns::CalcNextTotalWidth(bool update_offsets)
+{
+ ImU16 offset = 0;
+ bool want_spacing = false;
+ for (int i = 0; i < IM_ARRAYSIZE(Widths); i++)
+ {
+ ImU16 width = Widths[i];
+ if (want_spacing && width > 0)
+ offset += Spacing;
+ want_spacing |= (width > 0);
+ if (update_offsets)
+ {
+ if (i == 1) { OffsetShortcut = offset; }
+ if (i == 2) { OffsetMark = offset; }
+ }
+ offset += width;
+ }
+ NextTotalWidth = offset;
+}
+
+float ImGuiMenuColumns::DeclColumns(float w_label, float w_shortcut, float w_mark)
{
Widths[0] = ImMax(Widths[0], (ImU16)w_label);
Widths[1] = ImMax(Widths[1], (ImU16)w_shortcut);
- Widths[2] = ImMax(Widths[2], (ImU16)w_checkmark);
- NextTotalWidth = 0;
- for (int i = 0; i < IM_ARRAYSIZE(Widths); i++)
- NextTotalWidth += Widths[i] + ((i > 0 && Widths[i] > 0) ? Spacing : 0);
+ Widths[2] = ImMax(Widths[2], (ImU16)w_mark);
+ CalcNextTotalWidth(false);
return (float)ImMax(TotalWidth, NextTotalWidth);
}
@@ -6829,7 +6841,7 @@
float extra_w = ImMax(0.0f, GetContentRegionAvail().x - min_w);
pressed = Selectable(label, menu_is_open, ImGuiSelectableFlags_NoHoldingActiveID | ImGuiSelectableFlags_SelectOnClick | ImGuiSelectableFlags_DontClosePopups | ImGuiSelectableFlags_SpanAvailWidth | (!enabled ? ImGuiSelectableFlags_Disabled : 0), ImVec2(min_w, 0.0f));
ImU32 text_col = GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled);
- RenderArrow(window->DrawList, pos + ImVec2(window->DC.MenuColumns.Offsets[1] + extra_w + g.FontSize * 0.30f, 0.0f), text_col, ImGuiDir_Right);
+ RenderArrow(window->DrawList, pos + ImVec2(window->DC.MenuColumns.OffsetMark + extra_w + g.FontSize * 0.30f, 0.0f), text_col, ImGuiDir_Right);
}
const bool hovered = enabled && ItemHoverable(window->DC.LastItemRect, id);
@@ -6859,6 +6871,8 @@
moving_toward_other_child_menu = ImTriangleContainsPoint(ta, tb, tc, g.IO.MousePos);
//GetForegroundDrawList()->AddTriangleFilled(ta, tb, tc, moving_within_opened_triangle ? IM_COL32(0,128,0,128) : IM_COL32(128,0,0,128)); // [DEBUG]
}
+
+ // FIXME: Hovering a disabled BeginMenu or MenuItem won't close us
if (menu_is_open && !hovered && g.HoveredWindow == window && g.HoveredIdPreviousFrame != 0 && g.HoveredIdPreviousFrame != id && !moving_toward_other_child_menu)
want_close = true;
@@ -6982,11 +6996,11 @@
if (shortcut_w > 0.0f)
{
PushStyleColor(ImGuiCol_Text, g.Style.Colors[ImGuiCol_TextDisabled]);
- RenderText(pos + ImVec2(window->DC.MenuColumns.Offsets[0] + extra_w, 0.0f), shortcut, NULL, false);
+ RenderText(pos + ImVec2(window->DC.MenuColumns.OffsetShortcut + extra_w, 0.0f), shortcut, NULL, false);
PopStyleColor();
}
if (selected)
- RenderCheckMark(window->DrawList, pos + ImVec2(window->DC.MenuColumns.Offsets[1] + extra_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled), g.FontSize * 0.866f);
+ RenderCheckMark(window->DrawList, pos + ImVec2(window->DC.MenuColumns.OffsetMark + extra_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled), g.FontSize * 0.866f);
}
IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.LastItemStatusFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0));
