From 6fe51b48e960e81b1304d833b2d69b468a4a238a Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:12:42 -0400 Subject: [PATCH] yuzu-qt: Screenshots depend more on the graphics settings --- src/common/settings_enums.h | 2 - src/yuzu/bootmanager.cpp | 7 +- src/yuzu/configuration/configure_dialog.cpp | 8 +- src/yuzu/configuration/configure_dialog.h | 2 +- src/yuzu/configuration/configure_graphics.cpp | 44 ++++++- src/yuzu/configuration/configure_graphics.h | 17 ++- src/yuzu/configuration/configure_per_game.cpp | 3 +- src/yuzu/configuration/configure_ui.cpp | 113 ++++++++---------- src/yuzu/configuration/configure_ui.h | 8 ++ src/yuzu/configuration/configure_ui.ui | 42 ++----- src/yuzu/uisettings.cpp | 18 --- src/yuzu/uisettings.h | 5 - 12 files changed, 127 insertions(+), 142 deletions(-) diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index 7b2e558b6a..e7cb59ea5b 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -146,8 +146,6 @@ ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum); ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch); -ENUM(ScreenshotAspectRatio, Auto, Unspecified, R16_9, R4_3, R21_9, R16_10); - template inline std::string CanonicalizeEnum(Type id) { const auto group = EnumMetadata::Canonicalizations(); diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 24630e4cbf..407988b8f5 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -932,13 +932,8 @@ void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) { : Layout::ScreenUndocked::Height; height *= Settings::values.resolution_info.up_factor; } - const auto selected_ratio = UISettings::values.screenshot_aspect_ratio.GetValue(); const u32 width = - selected_ratio == Settings::ScreenshotAspectRatio::Unspecified - ? UISettings::values.screenshot_width.GetValue() - : UISettings::CalculateWidth( - height, UISettings::ConvertScreenshotRatioToRatio( - UISettings::values.screenshot_aspect_ratio.GetValue())); + UISettings::CalculateWidth(height, Settings::values.aspect_ratio.GetValue()); return Layout::DefaultFrameLayout(width, height); }()}; diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 3c6bb3eb1a..0ad95cc02a 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -4,6 +4,7 @@ #include #include "common/logging/log.h" #include "common/settings.h" +#include "common/settings_enums.h" #include "core/core.h" #include "ui_configure.h" #include "vk_device_info.h" @@ -41,16 +42,19 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, general_tab{std::make_unique(system_, nullptr, *builder, this)}, graphics_advanced_tab{ std::make_unique(system_, nullptr, *builder, this)}, + ui_tab{std::make_unique(system_, this)}, graphics_tab{std::make_unique( system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); }, + [this](Settings::AspectRatio ratio, Settings::ResolutionSetup setup) { + ui_tab->UpdateScreenshotInfo(ratio, setup); + }, nullptr, *builder, this)}, hotkeys_tab{std::make_unique(system_.HIDCore(), this)}, input_tab{std::make_unique(system_, this)}, network_tab{std::make_unique(system_, this)}, profile_tab{std::make_unique(system_, this)}, system_tab{std::make_unique(system_, nullptr, *builder, this)}, - ui_tab{std::make_unique(system_, this)}, web_tab{std::make_unique( - this)} { + web_tab{std::make_unique(this)} { Settings::SetConfiguringGlobal(true); ui->setupUi(this); diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h index 96e9a8c3e5..b28ce288c8 100644 --- a/src/yuzu/configuration/configure_dialog.h +++ b/src/yuzu/configuration/configure_dialog.h @@ -81,12 +81,12 @@ private: std::unique_ptr filesystem_tab; std::unique_ptr general_tab; std::unique_ptr graphics_advanced_tab; + std::unique_ptr ui_tab; std::unique_ptr graphics_tab; std::unique_ptr hotkeys_tab; std::unique_ptr input_tab; std::unique_ptr network_tab; std::unique_ptr profile_tab; std::unique_ptr system_tab; - std::unique_ptr ui_tab; std::unique_ptr web_tab; }; diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index a94fbc89a4..8622dc184d 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -77,13 +78,16 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode) } } -ConfigureGraphics::ConfigureGraphics(const Core::System& system_, - std::vector& records_, - const std::function& expose_compute_option_, - std::shared_ptr> group_, - const ConfigurationShared::Builder& builder, QWidget* parent) +ConfigureGraphics::ConfigureGraphics( + const Core::System& system_, std::vector& records_, + const std::function& expose_compute_option_, + const std::function& + update_aspect_ratio_, + std::shared_ptr> group_, + const ConfigurationShared::Builder& builder, QWidget* parent) : ConfigurationShared::Tab(group_, parent), ui{std::make_unique()}, - records{records_}, expose_compute_option{expose_compute_option_}, system{system_}, + records{records_}, expose_compute_option{expose_compute_option_}, + update_aspect_ratio{update_aspect_ratio_}, system{system_}, combobox_translations{builder.ComboboxTranslations()}, shader_mapping{ combobox_translations.at(Settings::EnumMetadata::Index())} { @@ -140,6 +144,26 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, UpdateBackgroundColorButton(new_bg_color); }); + const auto& update_screenshot_info = [this, &builder]() { + const auto& combobox_enumerations = builder.ComboboxTranslations().at( + Settings::EnumMetadata::Index()); + const auto index = aspect_ratio_combobox->currentIndex(); + const auto ratio = static_cast(combobox_enumerations[index].first); + + const auto& combobox_enumerations_resolution = builder.ComboboxTranslations().at( + Settings::EnumMetadata::Index()); + const auto res_index = resolution_combobox->currentIndex(); + const auto setup = static_cast( + combobox_enumerations_resolution[res_index].first); + + update_aspect_ratio(ratio, setup); + }; + + connect(aspect_ratio_combobox, QOverload::of(&QComboBox::currentIndexChanged), + update_screenshot_info); + connect(resolution_combobox, QOverload::of(&QComboBox::currentIndexChanged), + update_screenshot_info); + api_combobox->setEnabled(!UISettings::values.has_broken_vulkan && api_combobox->isEnabled()); ui->api_widget->setEnabled( (!UISettings::values.has_broken_vulkan || Settings::IsConfiguringGlobal()) && @@ -280,6 +304,14 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) { // Keep track of vsync_mode's combobox so we can populate it vsync_mode_combobox = widget->combobox; hold_graphics.emplace(setting->Id(), widget); + } else if (setting->Id() == Settings::values.aspect_ratio.Id()) { + // Keep track of the aspect ratio combobox to update other UI tabs that need it + aspect_ratio_combobox = widget->combobox; + hold_graphics.emplace(setting->Id(), widget); + } else if (setting->Id() == Settings::values.resolution_setup.Id()) { + // Keep track of the resolution combobox to update other UI tabs that need it + resolution_combobox = widget->combobox; + hold_graphics.emplace(setting->Id(), widget); } else { hold_graphics.emplace(setting->Id(), widget); } diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h index 02d9b00f17..9c24a56db2 100644 --- a/src/yuzu/configuration/configure_graphics.h +++ b/src/yuzu/configuration/configure_graphics.h @@ -14,6 +14,7 @@ #include #include #include "common/common_types.h" +#include "common/settings_enums.h" #include "configuration/shared_translation.h" #include "vk_device_info.h" #include "yuzu/configuration/configuration_shared.h" @@ -43,12 +44,13 @@ class Builder; class ConfigureGraphics : public ConfigurationShared::Tab { public: - explicit ConfigureGraphics(const Core::System& system_, - std::vector& records, - const std::function& expose_compute_option_, - std::shared_ptr> group, - const ConfigurationShared::Builder& builder, - QWidget* parent = nullptr); + explicit ConfigureGraphics( + const Core::System& system_, std::vector& records, + const std::function& expose_compute_option, + const std::function& + update_aspect_ratio, + std::shared_ptr> group, + const ConfigurationShared::Builder& builder, QWidget* parent = nullptr); ~ConfigureGraphics() override; void ApplyConfiguration() override; @@ -91,6 +93,7 @@ private: u32 vulkan_device{}; Settings::ShaderBackend shader_backend{}; const std::function& expose_compute_option; + const std::function update_aspect_ratio; const Core::System& system; const ConfigurationShared::ComboboxTranslationMap& combobox_translations; @@ -104,4 +107,6 @@ private: QWidget* vulkan_device_widget; QWidget* api_widget; QWidget* shader_backend_widget; + QComboBox* aspect_ratio_combobox; + QComboBox* resolution_combobox; }; diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index cd8b3012e8..4f9e8db083 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -17,6 +17,7 @@ #include #include "common/fs/fs_util.h" +#include "common/settings_enums.h" #include "configuration/shared_widget.h" #include "core/core.h" #include "core/file_sys/control_metadata.h" @@ -57,7 +58,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st std::make_unique(system_, tab_group, *builder, this); graphics_tab = std::make_unique( system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); }, - tab_group, *builder, this); + [](Settings::AspectRatio, Settings::ResolutionSetup) {}, tab_group, *builder, this); input_tab = std::make_unique(system_, game_config.get(), this); system_tab = std::make_unique(system_, tab_group, *builder, this); diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp index 206af81a8d..8d298993a3 100644 --- a/src/yuzu/configuration/configure_ui.cpp +++ b/src/yuzu/configuration/configure_ui.cpp @@ -24,6 +24,7 @@ #include "common/settings.h" #include "common/settings_enums.h" #include "core/core.h" +#include "core/frontend/framebuffer_layout.h" #include "ui_configure_ui.h" #include "yuzu/uisettings.h" @@ -66,40 +67,27 @@ QString GetTranslatedRowTextName(size_t index) { } } // Anonymous namespace -constexpr static std::array, 6> - screenshot_aspect_ratio_translations = { - std::pair{Settings::ScreenshotAspectRatio::Auto, "Auto"}, - std::pair{Settings::ScreenshotAspectRatio::Unspecified, "Unspecified"}, - std::pair{Settings::ScreenshotAspectRatio::R16_9, "16:9"}, - std::pair{Settings::ScreenshotAspectRatio::R4_3, "4:3"}, - std::pair{Settings::ScreenshotAspectRatio::R21_9, "21:9"}, - std::pair{Settings::ScreenshotAspectRatio::R16_10, "16:10"}, -}; - -static void PopulateAspectRatioComboBox(QComboBox* screenshot_aspect_ratio) { - screenshot_aspect_ratio->clear(); - - for (const auto& [value, name] : screenshot_aspect_ratio_translations) { - screenshot_aspect_ratio->addItem(QString::fromStdString(name)); - } +static float GetUpFactor(Settings::ResolutionSetup res_setup) { + Settings::ResolutionScalingInfo info{}; + Settings::TranslateResolutionInfo(res_setup, info); + return info.up_factor; } -static void PopulateResolutionComboBox(QComboBox* screenshot_height) { +static void PopulateResolutionComboBox(QComboBox* screenshot_height, QWidget* parent) { screenshot_height->clear(); const auto& enumeration = Settings::EnumMetadata::Canonicalizations(); - Settings::ResolutionScalingInfo info{}; std::set resolutions{}; for (const auto& [name, value] : enumeration) { - Settings::TranslateResolutionInfo(value, info); - u32 height_undocked = 720 * info.up_factor; - u32 height_docked = 1080 * info.up_factor; + const float up_factor = GetUpFactor(value); + u32 height_undocked = Layout::ScreenUndocked::Height * up_factor; + u32 height_docked = Layout::ScreenDocked::Height * up_factor; resolutions.emplace(height_undocked); resolutions.emplace(height_docked); } - screenshot_height->addItem(QStringLiteral("0")); + screenshot_height->addItem(parent->tr("Auto", "Screenshot height option")); for (const auto res : resolutions) { screenshot_height->addItem(QString::fromStdString(std::to_string(res))); } @@ -114,7 +102,9 @@ static u32 ScreenshotDimensionToInt(const QString& height) { } ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent) - : QWidget(parent), ui{std::make_unique()}, system{system_} { + : QWidget(parent), ui{std::make_unique()}, + ratio{Settings::values.aspect_ratio.GetValue()}, + resolution_setting{Settings::values.resolution_setup.GetValue()}, system{system_} { ui->setupUi(this); InitializeLanguageComboBox(); @@ -127,8 +117,7 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent) InitializeIconSizeComboBox(); InitializeRowComboBoxes(); - PopulateAspectRatioComboBox(ui->screenshot_aspect_ratio); - PopulateResolutionComboBox(ui->screenshot_height); + PopulateResolutionComboBox(ui->screenshot_height, this); SetConfiguration(); @@ -167,31 +156,9 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent) } }); - const auto update_width_text = [this]() { - const auto index = ui->screenshot_aspect_ratio->currentIndex(); - const auto selected_ratio = screenshot_aspect_ratio_translations[index].first; - if (selected_ratio == Settings::ScreenshotAspectRatio::Unspecified) { - ui->screenshot_width->setReadOnly(false); - return; - } else { - ui->screenshot_width->setReadOnly(true); - } - const Settings::AspectRatio ratio = - UISettings::ConvertScreenshotRatioToRatio(selected_ratio); - const auto height = ScreenshotDimensionToInt(ui->screenshot_height->currentText()); - const auto width = UISettings::CalculateWidth(height, ratio); - if (height == 0) { - ui->screenshot_width->setText(QString::fromStdString(fmt::format("Auto"))); - } else { - ui->screenshot_width->setText(QString::fromStdString(std::to_string(width))); - } - }; + connect(ui->screenshot_height, &QComboBox::currentTextChanged, [this]() { UpdateWidthText(); }); - connect(ui->screenshot_aspect_ratio, QOverload::of(&QComboBox::currentIndexChanged), - update_width_text); - connect(ui->screenshot_height, &QComboBox::currentTextChanged, update_width_text); - - update_width_text(); + UpdateWidthText(); } ConfigureUi::~ConfigureUi() = default; @@ -212,16 +179,8 @@ void ConfigureUi::ApplyConfiguration() { Common::FS::SetYuzuPath(Common::FS::YuzuPath::ScreenshotsDir, ui->screenshot_path_edit->text().toStdString()); - const auto ratio = - screenshot_aspect_ratio_translations[ui->screenshot_aspect_ratio->currentIndex()].first; - UISettings::values.screenshot_aspect_ratio.SetValue(ratio); const u32 height = ScreenshotDimensionToInt(ui->screenshot_height->currentText()); - const u32 calculated_width = - UISettings::CalculateWidth(height, UISettings::ConvertScreenshotRatioToRatio(ratio)); - const u32 width_readout = ScreenshotDimensionToInt(ui->screenshot_width->text()); UISettings::values.screenshot_height.SetValue(height); - UISettings::values.screenshot_width.SetValue( - ratio == Settings::ScreenshotAspectRatio::Unspecified ? width_readout : calculated_width); system.ApplySettings(); } @@ -248,16 +207,12 @@ void ConfigureUi::SetConfiguration() { ui->screenshot_path_edit->setText(QString::fromStdString( Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir))); - for (u32 i = 0; i < screenshot_aspect_ratio_translations.size(); i++) { - const auto ratio = screenshot_aspect_ratio_translations[i].first; - if (ratio == UISettings::values.screenshot_aspect_ratio.GetValue()) { - ui->screenshot_aspect_ratio->setCurrentIndex(i); - } + const auto height = UISettings::values.screenshot_height.GetValue(); + if (height == 0) { + ui->screenshot_height->setCurrentIndex(0); + } else { + ui->screenshot_height->setCurrentText(QStringLiteral("%1").arg(height)); } - ui->screenshot_height->setCurrentText( - QString::fromStdString(fmt::format("{}", UISettings::values.screenshot_height.GetValue()))); - ui->screenshot_width->setText( - QString::fromStdString(fmt::format("{}", UISettings::values.screenshot_width.GetValue()))); } void ConfigureUi::changeEvent(QEvent* event) { @@ -428,3 +383,29 @@ void ConfigureUi::OnLanguageChanged(int index) { emit LanguageChanged(ui->language_combobox->itemData(index).toString()); } + +void ConfigureUi::UpdateWidthText() { + const u32 height = ScreenshotDimensionToInt(ui->screenshot_height->currentText()); + const u32 width = UISettings::CalculateWidth(height, ratio); + if (height == 0) { + const auto up_factor = GetUpFactor(resolution_setting); + const u32 height_docked = Layout::ScreenDocked::Height * up_factor; + const u32 width_docked = UISettings::CalculateWidth(height_docked, ratio); + const u32 height_undocked = Layout::ScreenUndocked::Height * up_factor; + const u32 width_undocked = UISettings::CalculateWidth(height_undocked, ratio); + ui->screenshot_width->setText(tr("Auto (%1 x %2, %3 x %4)", "Screenshot width value") + .arg(width_undocked) + .arg(height_undocked) + .arg(width_docked) + .arg(height_docked)); + } else { + ui->screenshot_width->setText(QStringLiteral("%1 x").arg(width)); + } +} + +void ConfigureUi::UpdateScreenshotInfo(Settings::AspectRatio ratio_, + Settings::ResolutionSetup resolution_setting_) { + ratio = ratio_; + resolution_setting = resolution_setting_; + UpdateWidthText(); +} diff --git a/src/yuzu/configuration/configure_ui.h b/src/yuzu/configuration/configure_ui.h index 95af8370ef..2a2563a131 100644 --- a/src/yuzu/configuration/configure_ui.h +++ b/src/yuzu/configuration/configure_ui.h @@ -5,6 +5,7 @@ #include #include +#include "common/settings_enums.h" namespace Core { class System; @@ -23,6 +24,9 @@ public: void ApplyConfiguration(); + void UpdateScreenshotInfo(Settings::AspectRatio ratio, + Settings::ResolutionSetup resolution_info); + private slots: void OnLanguageChanged(int index); @@ -44,7 +48,11 @@ private: void UpdateFirstRowComboBox(bool init = false); void UpdateSecondRowComboBox(bool init = false); + void UpdateWidthText(); + std::unique_ptr ui; + Settings::AspectRatio ratio; + Settings::ResolutionSetup resolution_setting; Core::System& system; }; diff --git a/src/yuzu/configuration/configure_ui.ui b/src/yuzu/configuration/configure_ui.ui index 906fdd5b30..cb66ef1041 100644 --- a/src/yuzu/configuration/configure_ui.ui +++ b/src/yuzu/configuration/configure_ui.ui @@ -7,7 +7,7 @@ 0 0 363 - 562 + 603 @@ -206,38 +206,15 @@ 6 - - - - Resolution: - - - - - - - - - Aspect Ratio: - - - - - - - true + + + TextLabel - - - 0 - 0 - - - - true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -250,6 +227,13 @@ + + + + Resolution: + + + diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp index 606268a5ff..78f927ba9a 100644 --- a/src/yuzu/uisettings.cpp +++ b/src/yuzu/uisettings.cpp @@ -51,22 +51,4 @@ u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) { return height * 16 / 9; } -Settings::AspectRatio ConvertScreenshotRatioToRatio(Settings::ScreenshotAspectRatio ratio) { - switch (ratio) { - case Settings::ScreenshotAspectRatio::Auto: - return Settings::values.aspect_ratio.GetValue(); - case Settings::ScreenshotAspectRatio::R16_9: - return Settings::AspectRatio::R16_9; - case Settings::ScreenshotAspectRatio::R4_3: - return Settings::AspectRatio::R4_3; - case Settings::ScreenshotAspectRatio::R21_9: - return Settings::AspectRatio::R21_9; - case Settings::ScreenshotAspectRatio::R16_10: - return Settings::AspectRatio::R16_10; - case Settings::ScreenshotAspectRatio::Unspecified: - break; - } - return Settings::AspectRatio::R16_9; -} - } // namespace UISettings diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index 7b5d630d7b..8efd63f31f 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h @@ -132,10 +132,6 @@ struct Values { Setting enable_screenshot_save_as{linkage, true, "enable_screenshot_save_as", Category::Screenshots}; Setting screenshot_height{linkage, 0, "screenshot_height", Category::Screenshots}; - Setting screenshot_width{linkage, 0, "screenshot_width", Category::Screenshots}; - Setting screenshot_aspect_ratio{ - linkage, Settings::ScreenshotAspectRatio::Auto, "screenshot_aspect_ratio", - Category::Screenshots}; QString roms_path; QString symbols_path; @@ -195,7 +191,6 @@ struct Values { extern Values values; u32 CalculateWidth(u32 height, Settings::AspectRatio ratio); -Settings::AspectRatio ConvertScreenshotRatioToRatio(Settings::ScreenshotAspectRatio ratio); } // namespace UISettings