#4791: PopupMenu hides separators at the bottom of the menu

codereader · Jan 30, 2021 · dd4b98b · dd4b98b
1 parent d82c943
commit dd4b98b
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/libs/wxutil/menu/PopupMenu.cpp b/libs/wxutil/menu/PopupMenu.cpp
@@ -112,6 +112,17 @@ void PopupMenu::show(wxWindow* parent)
 		item->getMenuItem()->Enable(item->isSensitive());
 	}
 
+    // Detach any separator that might end up at the bottom of the menu
+    if (GetMenuItemCount() > 0)
+    {
+        auto lastItem = FindItemByPosition(GetMenuItemCount() - 1);
+
+        if (lastItem && lastItem->IsSeparator())
+        {
+            Remove(lastItem);
+        }
+    }
+
 	parent->PopupMenu(this);
 }