franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shared_widget: Improve logging, use Setting::Ranged

Browse Source
This commit is contained in:
lat9nq 2023-06-13 19:38:12 -04:00
parent 27e53990ed
commit 7c52bb2772
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/yuzu/configuration/shared_widget.cpp
View File

@ -4,10 +4,12 @@
#include "yuzu/configuration/shared_widget.h" #include "yuzu/configuration/shared_widget.h"
#include <functional> #include <functional>
#include <limits>
#include <typeindex> #include <typeindex>
#include <typeinfo> #include <typeinfo>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <QAbstractButton> #include <QAbstractButton>
#include <QAbstractSlider> #include <QAbstractSlider>
#include <QBoxLayout> #include <QBoxLayout>
@ -33,10 +35,10 @@
#include <fmt/core.h> #include <fmt/core.h>
#include <qglobal.h> #include <qglobal.h>
#include <qnamespace.h> #include <qnamespace.h>
#include "common/assert.h" #include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/settings.h"
#include "common/settings_common.h" #include "common/settings_common.h"
#include "yuzu/configuration/shared_translation.h" #include "yuzu/configuration/shared_translation.h"
@ -178,6 +180,12 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& fo
std::function<std::string()>& serializer, std::function<std::string()>& serializer,
std::function<void()>& restore_func, std::function<void()>& restore_func,
const std::function<void()>& touch) { const std::function<void()>& touch) {
if (!setting.Ranged()) {
LOG_ERROR(Frontend, "\"{}\" is not a ranged setting, but a slider was requested.",
setting.GetLabel());
return nullptr;
}
QWidget* container = new QWidget(this); QWidget* container = new QWidget(this);
QHBoxLayout* layout = new QHBoxLayout(container); QHBoxLayout* layout = new QHBoxLayout(container);
@ -220,8 +228,10 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& fo
QWidget* Widget::CreateSpinBox(const QString& suffix, std::function<std::string()>& serializer, QWidget* Widget::CreateSpinBox(const QString& suffix, std::function<std::string()>& serializer,
std::function<void()>& restore_func, std::function<void()>& restore_func,
const std::function<void()>& touch) { const std::function<void()>& touch) {
const int min_val = std::stoi(setting.MinVal()); const int min_val =
const int max_val = std::stoi(setting.MaxVal()); setting.Ranged() ? std::stoi(setting.MinVal()) : std::numeric_limits<int>::min();
const int max_val =
setting.Ranged() ? std::stoi(setting.MaxVal()) : std::numeric_limits<int>::max();
const int default_val = std::stoi(setting.ToString()); const int default_val = std::stoi(setting.ToString());
spinbox = new QSpinBox(this); spinbox = new QSpinBox(this);
@ -331,8 +341,10 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
other_setting != nullptr && other_setting->TypeId() == typeid(bool); other_setting != nullptr && other_setting->TypeId() == typeid(bool);
if (other_setting != nullptr && other_setting->TypeId() != typeid(bool)) { if (other_setting != nullptr && other_setting->TypeId() != typeid(bool)) {
LOG_WARNING(Frontend, LOG_WARNING(
"Extra setting specified but is not bool, refusing to create checkbox for it."); Frontend,
"Extra setting \"{}\" specified but is not bool, refusing to create checkbox for it.",
other_setting->GetLabel());
} }
std::function<std::string()> checkbox_serializer = []() -> std::string { return {}; }; std::function<std::string()> checkbox_serializer = []() -> std::string { return {}; };
@ -348,7 +360,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this); restore_button = CreateRestoreGlobalButton(setting.UsingGlobal(), this);
touch = [this]() { touch = [this]() {
LOG_DEBUG(Frontend, "Setting custom setting for {}", setting.GetLabel()); LOG_DEBUG(Frontend, "Enabling custom setting for \"{}\"", setting.GetLabel());
restore_button->setEnabled(true); restore_button->setEnabled(true);
restore_button->setVisible(true); restore_button->setVisible(true);
}; };
@ -410,7 +422,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
} }
if (data_component == nullptr) { if (data_component == nullptr) {
LOG_ERROR(Frontend, "Failed to create widget for {}", setting.GetLabel()); LOG_ERROR(Frontend, "Failed to create widget for \"{}\"", setting.GetLabel());
created = false; created = false;
return; return;
} }