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

Address review comments

This commit is contained in:
Vitor Kiguchi 2020-01-22 12:51:04 -03:00
parent 157f82141d
commit b713fe3329
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,8 +147,8 @@ 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;
Settings::LayoutOption layout_option = Settings::values.layout_option; const auto layout_option = Settings::values.layout_option;
std::pair<unsigned, unsigned> min_size = const auto min_size =
Layout::GetMinimumSizeFromLayout(layout_option, Settings::values.upright_screen); Layout::GetMinimumSizeFromLayout(layout_option, Settings::values.upright_screen);
if (Settings::values.custom_layout == true) { if (Settings::values.custom_layout == true) {
@ -180,4 +180,11 @@ void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height)
NotifyFramebufferLayoutChanged(layout); NotifyFramebufferLayoutChanged(layout);
} }
void EmuWindow::UpdateMinimumWindowSize(std::pair<unsigned, unsigned> min_size) {
WindowConfig new_config = config;
new_config.min_client_area_size = min_size;
SetConfig(new_config);
ProcessConfigurationChanges();
}
} // namespace Frontend } // namespace Frontend

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

@ -216,12 +216,7 @@ private:
*/ */
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(std::pair<unsigned, unsigned> min_size) { void UpdateMinimumWindowSize(std::pair<unsigned, unsigned> min_size);
WindowConfig new_config = config;
new_config.min_client_area_size = min_size;
SetConfig(new_config);
ProcessConfigurationChanges();
}
}; };
} // namespace Frontend } // namespace Frontend