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

gui: fix: Apply on disabled speedhacks now locks the panel 

When speed hacks are disabled, clicking Apply should keep the panel grayed-out,
but it didn't before (though it was still correctly locked/unmodifyable).
With this patch it also looks correctly grayed out.

It's not clear if it's a wxWidgets issue or pcsx2 issue since with wxWidgets 3
there doesn't seem to be an issue (see posts at issue #543).

Regardless, this patch makes a cleaner separation between widgets values
([un]checked etc) and widgets states - lock(grayed-out)/unlocked.

The patch only modifies when widgets are grayed and should not affect the actual
values (therefore should not change the behavior other than visuals), but do
keep an eye for weird behavior since this is sensitive code.

Should fix #543
This commit is contained in:
Avi Halachmi (:avih) 2015-05-16 22:16:45 +03:00
parent 8a73849531
commit bbf7153acd
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,8 @@ namespace Panels
pxCheckBox* m_check_Enable;
wxButton* m_button_Defaults;
wxPanelWithHelpers* m_eeSliderPanel;
wxPanelWithHelpers* m_vuSliderPanel;
wxSlider* m_slider_eecycle;
wxSlider* m_slider_vustealer;
pxStaticText* m_msg_eecycle;

70
pcsx2/gui/Panels/SpeedhacksPanel.cpp
View File

