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

Merge pull request #11846 from Filoppi/fix_pp_settings_widget 

Qt: Fix some Post Process Configuration Widget issues
This commit is contained in:
Admiral H. Curtiss 2023-05-26 21:50:45 +02:00 committed by GitHub
parent 0f4dbdb0d4 aeff66d373
commit 34527cadcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
View File

@ -93,12 +93,17 @@ void PostProcessingConfigWindow::Create()
u32 row = 0; u32 row = 0;
bool add_general_page = false; bool add_general_page = false;
for (const auto& it : m_config_groups) for (auto& it : m_config_groups)
{ {
if (it->HasSubGroups()) if (it->HasSubGroups())
{ {
auto* const tab = CreateDependentTab(it); auto* const tab = CreateDependentTab(it);
m_tabs->addTab(tab, QString::fromStdString(it->GetGUIName())); m_tabs->addTab(tab, QString::fromStdString(it->GetGUIName()));
if (it->GetConfigurationOption()->m_type == OptionType::Bool)
{
it->EnableSuboptions(it->GetCheckboxValue());
}
} }
else else
{ {
@ -213,6 +218,12 @@ bool PostProcessingConfigWindow::ConfigGroup::HasSubGroups() const noexcept
return !m_subgroups.empty(); return !m_subgroups.empty();
} }
const ConfigurationOption*
PostProcessingConfigWindow::ConfigGroup::GetConfigurationOption() const noexcept
{
return m_config_option;
}
const std::vector<std::unique_ptr<PostProcessingConfigWindow::ConfigGroup>>& const std::vector<std::unique_ptr<PostProcessingConfigWindow::ConfigGroup>>&
PostProcessingConfigWindow::ConfigGroup::GetSubGroups() const noexcept PostProcessingConfigWindow::ConfigGroup::GetSubGroups() const noexcept
{ {
@ -300,11 +311,12 @@ u32 PostProcessingConfigWindow::ConfigGroup::AddFloat(PostProcessingConfigWindow
for (size_t i = 0; i < vector_size; ++i) for (size_t i = 0; i < vector_size; ++i)
{ {
const int current_value =
m_config_option->m_float_values[i] / m_config_option->m_float_step_values[i];
const float range = const float range =
m_config_option->m_float_max_values[i] - m_config_option->m_float_min_values[i]; m_config_option->m_float_max_values[i] - m_config_option->m_float_min_values[i];
const int steps = std::ceil(range / m_config_option->m_float_step_values[i]); const int steps = std::ceil(range / m_config_option->m_float_step_values[i]);
const int current_value =
std::round((m_config_option->m_float_values[i] - m_config_option->m_float_min_values[i]) /
m_config_option->m_float_step_values[i]);
auto* const slider = new QSlider(Qt::Orientation::Horizontal); auto* const slider = new QSlider(Qt::Orientation::Horizontal);
slider->setMinimum(0); slider->setMinimum(0);
@ -351,6 +363,11 @@ void PostProcessingConfigWindow::ConfigGroup::EnableSuboptions(const bool state)
} }
} }
int PostProcessingConfigWindow::ConfigGroup::GetCheckboxValue() const
{
return m_checkbox->isChecked();
}
int PostProcessingConfigWindow::ConfigGroup::GetSliderValue(size_t index) const int PostProcessingConfigWindow::ConfigGroup::GetSliderValue(size_t index) const
{ {
return m_sliders[index]->value(); return m_sliders[index]->value();

3
Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.h
View File

@ -41,9 +41,12 @@ private:
const std::string& GetOptionName() const noexcept; const std::string& GetOptionName() const noexcept;
void AddSubGroup(std::unique_ptr<ConfigGroup>&& subgroup); void AddSubGroup(std::unique_ptr<ConfigGroup>&& subgroup);
bool HasSubGroups() const noexcept; bool HasSubGroups() const noexcept;
const VideoCommon::PostProcessingConfiguration::ConfigurationOption*
GetConfigurationOption() const noexcept;
const std::vector<std::unique_ptr<ConfigGroup>>& GetSubGroups() const noexcept; const std::vector<std::unique_ptr<ConfigGroup>>& GetSubGroups() const noexcept;
u32 AddWidgets(PostProcessingConfigWindow* parent, QGridLayout* grid, u32 row); u32 AddWidgets(PostProcessingConfigWindow* parent, QGridLayout* grid, u32 row);
void EnableSuboptions(bool state); void EnableSuboptions(bool state);
int GetCheckboxValue() const;
int GetSliderValue(size_t index) const; int GetSliderValue(size_t index) const;
void SetSliderText(size_t index, const QString& text); void SetSliderText(size_t index, const QString& text);