centralize the invert decision logic to avoid updates to 7 ports

This will make it easier to tinker for best results.
This commit is contained in:
nhmall
2019-12-23 21:44:34 -05:00
parent 8eca3a99ab
commit a034e8200c
10 changed files with 61 additions and 10 deletions

View File

@@ -1774,7 +1774,7 @@ char acc; /* group accelerator, 0 => all */
int n;
for (n = 0, curr = page_start; curr != page_end; n++, curr = curr->next) {
if ((curr->itemflags & MENU_ITEMFLAGS_SKIPINVERT) != 0)
if (!menuitem_invert_test(0, curr->itemflags, curr->selected))
continue;
if (curr->identifier.a_void && (acc == 0 || curr->gselector == acc)) {
@@ -1812,12 +1812,12 @@ char acc; /* group accelerator, 0 => all */
if (!on_curr_page && curr->identifier.a_void
&& (acc == 0 || curr->gselector == acc)) {
if ((curr->itemflags & MENU_ITEMFLAGS_SKIPINVERT) == 0) {
if (menuitem_invert_test(0, curr->itemflags, curr->selected)) {
if (curr->selected) {
curr->selected = FALSE;
curr->count = -1;
} else
curr->selected = TRUE;
curr->selected = TRUE;
}
}
}