From 862b414c1d8d8d44f469beb48380d5682d1a1047 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 29 Jul 2016 21:06:28 -0400
Subject: [PATCH] Window: rename m_chars_per_line -> m_columns

---
 src/gui/Window.cc | 8 ++++----
 src/gui/Window.h  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/Window.cc b/src/gui/Window.cc
index b1bc0c4..4ed3668 100644
--- a/src/gui/Window.cc
+++ b/src/gui/Window.cc
@@ -253,9 +253,9 @@ void Window::resize()
     glViewport(0, 0, m_width, m_height);
     m_programs.text->use();
     m_programs.text->set_viewport_size(m_width, m_height);
-    m_chars_per_line = m_width / m_font.get_advance();
-    if (m_chars_per_line < 1)
-        m_chars_per_line = 1;
+    m_columns = m_width / m_font.get_advance();
+    if (m_columns < 1)
+        m_columns = 1;
 }
 
 void Window::redraw()
@@ -279,7 +279,7 @@ void Window::redraw()
             auto g = m_font.get_glyph(c);
             m_programs.text->set_position(x, y);
             g->render();
-            if ((i + 1) % m_chars_per_line == 0)
+            if ((i + 1) % m_columns == 0)
             {
                 y -= line_height;
                 x = 0;
diff --git a/src/gui/Window.h b/src/gui/Window.h
index 6f2f8d4..d449dde 100644
--- a/src/gui/Window.h
+++ b/src/gui/Window.h
@@ -30,7 +30,7 @@ protected:
     } m_programs;
 
     Font m_font;
-    int m_chars_per_line;
+    int m_columns;
 
     std::shared_ptr<Buffer> m_buffer;