The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 03:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6974 from spycrab/qt_enhance_improvements

Browse Source 
Qt/EnhancementsWidget: Small improvements
This commit is contained in:
spycrab 2018-05-26 18:10:38 +02:00 committed by GitHub
commit 36f5af6c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp
View File

@ -21,7 +21,9 @@
#include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h" #include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h"
#include "DolphinQt2/Settings.h" #include "DolphinQt2/Settings.h"
#include "UICommon/VideoUtils.h" #include "UICommon/VideoUtils.h"
#include "VideoCommon/PostProcessing.h" #include "VideoCommon/PostProcessing.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
EnhancementsWidget::EnhancementsWidget(GraphicsWindow* parent) EnhancementsWidget::EnhancementsWidget(GraphicsWindow* parent)
@ -144,6 +146,7 @@ void EnhancementsWidget::ConnectWidgets()
void EnhancementsWidget::LoadPPShaders() void EnhancementsWidget::LoadPPShaders()
{ {
const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph;
std::vector<std::string> shaders = std::vector<std::string> shaders =
g_Config.stereo_mode == StereoMode::Anaglyph ? g_Config.stereo_mode == StereoMode::Anaglyph ?
PostProcessingShaderImplementation::GetAnaglyphShaderList( PostProcessingShaderImplementation::GetAnaglyphShaderList(
@ -151,26 +154,34 @@ void EnhancementsWidget::LoadPPShaders()
PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type); PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type);
m_pp_effect->clear(); m_pp_effect->clear();
if (!anaglyph)
m_pp_effect->addItem(tr("(off)")); m_pp_effect->addItem(tr("(off)"));
const auto selected_shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER); auto selected_shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER);
bool found = false;
for (const auto& shader : shaders) for (const auto& shader : shaders)
{ {
m_pp_effect->addItem(QString::fromStdString(shader)); m_pp_effect->addItem(QString::fromStdString(shader));
if (selected_shader == shader) if (selected_shader == shader)
{
m_pp_effect->setCurrentIndex(m_pp_effect->count() - 1); m_pp_effect->setCurrentIndex(m_pp_effect->count() - 1);
found = true;
} }
}
if (anaglyph && !found)
m_pp_effect->setCurrentIndex(m_pp_effect->findText(QStringLiteral("dubois")));
const bool supports_postprocessing = g_Config.backend_info.bSupportsPostProcessing; const bool supports_postprocessing = g_Config.backend_info.bSupportsPostProcessing;
m_pp_effect->setEnabled(supports_postprocessing); m_pp_effect->setEnabled(supports_postprocessing);
if (!supports_postprocessing) m_pp_effect->setToolTip(supports_postprocessing ?
{ QStringLiteral("") :
m_pp_effect->setToolTip(
tr("%1 doesn't support this feature.") tr("%1 doesn't support this feature.")
.arg(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend))); .arg(QString::fromStdString(g_video_backend->GetDisplayName())));
}
PostProcessingShaderConfiguration pp_shader; PostProcessingShaderConfiguration pp_shader;
if (selected_shader != "(off)") if (selected_shader != "(off)")
@ -206,7 +217,7 @@ void EnhancementsWidget::LoadSettings()
bool has_3dvision = m_3d_mode->count() == 6; bool has_3dvision = m_3d_mode->count() == 6;
if (has_3dvision && !supports_3dvision) if (has_3dvision && !supports_3dvision)
m_3d_mode->removeItem(4); m_3d_mode->removeItem(5);
if (!has_3dvision && supports_3dvision) if (!has_3dvision && supports_3dvision)
m_3d_mode->addItem(tr("NVIDIA 3D Vision")); m_3d_mode->addItem(tr("NVIDIA 3D Vision"));