From 0dcb886ef23ce0bf0a12b8de4581625413491cdb Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Tue, 21 Jan 2020 14:24:16 -0300 Subject: [PATCH] clang format --- src/core/frontend/emu_window.cpp | 35 +++++++++++++++++++------------- src/core/frontend/emu_window.h | 2 +- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index cfc13c2df..724a58a29 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -46,7 +46,8 @@ private: EmuWindow::EmuWindow() { // TODO: Find a better place to set this. - config.min_client_area_size = std::make_pair(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight); + config.min_client_area_size = + std::make_pair(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight); active_config = config; touch_state = std::make_shared(); Input::RegisterFactory("emu_window", touch_state); @@ -152,35 +153,41 @@ void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) } else { switch (Settings::values.layout_option) { case Settings::LayoutOption::SingleScreen: - min_width = Settings::values.swap_screen ? Core::kScreenBottomWidth : Core::kScreenTopWidth; + min_width = + Settings::values.swap_screen ? Core::kScreenBottomWidth : Core::kScreenTopWidth; min_height = Core::kScreenBottomHeight; - layout = Layout::SingleFrameLayout(std::max(width, min_width), std::max(height, min_height), Settings::values.swap_screen, - Settings::values.upright_screen); + layout = Layout::SingleFrameLayout( + std::max(width, min_width), std::max(height, min_height), + Settings::values.swap_screen, Settings::values.upright_screen); break; case Settings::LayoutOption::LargeScreen: - min_width = Settings::values.swap_screen ? Core::kScreenTopWidth/4 + Core::kScreenBottomWidth : Core::kScreenTopWidth + Core::kScreenBottomWidth/4; + min_width = Settings::values.swap_screen + ? Core::kScreenTopWidth / 4 + Core::kScreenBottomWidth + : Core::kScreenTopWidth + Core::kScreenBottomWidth / 4; min_height = Core::kScreenBottomHeight; - layout = Layout::LargeFrameLayout(std::max(width, min_width), std::max(height, min_height), Settings::values.swap_screen, - Settings::values.upright_screen); + layout = Layout::LargeFrameLayout( + std::max(width, min_width), std::max(height, min_height), + Settings::values.swap_screen, Settings::values.upright_screen); break; case Settings::LayoutOption::SideScreen: min_width = Core::kScreenTopWidth + Core::kScreenBottomWidth; min_height = Core::kScreenBottomHeight; - layout = Layout::SideFrameLayout(std::max(width, min_width), std::max(height, min_height), Settings::values.swap_screen, - Settings::values.upright_screen); + layout = Layout::SideFrameLayout( + std::max(width, min_width), std::max(height, min_height), + Settings::values.swap_screen, Settings::values.upright_screen); break; case Settings::LayoutOption::Default: default: min_width = Core::kScreenTopWidth; min_height = Core::kScreenTopHeight + Core::kScreenBottomHeight; - layout = Layout::DefaultFrameLayout(std::max(width, min_width), std::max(height, min_height), Settings::values.swap_screen, - Settings::values.upright_screen); + layout = Layout::DefaultFrameLayout( + std::max(width, min_width), std::max(height, min_height), + Settings::values.swap_screen, Settings::values.upright_screen); break; } - if(Settings::values.upright_screen){ + if (Settings::values.upright_screen) { UpdateMinimumWindowSize(min_height, min_width); - } - else{ + } else { UpdateMinimumWindowSize(min_width, min_height); } } diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index 65dac68c9..640c33bc2 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -216,7 +216,7 @@ private: */ std::tuple ClipToTouchScreen(unsigned new_x, unsigned new_y) const; - void UpdateMinimumWindowSize(unsigned int min_width, unsigned int min_height){ + void UpdateMinimumWindowSize(unsigned int min_width, unsigned int min_height) { WindowConfig new_config = config; new_config.min_client_area_size = std::make_pair(min_width, min_height); SetConfig(new_config);