Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-20 14:11:42 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #14983 from unknownbrackets/debugger-menus

Browse Source 
Debugger: Fix submenu offsets from removing unused
This commit is contained in:
Henrik Rydgård 2021-10-07 16:40:52 +02:00 committed by GitHub
commit ce91798b27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Windows/Debugger/CtrlDisAsmView.cpp
View File

@ -29,6 +29,7 @@
#include <set>
TCHAR CtrlDisAsmView::szClassName[] = _T("CtrlDisAsmView");
constexpr int POPUP_SUBMENU_ID_DISASM = 1;
extern HMENU g_hPopupMenus;
void CtrlDisAsmView::init()
@ -929,7 +930,8 @@ void CtrlDisAsmView::onMouseUp(WPARAM wParam, LPARAM lParam, int button)
//popup menu?
POINT pt;
GetCursorPos(&pt);
switch(TrackPopupMenuEx(GetSubMenu(g_hPopupMenus,1),TPM_RIGHTBUTTON|TPM_RETURNCMD,pt.x,pt.y,wnd,0))
HMENU menu = GetSubMenu(g_hPopupMenus, POPUP_SUBMENU_ID_DISASM);
switch (TrackPopupMenuEx(menu, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, wnd, 0))
{
case ID_DISASM_GOTOINMEMORYVIEW:
SendMessage(GetParent(wnd),WM_DEB_GOTOHEXEDIT,curAddress,0);

3
Windows/Debugger/CtrlMemView.cpp
View File

@ -18,6 +18,7 @@
#include "DumpMemoryWindow.h"
wchar_t CtrlMemView::szClassName[] = L"CtrlMemView";
constexpr int POPUP_SUBMENU_ID_MEMVIEW = 0;
extern HMENU g_hPopupMenus;
CtrlMemView::CtrlMemView(HWND _wnd)
@ -482,7 +483,7 @@ void CtrlMemView::onMouseUp(WPARAM wParam, LPARAM lParam, int button)
bool enable16 = !asciiSelected && (curAddress % 2) == 0;
bool enable32 = !asciiSelected && (curAddress % 4) == 0;
HMENU menu = GetSubMenu(g_hPopupMenus,0);
HMENU menu = GetSubMenu(g_hPopupMenus, POPUP_SUBMENU_ID_MEMVIEW);
EnableMenuItem(menu,ID_MEMVIEW_COPYVALUE_16,enable16 ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(menu,ID_MEMVIEW_COPYVALUE_32,enable32 ? MF_ENABLED : MF_GRAYED);

4
Windows/Debugger/CtrlRegisterList.cpp
View File

@ -24,6 +24,7 @@ extern HMENU g_hPopupMenus;
enum { REGISTER_PC = 32, REGISTER_HI, REGISTER_LO, REGISTERS_END };
TCHAR CtrlRegisterList::szClassName[] = _T("CtrlRegisterList");
constexpr int POPUP_SUBMENU_ID_REGLIST = 2;
void CtrlRegisterList::init()
{
@ -511,7 +512,8 @@ void CtrlRegisterList::onMouseUp(WPARAM wParam, LPARAM lParam, int button)
}
POINT pt;
GetCursorPos(&pt);
switch(TrackPopupMenuEx(GetSubMenu(g_hPopupMenus,3),TPM_RIGHTBUTTON|TPM_RETURNCMD,pt.x,pt.y,wnd,0))
HMENU menu = GetSubMenu(g_hPopupMenus, POPUP_SUBMENU_ID_REGLIST);
switch (TrackPopupMenuEx(menu, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, wnd, 0))
{
case ID_REGLIST_GOTOINMEMORYVIEW:
SendMessage(GetParent(wnd),WM_DEB_GOTOHEXEDIT,val,0);

6
Windows/Debugger/Debugger_Lists.cpp
View File

@ -66,9 +66,9 @@ GenericListViewDef moduleListDef = {
moduleListColumns, ARRAY_SIZE(moduleListColumns), NULL, false
};
const int POPUP_SUBMENU_ID_BREAKPOINTLIST = 5;
const int POPUP_SUBMENU_ID_THREADLIST = 6;
const int POPUP_SUBMENU_ID_NEWBREAKPOINT = 7;
const int POPUP_SUBMENU_ID_BREAKPOINTLIST = 3;
const int POPUP_SUBMENU_ID_THREADLIST = 4;
const int POPUP_SUBMENU_ID_NEWBREAKPOINT = 5;
//
// CtrlThreadList

2
Windows/GEDebugger/CtrlDisplayListView.cpp
View File

@ -11,7 +11,7 @@
LPCTSTR CtrlDisplayListView::windowClass = _T("CtrlDisplayListView");
const int POPUP_SUBMENU_ID_DISPLAYLISTVIEW = 8;
const int POPUP_SUBMENU_ID_DISPLAYLISTVIEW = 6;
extern HMENU g_hPopupMenus;
void CtrlDisplayListView::registerClass()

2
Windows/GEDebugger/GEDebugger.cpp
View File

@ -48,7 +48,7 @@
#include <windowsx.h>
#include <commctrl.h>
const int POPUP_SUBMENU_ID_GEDBG_PREVIEW = 10;
const int POPUP_SUBMENU_ID_GEDBG_PREVIEW = 8;
using namespace GPUBreakpoints;
using namespace GPUDebug;

2
Windows/GEDebugger/TabState.cpp
View File

@ -28,7 +28,7 @@
using namespace GPUBreakpoints;
const int POPUP_SUBMENU_ID_GEDBG_STATE = 9;
const int POPUP_SUBMENU_ID_GEDBG_STATE = 7;
// TODO: Show an icon or something for breakpoints, toggle.
static const GenericListViewColumn stateValuesCols[] = {