From 853e9a8a6a7234caeaa2ca75544375318cc86d68 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 22 Jul 2022 21:51:00 +1000 Subject: [PATCH] Qt: Fix updater --- src/duckstation-qt/advancedsettingswidget.cpp | 4 +--- src/duckstation-qt/autoupdaterdialog.cpp | 2 +- src/duckstation-qt/mainwindow.cpp | 1 - src/frontend-common/imgui_manager.cpp | 13 +++++++------ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/duckstation-qt/advancedsettingswidget.cpp b/src/duckstation-qt/advancedsettingswidget.cpp index 27e06a878..678c6a8fc 100644 --- a/src/duckstation-qt/advancedsettingswidget.cpp +++ b/src/duckstation-qt/advancedsettingswidget.cpp @@ -197,6 +197,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget* Qt::QueuedConnection); m_ui.tweakOptionTable->setColumnWidth(0, 380); + m_ui.tweakOptionTable->setColumnWidth(1, 170); addBooleanTweakOption(dialog, m_ui.tweakOptionTable, tr("Disable All Enhancements"), "Main", "DisableAllEnhancements", false); @@ -204,8 +205,6 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget* true); addBooleanTweakOption(dialog, m_ui.tweakOptionTable, tr("Show Enhancement Settings"), "Display", "ShowEnhancements", false); - addBooleanTweakOption(dialog, m_ui.tweakOptionTable, tr("Controller Enhanced Mode (PS4/PS5)"), "Main", - "ControllerEnhancedMode", false); addIntRangeTweakOption(dialog, m_ui.tweakOptionTable, tr("Display FPS Limit"), "Display", "MaxFPS", 0, 1000, 0); addMSAATweakOption(dialog, m_ui.tweakOptionTable, tr("Multisample Antialiasing")); @@ -284,7 +283,6 @@ void AdvancedSettingsWidget::onResetToDefaultClicked() setBooleanTweakOption(m_ui.tweakOptionTable, i++, false); // Disable all enhancements setBooleanTweakOption(m_ui.tweakOptionTable, i++, true); // Show status indicators setBooleanTweakOption(m_ui.tweakOptionTable, i++, false); // Show enhancement settings - setBooleanTweakOption(m_ui.tweakOptionTable, i++, false); // Controller enhanced mode (PS4/PS5) setIntRangeTweakOption(m_ui.tweakOptionTable, i++, 0); // Display FPS limit setChoiceTweakOption(m_ui.tweakOptionTable, i++, 0); // Multisample antialiasing setBooleanTweakOption(m_ui.tweakOptionTable, i++, false); // PGXP vertex cache diff --git a/src/duckstation-qt/autoupdaterdialog.cpp b/src/duckstation-qt/autoupdaterdialog.cpp index c33923924..2a11f9671 100644 --- a/src/duckstation-qt/autoupdaterdialog.cpp +++ b/src/duckstation-qt/autoupdaterdialog.cpp @@ -92,7 +92,7 @@ std::string AutoUpdaterDialog::getDefaultTag() std::string AutoUpdaterDialog::getCurrentUpdateTag() const { #ifdef AUTO_UPDATER_SUPPORTED - return m_host_interface->GetStringSettingValue("AutoUpdater", "UpdateTag", THIS_RELEASE_TAG); + return Host::GetBaseStringSettingValue("AutoUpdater", "UpdateTag", THIS_RELEASE_TAG); #else return {}; #endif diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp index a05c5832a..daa77feba 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -645,7 +645,6 @@ void MainWindow::recreate() MainWindow* new_main_window = new MainWindow(); new_main_window->initialize(); - new_main_window->refreshGameList(false); new_main_window->show(); deleteLater(); } diff --git a/src/frontend-common/imgui_manager.cpp b/src/frontend-common/imgui_manager.cpp index 7b5f2a280..36af6e511 100644 --- a/src/frontend-common/imgui_manager.cpp +++ b/src/frontend-common/imgui_manager.cpp @@ -30,7 +30,7 @@ static void SetStyle(); static void SetKeyMap(); static bool LoadFontData(); static bool AddImGuiFonts(bool fullscreen_fonts); -static ImFont* AddTextFont(float size); +static ImFont* AddTextFont(float size, bool full_range); static ImFont* AddFixedFont(float size); static bool AddIconFonts(float size); static void AcquirePendingOSDMessages(); @@ -419,7 +419,7 @@ bool ImGuiManager::LoadFontData() return true; } -ImFont* ImGuiManager::AddTextFont(float size) +ImFont* ImGuiManager::AddTextFont(float size, bool full_range) { static const ImWchar default_ranges[] = { // Basic Latin + Latin Supplement + Central European diacritics @@ -445,7 +445,7 @@ ImFont* ImGuiManager::AddTextFont(float size) cfg.FontDataOwnedByAtlas = false; return ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_standard_font_data.data(), static_cast(s_standard_font_data.size()), size, &cfg, - s_font_range ? s_font_range : default_ranges); + (s_font_range && full_range) ? s_font_range : default_ranges); } ImFont* ImGuiManager::AddFixedFont(float size) @@ -478,7 +478,7 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts) ImGuiIO& io = ImGui::GetIO(); io.Fonts->Clear(); - s_standard_font = AddTextFont(standard_font_size); + s_standard_font = AddTextFont(standard_font_size, true); if (!s_standard_font || !AddIconFonts(standard_font_size)) return false; @@ -488,13 +488,14 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts) if (fullscreen_fonts) { + // Don't add full range for FSUI, we probably don't have the texture space, and it's not translated yet anyway. const float medium_font_size = std::ceil(ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_MEDIUM_FONT_SIZE)); - s_medium_font = AddTextFont(medium_font_size); + s_medium_font = AddTextFont(medium_font_size, false); if (!s_medium_font || !AddIconFonts(medium_font_size)) return false; const float large_font_size = std::ceil(ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_LARGE_FONT_SIZE)); - s_large_font = AddTextFont(large_font_size); + s_large_font = AddTextFont(large_font_size, false); if (!s_large_font || !AddIconFonts(large_font_size)) return false; }