From b4ae0d537772f0a0fe60b7d62719560d4e5b6886 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 9 Nov 2016 22:51:10 -0500 Subject: [PATCH] rows and columns must be >= 1 --- src/gui/Window.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/Window.cc b/src/gui/Window.cc index 5cda39a..3f37fc7 100644 --- a/src/gui/Window.cc +++ b/src/gui/Window.cc @@ -405,10 +405,8 @@ void Window::resize() m_shaders.flat->set_viewport_size(m_width, m_height); m_shaders.rect->use(); m_shaders.rect->set_viewport_size(m_width, m_height); - m_columns = m_width / m_font.get_advance(); - if (m_columns < 1) - m_columns = 1; - m_rows = (m_height - 2) / m_font.get_line_height(); + m_columns = std::max(1, m_width / m_font.get_advance()); + m_rows = std::max(1, (m_height - 2) / m_font.get_line_height()); } void Window::redraw()