piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoConfigDiag: Don't enable the post-processing config button when there are no options.

Browse Source 
The handling of the Anaglyph override was incorrect.
This commit is contained in:
Jules Blok
2014-12-25 00:06:29 +01:00
parent 31a55384b3
commit 111b04388c
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinWX/VideoConfigDiag.h
View File

@ -152,7 +152,7 @@ protected:
// Should we enable the configuration button?
PostProcessingShaderConfiguration postprocessing_shader;
postprocessing_shader.LoadShader(vconfig.sPostProcessingShader);
button_config_pp->Enable(postprocessing_shader.HasOptions());
button_config_pp->Enable(postprocessing_shader.HasOptions() && vconfig.iStereoMode != STEREO_ANAGLYPH);
ev.Skip();
}
@ -165,20 +165,36 @@ protected:
ev.Skip();
}
void Event_StereoSep(wxCommandEvent &ev)
void Event_StereoDepth(wxCommandEvent &ev)
{
vconfig.iStereoDepth = ev.GetInt();
ev.Skip();
}
void Event_StereoFoc(wxCommandEvent &ev)
void Event_StereoConvergence(wxCommandEvent &ev)
{
vconfig.iStereoConvergence = ev.GetInt();
ev.Skip();
}
void Event_StereoMode(wxCommandEvent &ev)
{
if (ev.GetInt() == STEREO_ANAGLYPH && vconfig.backend_info.PPShaders.size())
{
// Anaglyph overrides post-processing shaders
choice_ppshader->Select(0);
choice_ppshader->Enable(false);
}
else if (vconfig.backend_info.PPShaders.size())
{
choice_ppshader->Enable(true);
}
ev.Skip();
}
void Event_ClickClose(wxCommandEvent&);
void Event_Close(wxCloseEvent&);
@ -198,12 +214,6 @@ protected:
virtual_xfb->Enable(vconfig.bUseXFB);
real_xfb->Enable(vconfig.bUseXFB);
// PP Shaders
if (choice_ppshader)
choice_ppshader->Enable(vconfig.iStereoMode != STEREO_ANAGLYPH);
if (button_config_pp)
button_config_pp->Enable(vconfig.iStereoMode != STEREO_ANAGLYPH);
// Things which shouldn't be changed during emulation
if (Core::IsRunning())
{