nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

menuinvertmode for win32/Windows GUI

Browse Source 
Catch up with tty, curses, X11, and Qt:  menuitem_invert_test()
applies to select as well as invert and if menuinvertmode is 2 then
it also applies to unselect.

Not tested.
This commit is contained in:
PatR
2022-03-19 15:49:55 -07:00
parent 20411d9ed4
commit ffd84583d0
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/win32/mhmenu.c
+20 -6
View File
@@ -1289,6 +1289,9 @@ onListChar(HWND hWnd, HWND hwndList, WORD ch)
if (data->how == PICK_ANY) { if (data->how == PICK_ANY) {
reset_menu_count(hwndList, data); reset_menu_count(hwndList, data);
for (i = 0; i < data->menui.menu.size; i++) { for (i = 0; i < data->menui.menu.size; i++) {
if (!menuitem_invert_test(1, data->menui.menu.items[i].itemflags,
NHMENU_IS_SELECTED(data->menui.menu.items[i])))
continue;
SelectMenuItem(hwndList, data, i, -1); SelectMenuItem(hwndList, data, i, -1);
} }
return -2; return -2;
@@ -1299,6 +1302,9 @@ onListChar(HWND hWnd, HWND hwndList, WORD ch)
if (data->how == PICK_ANY) { if (data->how == PICK_ANY) {
reset_menu_count(hwndList, data); reset_menu_count(hwndList, data);
for (i = 0; i < data->menui.menu.size; i++) { for (i = 0; i < data->menui.menu.size; i++) {
if (!menuitem_invert_test(2, data->menui.menu.items[i].itemflags,
NHMENU_IS_SELECTED(data->menui.menu.items[i])))
continue;
SelectMenuItem(hwndList, data, i, 0); SelectMenuItem(hwndList, data, i, 0);
} }
return -2; return -2;
@@ -1309,9 +1315,10 @@ onListChar(HWND hWnd, HWND hwndList, WORD ch)
if (data->how == PICK_ANY) { if (data->how == PICK_ANY) {
reset_menu_count(hwndList, data); reset_menu_count(hwndList, data);
for (i = 0; i < data->menui.menu.size; i++) { for (i = 0; i < data->menui.menu.size; i++) {
if (menuitem_invert_test(0, data->menui.menu.items[i].itemflags, if (!menuitem_invert_test(0, data->menui.menu.items[i].itemflags,
NHMENU_IS_SELECTED(data->menui.menu.items[i]))) NHMENU_IS_SELECTED(data->menui.menu.items[i])))
SelectMenuItem(hwndList, data, i, continue;
SelectMenuItem(hwndList, data, i,
NHMENU_IS_SELECTED(data->menui.menu.items[i]) ? 0 NHMENU_IS_SELECTED(data->menui.menu.items[i]) ? 0
: -1); : -1);
} }
@@ -1328,6 +1335,9 @@ onListChar(HWND hWnd, HWND hwndList, WORD ch)
from = max(0, topIndex); from = max(0, topIndex);
to = min(data->menui.menu.size, from + pageSize); to = min(data->menui.menu.size, from + pageSize);
for (i = from; i < to; i++) { for (i = from; i < to; i++) {
if (!menuitem_invert_test(1, data->menui.menu.items[i].itemflags,
NHMENU_IS_SELECTED(data->menui.menu.items[i])))
continue;
SelectMenuItem(hwndList, data, i, -1); SelectMenuItem(hwndList, data, i, -1);
} }
return -2; return -2;
@@ -1343,6 +1353,9 @@ onListChar(HWND hWnd, HWND hwndList, WORD ch)
from = max(0, topIndex); from = max(0, topIndex);
to = min(data->menui.menu.size, from + pageSize); to = min(data->menui.menu.size, from + pageSize);
for (i = from; i < to; i++) { for (i = from; i < to; i++) {
if (!menuitem_invert_test(2, data->menui.menu.items[i].itemflags,
NHMENU_IS_SELECTED(data->menui.menu.items[i])))
continue;
SelectMenuItem(hwndList, data, i, 0); SelectMenuItem(hwndList, data, i, 0);
} }
return -2; return -2;
@@ -1358,9 +1371,10 @@ onListChar(HWND hWnd, HWND hwndList, WORD ch)
from = max(0, topIndex); from = max(0, topIndex);
to = min(data->menui.menu.size, from + pageSize); to = min(data->menui.menu.size, from + pageSize);
for (i = from; i < to; i++) { for (i = from; i < to; i++) {
if (menuitem_invert_test(0, data->menui.menu.items[i].itemflags, if (!menuitem_invert_test(0, data->menui.menu.items[i].itemflags,
NHMENU_IS_SELECTED(data->menui.menu.items[i]))) NHMENU_IS_SELECTED(data->menui.menu.items[i])))
SelectMenuItem(hwndList, data, i, continue;
SelectMenuItem(hwndList, data, i,
NHMENU_IS_SELECTED(data->menui.menu.items[i]) ? 0 NHMENU_IS_SELECTED(data->menui.menu.items[i]) ? 0
: -1); : -1);
} }