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

Debugger: Fix memory search drawing and sizing 

Now it should be sized a little better
A little funky on dpis greater than 100%
(sorry wx is not easy to work with)
This commit is contained in:
Ty Lamontagne 2022-01-21 00:53:44 -05:00 committed by refractionpcsx2
parent a632f3c5cb
commit 8113e9a168
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/gui/Debugger/CtrlMemSearch.cpp
View File

@ -33,6 +33,7 @@ wxDEFINE_EVENT(pxEvt_SearchFinished, wxCommandEvent);
wxBEGIN_EVENT_TABLE(CtrlMemSearch, wxWindow) wxBEGIN_EVENT_TABLE(CtrlMemSearch, wxWindow)
EVT_SET_FOCUS(CtrlMemSearch::focusEvent) EVT_SET_FOCUS(CtrlMemSearch::focusEvent)
EVT_KILL_FOCUS(CtrlMemSearch::focusEvent) EVT_KILL_FOCUS(CtrlMemSearch::focusEvent)
EVT_SIZE(CtrlMemSearch::sizeEvent)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
enum MemoryViewMenuIdentifiers { enum MemoryViewMenuIdentifiers {

7
pcsx2/gui/Debugger/CtrlMemSearch.h
View File

@ -73,6 +73,13 @@ private:
void postEvent(wxEventType type, int value); void postEvent(wxEventType type, int value);
void onPopupClick(wxCommandEvent& evt); void onPopupClick(wxCommandEvent& evt);
void focusEvent(wxFocusEvent& evt) { Refresh(); }; void focusEvent(wxFocusEvent& evt) { Refresh(); };
void sizeEvent(wxSizeEvent& evt)
{
// Why in the world do I have to do this.
// Without this the window isn't redrawn during a size event
Refresh(); // Reloads the window, fixes the imporper drawing but ruins the layout
Layout(); // Fix the layout of the window
};
void onSearchFinished(wxCommandEvent& evt); void onSearchFinished(wxCommandEvent& evt);
void onSearchNext(wxCommandEvent& evt); void onSearchNext(wxCommandEvent& evt);
void onSearchPrev(wxCommandEvent& evt); void onSearchPrev(wxCommandEvent& evt);

4
pcsx2/gui/Debugger/DisassemblyDialog.cpp
View File

@ -116,9 +116,7 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)
wxBoxSizer *memorySizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *memorySizer = new wxBoxSizer(wxHORIZONTAL);
memorySizer->Add(memory, 1, wxEXPAND); memorySizer->Add(memory, 1, wxEXPAND);
// Unfortuneately hacky, probably cause I'm bad at wxWidgets memorySearch->SetMaxSize(wxSize(310 * MSW_GetDPIScale(), -1));
// A max width of 360 ensures that the memory view will never be blocked by the memory search
memorySearch->SetMaxSize(wxSize(360, -1));
memorySizer->Add(memorySearch, 1, wxEXPAND); memorySizer->Add(memorySearch, 1, wxEXPAND);
memoryPanel->SetSizer(memorySizer); memoryPanel->SetSizer(memorySizer);
memoryPanel->SetBackgroundColour(wxTransparentColor); memoryPanel->SetBackgroundColour(wxTransparentColor);