diff options
author | bunnei <bunneidev@gmail.com> | 2015-03-07 18:18:40 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-03-07 18:18:40 -0500 |
commit | 06bf4715810489548a9a3b5e9274dfc78bc3fc4d (patch) | |
tree | a2722e2b7e1356d9cb9725f18f0561fcaf815ec1 /src/citra | |
parent | f29897ca6d712d1082c35fa3270fe2b525368fd5 (diff) | |
parent | 9960c49c217d2c1ae202bdacd475c9a47cda39b9 (diff) |
Merge pull request #636 from bunnei/refactor-screen-win
Set framebuffer layout from EmuWindow.
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index ec3e8cf3..81231e1e 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -36,20 +36,13 @@ const bool EmuWindow_GLFW::IsOpen() { } void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) { - ASSERT(width > 0); - ASSERT(height > 0); - - GetEmuWindow(win)->NotifyFramebufferSizeChanged(std::pair<unsigned,unsigned>(width, height)); + GetEmuWindow(win)->NotifyFramebufferLayoutChanged(EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height)); } void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) { - ASSERT(width > 0); - ASSERT(height > 0); - // NOTE: GLFW provides no proper way to set a minimal window size. // Hence, we just ignore the corresponding EmuWindow hint. - - GetEmuWindow(win)->NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned>(width, height)); + OnFramebufferResizeEvent(win, width, height); } /// EmuWindow_GLFW constructor |