From f34aaf747181972867b159a829c43ab3e6fd17cb Mon Sep 17 00:00:00 2001 From: gnick79 Date: Sat, 5 Feb 2011 02:13:33 +0000 Subject: [PATCH] * fixed a GUI displaying bug for post processing shaders when switching between plugins git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7069 8ced0084-cf51-0410-be5f-012b33b47a6e --- Languages/fr.po | 4 ++-- Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp | 10 +++++----- Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 3 +++ Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 6 ++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Languages/fr.po b/Languages/fr.po index 58021dd368..98e01205cf 100644 --- a/Languages/fr.po +++ b/Languages/fr.po @@ -669,7 +669,7 @@ msgstr "Audio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Audio Backend:" -msgstr "Interface audio:" +msgstr "Interface audio :" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 msgid "AudioCommon: Error opening AO device.\n" @@ -2301,7 +2301,7 @@ msgstr "Saut d'&image :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "Framelimit:" -msgstr "Image/s max:" +msgstr "Image/s max :" #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:403 msgid "Free Look" diff --git a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp b/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp index ee45e9d97e..1cad9f4c02 100644 --- a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp +++ b/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp @@ -409,12 +409,12 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // - misc { - wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5); + wxGridSizer* const szr_misc = new wxGridSizer(2); - szr_misc->Add(new SettingCheckBox(page_advanced, _("Crop"), crop_tooltip, vconfig.bCrop)); - szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL)); - szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable)); - szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey)); + szr_misc->Add(new SettingCheckBox(page_advanced, _("Crop"), crop_tooltip, vconfig.bCrop), 0, wxBOTTOM, 5); + szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL), 0, wxLEFT|wxBOTTOM, 5); + szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable), 0, wxBOTTOM, 5); + szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey), 0, wxLEFT|wxBOTTOM, 5); // postproc shader if (vconfig.backend_info.PPShaders.size()) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index fe33a25ce3..8a6dbf25d8 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -158,6 +158,9 @@ void VideoBackend::ShowConfig(void *_hParent) factory->Release(); + // Clear ppshaders string vector + g_Config.backend_info.PPShaders.clear(); + VideoConfigDiag *const diag = new VideoConfigDiag((wxWindow*)_hParent, _trans("Direct3D11"), "gfx_dx11"); diag->ShowModal(); diag->Destroy(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 9a355488ee..9fd369078a 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -138,8 +138,10 @@ void VideoBackend::ShowConfig(void* parent) for (int i = 0; i < (int)adapter.aa_levels.size(); ++i) g_Config.backend_info.AAModes.push_back(adapter.aa_levels[i].name); } - - + + // Clear ppshaders string vector + g_Config.backend_info.PPShaders.clear(); + VideoConfigDiag *const diag = new VideoConfigDiag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9"); diag->ShowModal(); diag->Destroy();