i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMenu: speed up deleting items

Browse Source 
Fixes #16336.

Change-Id: Ie941f45f363f6fe94062fc3acb8bd3bb876c1f1e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2976
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
X512
2020-07-04 16:49:55 +00:00
committed by waddlesplash
parent 9802849814
commit d9d96260e0
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Menu.h
+2 -1
View File
@@ -196,7 +196,8 @@ private:
void _ItemScriptReceived(BMessage* message, void _ItemScriptReceived(BMessage* message,
BMenuItem* item); BMenuItem* item);
status_t _ResolveItemSpecifier(const BMessage& specifier, status_t _ResolveItemSpecifier(const BMessage& specifier,
int32 what, BMenuItem*& item); int32 what, BMenuItem*& item,
int32 *index = NULL);
status_t _InsertItemAtSpecifier( status_t _InsertItemAtSpecifier(
const BMessage& specifier, int32 what, const BMessage& specifier, int32 what,
BMenuItem* item); BMenuItem* item);
src/kits/interface/Menu.cpp
+23 -10
View File
@@ -892,7 +892,7 @@ BMenu::RemoveItem(int32 index)
{ {
BMenuItem* item = ItemAt(index); BMenuItem* item = ItemAt(index);
if (item != NULL) if (item != NULL)
_RemoveItems(0, 0, item, false); _RemoveItems(index, 1, NULL, false);
return item; return item;
} }
@@ -1666,12 +1666,17 @@ void BMenu::_ScriptReceived(BMessage* message)
case 7: { // Menu: DELETE case 7: { // Menu: DELETE
if (message->what == B_DELETE_PROPERTY) { if (message->what == B_DELETE_PROPERTY) {
BMenuItem *item = NULL; BMenuItem *item = NULL;
err = _ResolveItemSpecifier(specifier, what, item); int32 index;
err = _ResolveItemSpecifier(specifier, what, item, &index);
if (err >= B_OK) { if (err >= B_OK) {
if (item->Submenu() == NULL) if (item->Submenu() == NULL)
err = B_BAD_VALUE; err = B_BAD_VALUE;
else else {
RemoveItem(item); if (index >= 0)
RemoveItem(index);
else
RemoveItem(item);
}
} }
} }
break; break;
@@ -1736,9 +1741,14 @@ void BMenu::_ScriptReceived(BMessage* message)
case 11: // MenuItem: DELETE case 11: // MenuItem: DELETE
if (message->what == B_DELETE_PROPERTY) { if (message->what == B_DELETE_PROPERTY) {
BMenuItem *item = NULL; BMenuItem *item = NULL;
err = _ResolveItemSpecifier(specifier, what, item); int32 index;
if (err >= B_OK) err = _ResolveItemSpecifier(specifier, what, item, &index);
RemoveItem(item); if (err >= B_OK) {
if (index >= 0)
RemoveItem(index);
else
RemoveItem(item);
}
} }
break; break;
case 12: { // MenuItem: EXECUTE case 12: { // MenuItem: EXECUTE
@@ -1857,14 +1867,14 @@ void BMenu::_ItemScriptReceived(BMessage* message, BMenuItem* item)
status_t BMenu::_ResolveItemSpecifier(const BMessage& specifier, int32 what, status_t BMenu::_ResolveItemSpecifier(const BMessage& specifier, int32 what,
BMenuItem*& item) BMenuItem*& item, int32 *_index)
{ {
status_t err; status_t err;
item = NULL; item = NULL;
int32 index = -1;
switch (what) { switch (what) {
case B_INDEX_SPECIFIER: case B_INDEX_SPECIFIER:
case B_REVERSE_INDEX_SPECIFIER: { case B_REVERSE_INDEX_SPECIFIER: {
int32 index;
err = specifier.FindInt32("index", &index); err = specifier.FindInt32("index", &index);
if (err < B_OK) if (err < B_OK)
return err; return err;
@@ -1885,6 +1895,9 @@ status_t BMenu::_ResolveItemSpecifier(const BMessage& specifier, int32 what,
if (item == NULL) if (item == NULL)
return B_BAD_INDEX; return B_BAD_INDEX;
if (_index != NULL)
*_index = index;
return B_OK; return B_OK;
} }
@@ -2358,7 +2371,7 @@ BMenu::_RemoveItems(int32 index, int32 count, BMenuItem* item,
for (; i >= index; i--) { for (; i >= index; i--) {
item = static_cast<BMenuItem*>(fItems.ItemAt(i)); item = static_cast<BMenuItem*>(fItems.ItemAt(i));
if (item != NULL) { if (item != NULL) {
if (fItems.RemoveItem(item)) { if (fItems.RemoveItem(i)) {
if (item == fSelected && window != NULL) if (item == fSelected && window != NULL)
_SelectItem(NULL); _SelectItem(NULL);
item->Uninstall(); item->Uninstall();