Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BMenu: Add SortItems(), SwapItems() and MoveItem()

Browse Source 
... methods which call the respective methods in BList.

These convinience methods allow you to sort a menu of menu items
via a compare function, swap two menu items, or move a menu item
to a new index. Update items layout if menu is open.

Previously there was no easy way to rearrange menu items in a menu.

Change-Id: Ice3d6e5404e895196d8bd32d696dce7c55bd72d4
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4296
Reviewed-by: John Scipione <jscipione@gmail.com>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
John Scipione 2021-08-01 15:44:40 -04:00 committed by Adrien Destugues
parent 51d591cdfe
commit 0a53cbb3b9
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/os/interface/Menu.h
View File

@ -170,6 +170,12 @@ public:
void SetTrackingHook(menu_tracking_hook hook,
void* state);
// Reorder items
void SortItems(int (*compare)(const BMenuItem*,
const BMenuItem*));
bool SwapItems(int32 indexA, int32 indexB);
bool MoveItem(int32 indexFrom, int32 indexTo);
private:
friend class BMenuBar;
friend class BSeparatorItem;

50
src/kits/interface/Menu.cpp
View File

@ -1439,6 +1439,56 @@ BMenu::SetTrackingHook(menu_tracking_hook func, void* state)
}
// #pragma mark - Reorder item methods
void
BMenu::SortItems(int (*compare)(const BMenuItem*, const BMenuItem*))
{
fItems.SortItems((int (*)(const void*, const void*))compare);
InvalidateLayout();
if (Window() != NULL && !Window()->IsHidden() && LockLooper()) {
_LayoutItems(0);
Invalidate();
UnlockLooper();
}
}
bool
BMenu::SwapItems(int32 indexA, int32 indexB)
{
bool swapped = fItems.SwapItems(indexA, indexB);
if (swapped) {
InvalidateLayout();
if (Window() != NULL && !Window()->IsHidden() && LockLooper()) {
_LayoutItems(std::min(indexA, indexB));
Invalidate();
UnlockLooper();
}
}
return swapped;
}
bool
BMenu::MoveItem(int32 indexFrom, int32 indexTo)
{
bool moved = fItems.MoveItem(indexFrom, indexTo);
if (moved) {
InvalidateLayout();
if (Window() != NULL && !Window()->IsHidden() && LockLooper()) {
_LayoutItems(std::min(indexFrom, indexTo));
Invalidate();
UnlockLooper();
}
}
return moved;
}
void BMenu::_ReservedMenu3() {}
void BMenu::_ReservedMenu4() {}
void BMenu::_ReservedMenu5() {}