summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre LittleWhite Laurent <lw.demoscene@googlemail.com>2016-07-23 19:37:12 +0200
committerAlexandre LittleWhite Laurent <lw.demoscene@googlemail.com>2016-07-23 21:02:05 +0200
commit7331b790217f9a3e86e5668cb134bd8f073ff289 (patch)
tree30ab146daeb3669ecf2f27f948bd6dc971d78a22
parentMerge pull request #1963 from wwylele/rtc (diff)
downloadyuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.tar
yuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.tar.gz
yuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.tar.bz2
yuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.tar.lz
yuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.tar.xz
yuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.tar.zst
yuzu-7331b790217f9a3e86e5668cb134bd8f073ff289.zip
-rw-r--r--src/common/emu_window.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 08270dd88..fd728c109 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -51,7 +51,6 @@ static bool IsWithinTouchscreen(const EmuWindow::FramebufferLayout& layout, unsi
}
std::tuple<unsigned,unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) {
-
new_x = std::max(new_x, framebuffer_layout.bottom_screen.left);
new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1);
@@ -92,9 +91,9 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
}
EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) {
-
- ASSERT(width > 0);
- ASSERT(height > 0);
+ // When hiding the widget, the function receives a size of 0
+ if (width == 0) width = 1;
+ if (height == 0) height = 1;
EmuWindow::FramebufferLayout res = { width, height, {}, {} };