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

Remember size of debugger window

This commit is contained in:
Kingcom 2015-12-28 17:41:19 +01:00
parent be0ad9be2f
commit de1f3d0df7
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/Config.h
View File

@ -414,13 +414,16 @@ struct Pcsx2Config
u8 FontWidth; u8 FontWidth;
u8 FontHeight; u8 FontHeight;
u32 WindowWidth;
u32 WindowHeight;
DebugOptions(); DebugOptions();
void LoadSave( IniInterface& conf ); void LoadSave( IniInterface& conf );
bool operator ==( const DebugOptions& right ) const bool operator ==( const DebugOptions& right ) const
{ {
return OpEqu( bitset ) && OpEqu( FontWidth ) && OpEqu( FontHeight ); return OpEqu( bitset ) && OpEqu( FontWidth ) && OpEqu( FontHeight )
&& OpEqu( WindowWidth ) && OpEqu( WindowHeight );
} }
bool operator !=( const DebugOptions& right ) const bool operator !=( const DebugOptions& right ) const

4
pcsx2/Pcsx2Config.cpp
View File

@ -379,6 +379,8 @@ Pcsx2Config::DebugOptions::DebugOptions()
ShowDebuggerOnStart = false; ShowDebuggerOnStart = false;
FontWidth = 8; FontWidth = 8;
FontHeight = 12; FontHeight = 12;
WindowWidth = 0;
WindowHeight = 0;
} }
void Pcsx2Config::DebugOptions::LoadSave( IniInterface& ini ) void Pcsx2Config::DebugOptions::LoadSave( IniInterface& ini )
@ -388,6 +390,8 @@ void Pcsx2Config::DebugOptions::LoadSave( IniInterface& ini )
IniBitBool( ShowDebuggerOnStart ); IniBitBool( ShowDebuggerOnStart );
IniBitfield(FontWidth); IniBitfield(FontWidth);
IniBitfield(FontHeight); IniBitfield(FontHeight);
IniBitfield(WindowWidth);
IniBitfield(WindowHeight);
} }

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

@ -39,6 +39,7 @@ BEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame)
EVT_COMMAND( wxID_ANY, debEVT_UPDATE, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_UPDATE, DisassemblyDialog::onDebuggerEvent )
EVT_COMMAND( wxID_ANY, debEVT_BREAKPOINTWINDOW, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_BREAKPOINTWINDOW, DisassemblyDialog::onDebuggerEvent )
EVT_COMMAND( wxID_ANY, debEVT_MAPLOADED, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_MAPLOADED, DisassemblyDialog::onDebuggerEvent )
EVT_SIZE(DisassemblyDialog::onSizeEvent)
EVT_CLOSE( DisassemblyDialog::onClose ) EVT_CLOSE( DisassemblyDialog::onClose )
END_EVENT_TABLE() END_EVENT_TABLE()
@ -217,6 +218,8 @@ DisassemblyDialog::DisassemblyDialog(wxWindow* parent):
wxFrame( parent, wxID_ANY, L"Debugger", wxDefaultPosition,wxDefaultSize,wxRESIZE_BORDER|wxCLOSE_BOX|wxCAPTION|wxSYSTEM_MENU ), wxFrame( parent, wxID_ANY, L"Debugger", wxDefaultPosition,wxDefaultSize,wxRESIZE_BORDER|wxCLOSE_BOX|wxCAPTION|wxSYSTEM_MENU ),
currentCpu(NULL) currentCpu(NULL)
{ {
int width = g_Conf->EmuOptions.Debugger.WindowWidth;
int height = g_Conf->EmuOptions.Debugger.WindowHeight;
topSizer = new wxBoxSizer( wxVERTICAL ); topSizer = new wxBoxSizer( wxVERTICAL );
wxPanel *panel = new wxPanel(this, wxID_ANY, wxPanel *panel = new wxPanel(this, wxID_ANY,
@ -267,9 +270,23 @@ DisassemblyDialog::DisassemblyDialog(wxWindow* parent):
SetMinSize(wxSize(1000,600)); SetMinSize(wxSize(1000,600));
panel->GetSizer()->Fit(this); panel->GetSizer()->Fit(this);
if (width != 0 && height != 0)
SetSize(width,height);
setDebugMode(true,true); setDebugMode(true,true);
} }
void DisassemblyDialog::onSizeEvent(wxSizeEvent& event)
{
if (event.GetEventType() == wxEVT_SIZE)
{
g_Conf->EmuOptions.Debugger.WindowWidth = event.GetSize().x;
g_Conf->EmuOptions.Debugger.WindowHeight = event.GetSize().y;
}
event.Skip();
}
#ifdef WIN32 #ifdef WIN32
WXLRESULT DisassemblyDialog::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) WXLRESULT DisassemblyDialog::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{ {

1
pcsx2/gui/Debugger/DisassemblyDialog.h
View File

@ -102,6 +102,7 @@ protected:
void onDebuggerEvent(wxCommandEvent& evt); void onDebuggerEvent(wxCommandEvent& evt);
void onPageChanging(wxCommandEvent& evt); void onPageChanging(wxCommandEvent& evt);
void onBreakpointClick(wxCommandEvent& evt); void onBreakpointClick(wxCommandEvent& evt);
void onSizeEvent(wxSizeEvent& event);
void onClose(wxCloseEvent& evt); void onClose(wxCloseEvent& evt);
void stepOver(); void stepOver();
void stepInto(); void stepInto();