From bc2dbb502a51befc1e4fbe9bcb850584eeee4d38 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Sun, 26 Apr 2026 16:58:01 +0100 Subject: [PATCH] Apply clang-format --- src/android/app/src/main/jni/config.cpp | 2 +- .../app/src/main/jni/emu_window/emu_window.cpp | 6 +++--- src/common/settings.h | 11 ++++++++++- src/core/frontend/framebuffer_layout.cpp | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 2c481bb8e..967166e12 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -157,7 +157,7 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.turbo_limit); // Workaround to map Android setting for enabling the frame limiter to the format Citra expects if (android_config->GetBoolean("Renderer", "use_frame_limit", true)) { - ReadSetting("Renderer", Settings::values.frame_limit); + ReadSetting("Renderer", Settings::values.frame_limit); } else { Settings::values.frame_limit = 0; } diff --git a/src/android/app/src/main/jni/emu_window/emu_window.cpp b/src/android/app/src/main/jni/emu_window/emu_window.cpp index b7c2f4e42..fed800c52 100644 --- a/src/android/app/src/main/jni/emu_window/emu_window.cpp +++ b/src/android/app/src/main/jni/emu_window/emu_window.cpp @@ -18,8 +18,8 @@ #include "video_core/renderer_base.h" bool EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) { - int w = surface== NULL ? 0 : ANativeWindow_getWidth(surface); - int h = surface== NULL ? 0 : ANativeWindow_getHeight(surface); + int w = surface == NULL ? 0 : ANativeWindow_getWidth(surface); + int h = surface == NULL ? 0 : ANativeWindow_getHeight(surface); if (render_window == surface && w == window_width && h == window_height) { return false; } @@ -53,7 +53,7 @@ void EmuWindow_Android::OnTouchMoved(int x, int y) { void EmuWindow_Android::OnFramebufferSizeChanged() { const bool is_portrait_mode = IsPortraitMode() && !is_secondary; - UpdateCurrentFramebufferLayout(window_width,window_height,is_portrait_mode); + UpdateCurrentFramebufferLayout(window_width, window_height, is_portrait_mode); } EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface, bool is_secondary) diff --git a/src/common/settings.h b/src/common/settings.h index 61656e01c..e98254e97 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -57,7 +57,16 @@ enum class PortraitLayoutOption : u32 { PortraitOriginal }; -enum class SecondaryDisplayLayout : u32 { None, TopScreenOnly, BottomScreenOnly, SideBySide, ReversePrimary, Original, Hybrid, LargeScreen }; +enum class SecondaryDisplayLayout : u32 { + None, + TopScreenOnly, + BottomScreenOnly, + SideBySide, + ReversePrimary, + Original, + Hybrid, + LargeScreen +}; /** Defines where the small screen will appear relative to the large screen * when in Large Screen mode */ diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index 303661059..f87c1fdf7 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -305,7 +305,7 @@ FramebufferLayout AndroidSecondaryLayout(u32 width, u32 height) { const Settings::SecondaryDisplayLayout layout = Settings::values.secondary_display_layout.GetValue(); switch (layout) { - case Settings::SecondaryDisplayLayout::TopScreenOnly: + case Settings::SecondaryDisplayLayout::TopScreenOnly: return SingleFrameLayout(width, height, false, Settings::values.upright_screen.GetValue()); case Settings::SecondaryDisplayLayout::BottomScreenOnly: