diff options
| author |  bunnei | 2015-03-07 17:21:19 -0500 |
|---|---|---|
| committer | bunnei | 2015-03-07 17:21:19 -0500 |
| commit | 9960c49c217d2c1ae202bdacd475c9a47cda39b9 (patch) | |
| tree | a80e07b2ee63c3a081f3b3aec4eb45279b6f9b85 /src/citra | |
| parent | Merge pull request #615 from Subv/services (diff) | |
| download | yuzu-9960c49c217d2c1ae202bdacd475c9a47cda39b9.tar.gz yuzu-9960c49c217d2c1ae202bdacd475c9a47cda39b9.tar.xz yuzu-9960c49c217d2c1ae202bdacd475c9a47cda39b9.zip | |
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 ec3e8cf34..81231e1e5 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() { | |||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) { | 38 | void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) { |
| 39 | ASSERT(width > 0); | 39 | GetEmuWindow(win)->NotifyFramebufferLayoutChanged(EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height)); |
| 40 | ASSERT(height > 0); | ||
| 41 | |||
| 42 | GetEmuWindow(win)->NotifyFramebufferSizeChanged(std::pair<unsigned,unsigned>(width, height)); | ||
| 43 | } | 40 | } |
| 44 | 41 | ||
| 45 | void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) { | 42 | void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) { |
| 46 | ASSERT(width > 0); | ||
| 47 | ASSERT(height > 0); | ||
| 48 | |||
| 49 | // NOTE: GLFW provides no proper way to set a minimal window size. | 43 | // NOTE: GLFW provides no proper way to set a minimal window size. |
| 50 | // Hence, we just ignore the corresponding EmuWindow hint. | 44 | // Hence, we just ignore the corresponding EmuWindow hint. |
| 51 | 45 | OnFramebufferResizeEvent(win, width, height); | |
| 52 | GetEmuWindow(win)->NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned>(width, height)); | ||
| 53 | } | 46 | } |
| 54 | 47 | ||
| 55 | /// EmuWindow_GLFW constructor | 48 | /// EmuWindow_GLFW constructor |