From 812f3f69c854a5376dc0d123c4e545cf67c8690c Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan-sebastian.tuomi@aalto.fi>
Date: Sun, 9 Oct 2016 14:35:59 +0300
Subject: Fix printing issues

---
 editor.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'editor.cpp')

diff --git a/editor.cpp b/editor.cpp
index f8c8ade..ff12c9e 100644
--- a/editor.cpp
+++ b/editor.cpp
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <limits>
 #include <iostream>
+#include <iomanip>
 
 Editor::Editor(std::vector<std::string>* contents, const std::string& filename):
     m_current_line(0), m_filename(filename), m_stopped(false)  {
@@ -48,14 +49,21 @@ int Editor::run_editor() {
 }
 
 int Editor::print_contents_on_line(int line) const {
+    Utils::clear_screen();
+
     int output_length = m_contents->size();
     bool truncated = false;
-    if ((int) m_contents->size() > line + OUTPUT_LINE_MAX) {
-        output_length = line + OUTPUT_LINE_MAX;
+    int line_max = Utils::window_height() - 3;
+
+    int line_number_width = Utils::count_digits(m_contents->size());
+
+    if ((int) m_contents->size() > line + line_max) {
+        output_length = line + line_max;
         truncated = true;
     }
     for (int i = line; i < output_length; i++) {
-        std::cout << i << " " << m_contents->at(i) << '\n';
+        std::cout << std::setw(line_number_width) << i;
+        std::cout << " " << m_contents->at(i) << '\n';
     }
     if (truncated) {
         std::cout << "...\n";
-- 
cgit v1.3