midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change min_client_area_size based on layout

Browse Source
This commit is contained in:
Vitor Kiguchi 2020-01-04 08:59:09 -03:00
parent a0f9c795c8
commit 64737afdbc
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra_qt/bootmanager.cpp
View File

@ -374,6 +374,7 @@ void GRenderWindow::InitRenderTarget() {
core_context = CreateSharedContext(); core_context = CreateSharedContext();
resize(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight); resize(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight);
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
OnFramebufferSizeChanged();
BackupGeometry(); BackupGeometry();
} }

15
src/core/frontend/emu_window.cpp
View File

@ -145,6 +145,7 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) { void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) {
Layout::FramebufferLayout layout; Layout::FramebufferLayout layout;
unsigned int min_width, min_height;
if (Settings::values.custom_layout == true) { if (Settings::values.custom_layout == true) {
layout = Layout::CustomFrameLayout(width, height); layout = Layout::CustomFrameLayout(width, height);
} else { } else {
@ -152,21 +153,35 @@ void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height)
case Settings::LayoutOption::SingleScreen: case Settings::LayoutOption::SingleScreen:
layout = Layout::SingleFrameLayout(width, height, Settings::values.swap_screen, layout = Layout::SingleFrameLayout(width, height, Settings::values.swap_screen,
Settings::values.upright_screen); Settings::values.upright_screen);
min_width = Settings::values.swap_screen ? 320u : 400u;
min_height = 240u;
break; break;
case Settings::LayoutOption::LargeScreen: case Settings::LayoutOption::LargeScreen:
layout = Layout::LargeFrameLayout(width, height, Settings::values.swap_screen, layout = Layout::LargeFrameLayout(width, height, Settings::values.swap_screen,
Settings::values.upright_screen); Settings::values.upright_screen);
min_width = Settings::values.swap_screen ? 420u : 480u;
min_height = 240u;
break; break;
case Settings::LayoutOption::SideScreen: case Settings::LayoutOption::SideScreen:
layout = Layout::SideFrameLayout(width, height, Settings::values.swap_screen, layout = Layout::SideFrameLayout(width, height, Settings::values.swap_screen,
Settings::values.upright_screen); Settings::values.upright_screen);
min_width = 720u;
min_height = 240u;
break; break;
case Settings::LayoutOption::Default: case Settings::LayoutOption::Default:
default: default:
layout = Layout::DefaultFrameLayout(width, height, Settings::values.swap_screen, layout = Layout::DefaultFrameLayout(width, height, Settings::values.swap_screen,
Settings::values.upright_screen); Settings::values.upright_screen);
min_width = 400u;
min_height = 480u;
break; break;
} }
if(Settings::values.upright_screen){
UpdateMinimumWindowSize(min_height, min_width);
}
else{
UpdateMinimumWindowSize(min_width, min_height);
}
} }
NotifyFramebufferLayoutChanged(layout); NotifyFramebufferLayoutChanged(layout);
} }

7
src/core/frontend/emu_window.h
View File

@ -215,6 +215,13 @@ private:
* Clip the provided coordinates to be inside the touchscreen area. * Clip the provided coordinates to be inside the touchscreen area.
*/ */
std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y) const; std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y) const;
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);
ProcessConfigurationChanges();
}
}; };
} // namespace Frontend } // namespace Frontend