diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index d5c699924..f4c25d1f0 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -160,11 +160,11 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.render_3d); ReadSetting("Renderer", Settings::values.factor_3d); - std::string default_shader = "none (builtin)"; + std::string default_shader = "None (builtin)"; if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::Anaglyph) - default_shader = "dubois (builtin)"; + default_shader = "Dubois (builtin)"; else if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::Interlaced) - default_shader = "horizontal (builtin)"; + default_shader = "Horizontal (builtin)"; Settings::values.pp_shader_name = sdl2_config->GetString("Renderer", "pp_shader_name", default_shader); ReadSetting("Renderer", Settings::values.filter_mode); diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts index fe80a02b5..aef05f5be 100644 --- a/src/android/build.gradle.kts +++ b/src/android/build.gradle.kts @@ -4,14 +4,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.8.1" apply false - id("com.android.library") version "8.8.1" apply false + id("com.android.application") version "8.11.1" apply false + id("com.android.library") version "8.11.1" apply false id("org.jetbrains.kotlin.android") version "2.0.20" apply false id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20" } tasks.register("clean").configure { - delete(rootProject.buildDir) + delete(rootProject.layout.buildDirectory) } buildscript { diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties index 8c21fb28b..3887de798 100644 --- a/src/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip diff --git a/src/citra_qt/aboutdialog.cpp b/src/citra_qt/aboutdialog.cpp index e5821bcaf..ca0c2197f 100644 --- a/src/citra_qt/aboutdialog.cpp +++ b/src/citra_qt/aboutdialog.cpp @@ -11,7 +11,6 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), ui(std::make_unique()) { ui->setupUi(this); - ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("azahar")).pixmap(200)); ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( QString::fromUtf8(Common::g_build_fullname), QString::fromUtf8(Common::g_scm_branch), QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10))); diff --git a/src/citra_qt/aboutdialog.ui b/src/citra_qt/aboutdialog.ui index 039e3e2d9..f85e7d290 100644 --- a/src/citra_qt/aboutdialog.ui +++ b/src/citra_qt/aboutdialog.ui @@ -27,7 +27,7 @@ - <html><head/><body><p><img src=":/icons/azahar.png"/></p></body></html> + <html><head/><body><p><img src=":/icons/default/256x256/azahar.png"/></p></body></html> diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 4d100222a..bc126089f 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -330,8 +331,6 @@ GMainWindow::GMainWindow(Core::System& system_) ui->setupUi(this); statusBar()->hide(); - setWindowIcon(QIcon(QString::fromStdString(":/icons/azahar.png"))); - default_theme_paths = QIcon::themeSearchPaths(); UpdateUITheme(); @@ -390,6 +389,10 @@ GMainWindow::GMainWindow(Core::System& system_) LOG_INFO(Frontend, "Host Swap: {:.2f} GiB", mem_info.total_swap_memory / f64{1_GiB}); UpdateWindowTitle(); + QIcon azahar_icon = QIcon(QString::fromStdString(":/icons/default/256x256/azahar.png")); + render_window->setWindowIcon(azahar_icon); + secondary_window->setWindowIcon(azahar_icon); + show(); #ifdef ENABLE_QT_UPDATE_CHECKER diff --git a/src/citra_qt/configuration/configure_enhancements.cpp b/src/citra_qt/configuration/configure_enhancements.cpp index 7d5c6fb2f..a40654a5d 100644 --- a/src/citra_qt/configuration/configure_enhancements.cpp +++ b/src/citra_qt/configuration/configure_enhancements.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 Citra Emulator Project +// Copyright Citra Emulator Project / Azahar Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -75,7 +75,7 @@ void ConfigureEnhancements::updateShaders(Settings::StereoRenderOption stereo_op if (stereo_option == Settings::StereoRenderOption::Interlaced || stereo_option == Settings::StereoRenderOption::ReverseInterlaced) { - ui->shader_combobox->addItem(QStringLiteral("horizontal (builtin)")); + ui->shader_combobox->addItem(QStringLiteral("Horizontal (builtin)")); ui->shader_combobox->setCurrentIndex(0); ui->shader_combobox->setEnabled(false); return; @@ -83,10 +83,10 @@ void ConfigureEnhancements::updateShaders(Settings::StereoRenderOption stereo_op std::string current_shader; if (stereo_option == Settings::StereoRenderOption::Anaglyph) { - ui->shader_combobox->addItem(QStringLiteral("dubois (builtin)")); + ui->shader_combobox->addItem(QStringLiteral("Dubois (builtin)")); current_shader = Settings::values.anaglyph_shader_name.GetValue(); } else { - ui->shader_combobox->addItem(QStringLiteral("none (builtin)")); + ui->shader_combobox->addItem(QStringLiteral("None (builtin)")); current_shader = Settings::values.pp_shader_name.GetValue(); } diff --git a/src/common/settings.h b/src/common/settings.h index 552f89dbd..e6576b748 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -566,8 +566,8 @@ struct Values { Setting cardboard_y_shift{0, "cardboard_y_shift"}; SwitchableSetting filter_mode{true, "filter_mode"}; - SwitchableSetting pp_shader_name{"none (builtin)", "pp_shader_name"}; - SwitchableSetting anaglyph_shader_name{"dubois (builtin)", "anaglyph_shader_name"}; + SwitchableSetting pp_shader_name{"None (builtin)", "pp_shader_name"}; + SwitchableSetting anaglyph_shader_name{"Dubois (builtin)", "anaglyph_shader_name"}; SwitchableSetting dump_textures{false, "dump_textures"}; SwitchableSetting custom_textures{false, "custom_textures"}; diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index 0e930900a..a347053fd 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -121,8 +121,10 @@ FramebufferLayout SingleFrameLayout(u32 width, u32 height, bool swapped, bool up width - Settings::values.screen_bottom_leftright_padding.GetValue(), height - Settings::values.screen_bottom_topbottom_padding.GetValue()}; } else { - top_screen = top_screen.TranslateY((height - top_screen.GetHeight()) / 2); - bot_screen = bot_screen.TranslateY((height - bot_screen.GetHeight()) / 2); + top_screen = top_screen.TranslateX((width - top_screen.GetWidth()) / 2) + .TranslateY((height - top_screen.GetHeight()) / 2); + bot_screen = bot_screen.TranslateX((width - bot_screen.GetWidth()) / 2) + .TranslateY((height - bot_screen.GetHeight()) / 2); } #endif diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index bb9df55f0..0dd68c55b 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -367,7 +367,7 @@ void RendererOpenGL::ReloadShader() { // Link shaders and get variable locations std::string shader_data = fragment_shader_precision_OES; if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::Anaglyph) { - if (Settings::values.anaglyph_shader_name.GetValue() == "dubois (builtin)") { + if (Settings::values.anaglyph_shader_name.GetValue() == "Dubois (builtin)") { shader_data += HostShaders::OPENGL_PRESENT_ANAGLYPH_FRAG; } else { std::string shader_text = OpenGL::GetPostProcessingShaderCode( @@ -384,7 +384,7 @@ void RendererOpenGL::ReloadShader() { Settings::StereoRenderOption::ReverseInterlaced) { shader_data += HostShaders::OPENGL_PRESENT_INTERLACED_FRAG; } else { - if (Settings::values.pp_shader_name.GetValue() == "none (builtin)") { + if (Settings::values.pp_shader_name.GetValue() == "None (builtin)") { shader_data += HostShaders::OPENGL_PRESENT_FRAG; } else { std::string shader_text = OpenGL::GetPostProcessingShaderCode(