diff options
author | Tony Wasserka <NeoBrainX@gmail.com> | 2014-11-13 20:47:46 +0100 |
---|---|---|
committer | Tony Wasserka <NeoBrainX@gmail.com> | 2014-11-18 13:16:02 +0100 |
commit | 963c923d5931dc9d20eb298001282da88e31c31a (patch) | |
tree | 578bfe27494f4cfd1320592e73b3d0e2b3cf1497 /src/citra | |
parent | EmuWindow: Add some explicit documentation and set proper minimal client area size. (diff) | |
download | yuzu-963c923d5931dc9d20eb298001282da88e31c31a.tar yuzu-963c923d5931dc9d20eb298001282da88e31c31a.tar.gz yuzu-963c923d5931dc9d20eb298001282da88e31c31a.tar.bz2 yuzu-963c923d5931dc9d20eb298001282da88e31c31a.tar.lz yuzu-963c923d5931dc9d20eb298001282da88e31c31a.tar.xz yuzu-963c923d5931dc9d20eb298001282da88e31c31a.tar.zst yuzu-963c923d5931dc9d20eb298001282da88e31c31a.zip |
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 9e6f91578..8efb39e2e 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -46,14 +46,8 @@ void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int hei _dbg_assert_(GUI, width > 0); _dbg_assert_(GUI, height > 0); - // TODO: It's actually more interesting to us what the framebuffer size ends up being. - int adjusted_width = std::max<unsigned>(width, GetEmuWindow(win)->GetActiveConfig().min_client_area_size.first); - int adjusted_height = std::max<unsigned>(height, GetEmuWindow(win)->GetActiveConfig().min_client_area_size.second); - - if (adjusted_width != width || adjusted_height != height) { - glfwSetWindowSize(win, adjusted_width, adjusted_height); - return; - } + // 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)); } |