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

EE-Panel: gray out EE Cache when recompiler is set

This commit is contained in:
Akash 2016-02-22 00:11:38 +05:30
parent ef9b8b792f
commit 35f599833c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -178,7 +178,7 @@ namespace Panels
pxRadioPanel* m_panel_RecIOP;
pxCheckBox* m_check_EECacheEnable;
AdvancedOptionsFPU* m_advancedOptsFpu;
wxButton *m_button_RestoreDefaults;
wxButton* m_button_RestoreDefaults;
public:
CpuPanelEE( wxWindow* parent );
@ -190,6 +190,7 @@ namespace Panels
protected:
void OnRestoreDefaults( wxCommandEvent& evt );
void EECache_Event( wxCommandEvent& evt );
};
class CpuPanelVU : public BaseApplicableConfigPanel_SpecificConfig

14
pcsx2/gui/Panels/CpuPanel.cpp
View File

@ -171,6 +171,7 @@ Panels::CpuPanelEE::CpuPanelEE( wxWindow* parent )
*this += m_button_RestoreDefaults | StdButton();
Connect( wxID_DEFAULT, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CpuPanelEE::OnRestoreDefaults ) );
Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &CpuPanelEE::EECache_Event, this);
}
Panels::CpuPanelVU::CpuPanelVU( wxWindow* parent )
@ -233,7 +234,7 @@ void Panels::CpuPanelEE::Apply()
Pcsx2Config::RecompilerOptions& recOps( g_Conf->EmuOptions.Cpu.Recompiler );
recOps.EnableEE = !!m_panel_RecEE->GetSelection();
recOps.EnableIOP = !!m_panel_RecIOP->GetSelection();
recOps.EnableEECache = m_check_EECacheEnable ->GetValue();
recOps.EnableEECache = m_check_EECacheEnable->GetValue();
}
void Panels::CpuPanelEE::AppStatusEvent_OnSettingsApplied()
@ -251,8 +252,9 @@ void Panels::CpuPanelEE::ApplyConfigToGui( AppConfig& configToApply, int flags )
m_panel_RecEE->Enable(!configToApply.EnablePresets);
m_panel_RecIOP->Enable(!configToApply.EnablePresets);
m_check_EECacheEnable ->SetValue(recOps.EnableEECache);
m_check_EECacheEnable->Enable(!configToApply.EnablePresets);
//EECache option is exclusive to the EE Interpreter.
m_check_EECacheEnable->SetValue(recOps.EnableEECache);
m_check_EECacheEnable->Enable(!configToApply.EnablePresets && m_panel_RecEE->GetSelection() == 0);
m_button_RestoreDefaults->Enable(!configToApply.EnablePresets);
if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE )
@ -428,3 +430,9 @@ void Panels::AdvancedOptionsVU::ApplyConfigToGui( AppConfig& configToApply, int
this->Enable(!configToApply.EnablePresets);
}
void Panels::CpuPanelEE::EECache_Event(wxCommandEvent& event)
{
m_check_EECacheEnable->Enable(m_panel_RecEE->GetSelection() == 0);
event.Skip();
}