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

Added missing wxEvent for Widescreen Hack, unchecked and disabled 2x checkbox when selecting "Use Real XFB". 

Fixes Issue 2026

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4868 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st 2010-01-17 14:17:23 +00:00
parent f50e3cf5fe
commit f599fdcec5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -49,6 +49,7 @@ BEGIN_EVENT_TABLE(GFXConfigDialogOGL,wxDialog)
EVT_CHECKBOX(ID_USEXFB, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_USEXFB, GFXConfigDialogOGL::GeneralSettingsChanged)
EVT_CHECKBOX(ID_FORCEFILTERING, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_FORCEFILTERING, GFXConfigDialogOGL::GeneralSettingsChanged)
EVT_CHECKBOX(ID_AUTOSCALE, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_AUTOSCALE, GFXConfigDialogOGL::GeneralSettingsChanged)
EVT_CHECKBOX(ID_WIDESCREENHACK, GFXConfigDialogOGL::GeneralSettingsChanged)
EVT_CHOICE(ID_ASPECT, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHOICE(ID_ASPECT, GFXConfigDialogOGL::GeneralSettingsChanged)
EVT_CHECKBOX(ID_CROP, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_CROP, GFXConfigDialogOGL::GeneralSettingsChanged)
#ifndef _WIN32 #ifndef _WIN32
@ -750,6 +751,9 @@ void GFXConfigDialogOGL::UpdateGUI()
// XFB looks much better if the copy comes from native resolution. // XFB looks much better if the copy comes from native resolution.
g_Config.bNativeResolution = true; g_Config.bNativeResolution = true;
m_NativeResolution->SetValue(true); m_NativeResolution->SetValue(true);
//also disable 2x, since it might leave both checked.
g_Config.b2xResolution = false;
m_2xResolution->SetValue(false);
} }
m_AutoScale->Enable(!g_Config.bUseXFB); m_AutoScale->Enable(!g_Config.bUseXFB);
@ -758,7 +762,10 @@ void GFXConfigDialogOGL::UpdateGUI()
if (g_Config.RenderToMainframe) m_Fullscreen->SetValue(false); if (g_Config.RenderToMainframe) m_Fullscreen->SetValue(false);
// Resolution settings // Resolution settings
m_2xResolution->Enable(!g_Config.bRunning || Renderer::Allow2x()); //disable native/2x choice when real xfb is on. native simply looks best, as ector noted above.
//besides, it would look odd if one disabled native, and it came back on again.
m_NativeResolution->Enable(!g_Config.bUseXFB);
m_2xResolution->Enable(!g_Config.bUseXFB && (!g_Config.bRunning || Renderer::Allow2x()));
m_WindowResolutionCB->Enable(!g_Config.bRunning); m_WindowResolutionCB->Enable(!g_Config.bRunning);
m_WindowFSResolutionCB->Enable(!g_Config.bRunning && !g_Config.RenderToMainframe); m_WindowFSResolutionCB->Enable(!g_Config.bRunning && !g_Config.RenderToMainframe);