@ -106,12 +106,12 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
// Cycle stealing works by 'fast-forwarding' the EE by an arbitrary number of cycles whenever VU1 micro-programs
// are run, which works as a rough-guess skipping of what would normally be idle time spent running on the EE.
wxPanelWithHelpers* eeSliderPanel = new wxPanelWithHelpers( left, wxVERTICAL, _("EE Cyclerate [Not Recommended]") );
m_eeSliderPanel = new wxPanelWithHelpers( left, wxVERTICAL, _("EE Cyclerate [Not Recommended]") );
m_slider_eecycle = new wxSlider( eeSliderPanel, wxID_ANY, 1, 1, 3,
m_slider_eecycle = new wxSlider( m_eeSliderPanel, wxID_ANY, 1, 1, 3,
wxDefaultPosition, wxDefaultSize, wxHORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS );
m_msg_eecycle = new pxStaticHeading( eeSliderPanel );
m_msg_eecycle = new pxStaticHeading( m_eeSliderPanel );
m_msg_eecycle->SetForegroundColour( wxColour( L"Red" ) );
m_msg_eecycle->SetHeight(3);
@ -124,12 +124,12 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
// ------------------------------------------------------------------------
// VU Cycle Stealing Hack Section:
wxPanelWithHelpers* vuSliderPanel = new wxPanelWithHelpers( right, wxVERTICAL, _("VU Cycle Stealing [Not Recommended]") );
m_vuSliderPanel = new wxPanelWithHelpers( right, wxVERTICAL, _("VU Cycle Stealing [Not Recommended]") );
m_slider_vustealer = new wxSlider( vuSliderPanel, wxID_ANY, 0, 0, 3, wxDefaultPosition, wxDefaultSize,
m_slider_vustealer = new wxSlider(m_vuSliderPanel, wxID_ANY, 0, 0, 3, wxDefaultPosition, wxDefaultSize,
wxHORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS );
m_msg_vustealer = new pxStaticHeading( vuSliderPanel );
m_msg_vustealer = new pxStaticHeading(m_vuSliderPanel);
m_msg_vustealer->SetForegroundColour( wxColour( L"Red" ) );
m_msg_vustealer->SetHeight(3);
@ -191,11 +191,11 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
//DefEnableSizer += pxStretchSpacer(1);
//DefEnableSizer += m_check_Enable | StdExpand().Align( wxALIGN_RIGHT );
*eeSliderPanel += m_slider_eecycle | sliderFlags;
*eeSliderPanel += m_msg_eecycle | sliderFlags;
*m_eeSliderPanel += m_slider_eecycle | sliderFlags;
*m_eeSliderPanel += m_msg_eecycle | sliderFlags;
*vuSliderPanel += m_slider_vustealer | sliderFlags;
*vuSliderPanel += m_msg_vustealer | sliderFlags;
*m_vuSliderPanel += m_slider_vustealer | sliderFlags;
*m_vuSliderPanel += m_msg_vustealer | sliderFlags;
*vuHacksPanel += m_check_vuFlagHack;
*vuHacksPanel += m_check_vuThread;
@ -205,10 +205,10 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
*miscHacksPanel += m_check_waitloop;
*miscHacksPanel += m_check_fastCDVD;
*left += eeSliderPanel | StdExpand();
*left += m_eeSliderPanel | StdExpand();
*left += miscHacksPanel | StdExpand();
*right += vuSliderPanel | StdExpand();
*right += m_vuSliderPanel | StdExpand();
*right += vuHacksPanel | StdExpand();
*right += StdPadding;
*right += m_button_Defaults| StdButton();
@ -239,19 +239,30 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
Connect( wxID_DEFAULT, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SpeedHacksPanel::Defaults_Click ) );
}
// Doesn't modify values - only locks(gray out)/unlocks as necessary.
void Panels::SpeedHacksPanel::EnableStuff( AppConfig* configToUse )
{
if( !configToUse ) configToUse = g_Conf;
wxSizerItemList& items( s_table->GetChildren() );
wxSizerItemList::iterator it = items.begin();
wxSizerItemList::iterator end = items.end();
bool hasPreset = configToUse->EnablePresets;
bool hacksEnabled = configToUse->EnableSpeedHacks;
bool HacksEnabledAndNoPreset = hacksEnabled && !hasPreset;
while( it != end )
{
(*it)->GetWindow()->Enable( m_check_Enable->GetValue());
++it;
}
// Main checkbox - locked only if presets are enabled
m_check_Enable->Enable(!hasPreset);
// lock/unlock the slider panels rather than the sliders themselves
// in order to affect both sliders and texts
m_eeSliderPanel->Enable(HacksEnabledAndNoPreset);
m_vuSliderPanel->Enable(HacksEnabledAndNoPreset);
// checkboxes
m_check_vuFlagHack->Enable(HacksEnabledAndNoPreset);
m_check_intc->Enable(HacksEnabledAndNoPreset);
m_check_waitloop->Enable(HacksEnabledAndNoPreset);
m_check_fastCDVD->Enable(HacksEnabledAndNoPreset);
m_check_vuThread->Enable(hacksEnabled); // MTVU is unaffected by presets
}
void Panels::SpeedHacksPanel::AppStatusEvent_OnSettingsApplied()
@ -262,26 +273,25 @@ void Panels::SpeedHacksPanel::AppStatusEvent_OnSettingsApplied()
void Panels::SpeedHacksPanel::ApplyConfigToGui( AppConfig& configToApply, int flags )
{
const bool enabled = configToApply.EnableSpeedHacks;
Pcsx2Config::SpeedhackOptions& opts=configToApply.EmuOptions.Speedhacks;
m_check_Enable ->SetValue( !!enabled ).Enable(!configToApply.EnablePresets);
// First, set the values of the widgets (checked/unchecked etc).
m_check_Enable->SetValue(configToApply.EnableSpeedHacks);
m_slider_eecycle ->SetValue( opts.EECycleRate + 1 );
m_slider_vustealer ->SetValue( opts.VUCycleSteal );
m_slider_eecycle->Enable(!configToApply.EnablePresets);
m_slider_vustealer->Enable(!configToApply.EnablePresets);
SetEEcycleSliderMsg();
SetVUcycleSliderMsg();
m_check_vuFlagHack ->SetValue(opts.vuFlagHack).Enable(!configToApply.EnablePresets);
m_check_vuFlagHack->SetValue(opts.vuFlagHack);
if( !(flags & AppConfig::APPLY_FLAG_FROM_PRESET) )
m_check_vuThread ->SetValue(opts.vuThread);
m_check_intc ->SetValue(opts.IntcStat).Enable(!configToApply.EnablePresets);
m_check_waitloop ->SetValue(opts.WaitLoop).Enable(!configToApply.EnablePresets);
m_check_fastCDVD ->SetValue(opts.fastCDVD).Enable(!configToApply.EnablePresets);
m_check_intc->SetValue(opts.IntcStat);
m_check_waitloop->SetValue(opts.WaitLoop);
m_check_fastCDVD->SetValue(opts.fastCDVD);
// Then, lock(gray out)/unlock the widgets as necessary.
EnableStuff( &configToApply );
// Layout necessary to ensure changed slider text gets re-aligned properly
@ -290,7 +300,8 @@ void Panels::SpeedHacksPanel::ApplyConfigToGui( AppConfig& configToApply, int fl
//Console.WriteLn("SpeedHacksPanel::ApplyConfigToGui: EnabledPresets: %s", configToApply.EnablePresets?"true":"false");
}
// Apply the values from the widgets to the config,
// regardless if locked (grayed out) or not.
void Panels::SpeedHacksPanel::Apply()
{
g_Conf->EnableSpeedHacks = m_check_Enable->GetValue();
@ -315,6 +326,7 @@ void Panels::SpeedHacksPanel::OnEnable_Toggled( wxCommandEvent& evt )
{
AppConfig tmp=*g_Conf;
tmp.EnablePresets=false; //if clicked, button was enabled, so not using a preset --> let EnableStuff work
tmp.EnableSpeedHacks = m_check_Enable->GetValue();
EnableStuff( &tmp );
evt.Skip();