ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make color dialog a sub menu

This commit is contained in:
warmCabin 2021-08-02 02:53:49 -04:00
parent ac71eb489c
commit 13bd9ddfd2
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/win/debugger.cpp
View File

@ -1679,9 +1679,10 @@ BOOL CALLBACK IDC_DEBUGGER_DISASSEMBLY_WndProc(HWND hwndDlg, UINT uMsg, WPARAM w
// Need to coordinate these with res.rc // Need to coordinate these with res.rc
#define MENU_OPTIONS_POS 0 #define MENU_OPTIONS_POS 0
#define MENU_COLORS_POS 1 #define MENU_SYMBOLS_POS 1
#define MENU_SYMBOLS_POS 2 #define MENU_TOOLS_POS 2
#define MENU_TOOLS_POS 3
#define MENU_OPTIONS_COLORS_POS 2
#define HKEY_STEP_ONE_ID 0 #define HKEY_STEP_ONE_ID 0
#define HKEY_STEP_OUT_ID 1 #define HKEY_STEP_OUT_ID 1
@ -1803,14 +1804,15 @@ void DebuggerInitDialog(HWND hwndDlg)
// prepare menu // prepare menu
HMENU hdbgmenu = GetMenu(hwndDlg); HMENU hdbgmenu = GetMenu(hwndDlg);
HMENU hcolorpopupmenu = GetSubMenu(hdbgmenu, MENU_COLORS_POS);
for (int i = 0; i < sizeof(dbgcolormenu) / sizeof(DBGCOLORMENU); ++i)
InsertColorMenu(hwndDlg, hcolorpopupmenu, &dbgcolormenu[i].menu, i, ID_COLOR_DEBUGGER + i);
UpdateOptionsPopup(optionsPopup = GetSubMenu(hdbgmenu, MENU_OPTIONS_POS)); UpdateOptionsPopup(optionsPopup = GetSubMenu(hdbgmenu, MENU_OPTIONS_POS));
UpdateSymbolsPopup(symbolsPopup = GetSubMenu(hdbgmenu, MENU_SYMBOLS_POS)); UpdateSymbolsPopup(symbolsPopup = GetSubMenu(hdbgmenu, MENU_SYMBOLS_POS));
UpdateToolsPopup(toolsPopup = GetSubMenu(hdbgmenu, MENU_TOOLS_POS)); UpdateToolsPopup(toolsPopup = GetSubMenu(hdbgmenu, MENU_TOOLS_POS));
HMENU hcolorpopupmenu = GetSubMenu(optionsPopup, MENU_OPTIONS_COLORS_POS);
for (int i = 0; i < sizeof(dbgcolormenu) / sizeof(DBGCOLORMENU); ++i)
InsertColorMenu(hwndDlg, hcolorpopupmenu, &dbgcolormenu[i].menu, i, ID_COLOR_DEBUGGER + i);
// Register default hotkeys // Register default hotkeys
// TODO: Be sure to unregister all these!! // TODO: Be sure to unregister all these!!
RegisterHotKey(hwndDlg, HKEY_STEP_ONE_ID, 0, VK_F11); RegisterHotKey(hwndDlg, HKEY_STEP_ONE_ID, 0, VK_F11);
@ -1944,7 +1946,7 @@ void DebuggerBnClicked(HWND hwndDlg, uint16 btnId, HWND hwndBtn)
RECT rect; RECT rect;
GetClientRect(GetDlgItem(hwndDlg, IDC_DEBUGGER_DISASSEMBLY), &rect); GetClientRect(GetDlgItem(hwndDlg, IDC_DEBUGGER_DISASSEMBLY), &rect);
UpdateDisassembleView(hwndDlg, IDC_DEBUGGER_DISASSEMBLY, (rect.bottom - rect.top) / debugSystem->disasmFontHeight); UpdateDisassembleView(hwndDlg, IDC_DEBUGGER_DISASSEMBLY, (rect.bottom - rect.top) / debugSystem->disasmFontHeight);
HMENU hcolorpopupmenu = GetSubMenu(GetMenu(hwndDlg), 1); HMENU hcolorpopupmenu = GetSubMenu(optionsPopup, MENU_OPTIONS_COLORS_POS);
for (int i = 0; i < sizeof(dbgcolormenu) / sizeof(DBGCOLORMENU); ++i) for (int i = 0; i < sizeof(dbgcolormenu) / sizeof(DBGCOLORMENU); ++i)
ModifyColorMenu(hwndDlg, hcolorpopupmenu, &dbgcolormenu[i].menu, i, ID_COLOR_DEBUGGER + i); ModifyColorMenu(hwndDlg, hcolorpopupmenu, &dbgcolormenu[i].menu, i, ID_COLOR_DEBUGGER + i);
} }

10
src/drivers/win/res.rc
View File

@ -3037,6 +3037,11 @@ BEGIN
BEGIN BEGIN
MENUITEM "Auto Open on ROM Load", ID_DEBUGGER_AUTO_OPEN, CHECKED MENUITEM "Auto Open on ROM Load", ID_DEBUGGER_AUTO_OPEN, CHECKED
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "Colors..."
BEGIN
MENUITEM SEPARATOR
MENUITEM "Restore Defaults", ID_DEBUGGER_DEFCOLOR
END
MENUITEM "IDA Font", ID_DEBUGGER_IDA_FONT, CHECKED MENUITEM "IDA Font", ID_DEBUGGER_IDA_FONT, CHECKED
MENUITEM "ROM Offsets", ID_DEBUGGER_SHOW_ROM_OFFSETS, CHECKED MENUITEM "ROM Offsets", ID_DEBUGGER_SHOW_ROM_OFFSETS, CHECKED
MENUITEM "Show Trace Info", ID_DEBUGGER_SHOW_TRACE_INFO, CHECKED MENUITEM "Show Trace Info", ID_DEBUGGER_SHOW_TRACE_INFO, CHECKED
@ -3047,11 +3052,6 @@ BEGIN
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Reset Window Size", ID_DEBUGGER_RESTORE_SIZE MENUITEM "Reset Window Size", ID_DEBUGGER_RESTORE_SIZE
END END
POPUP "Colors"
BEGIN
MENUITEM SEPARATOR
MENUITEM "Restore Defaults", ID_DEBUGGER_DEFCOLOR
END
POPUP "Symbols" POPUP "Symbols"
BEGIN BEGIN
MENUITEM "Reload", ID_DEBUGGER_RELOAD_SYMBOLS MENUITEM "Reload", ID_DEBUGGER_RELOAD_SYMBOLS