From fd9f5042664b7c910347a7c134e64581ef9ab1d7 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 29 Aug 2019 11:47:22 -0400 Subject: [PATCH] Show current line number and total in status bar --- src/editor.rs | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/editor.rs b/src/editor.rs index b7c03f8..9d2f853 100644 --- a/src/editor.rs +++ b/src/editor.rs @@ -409,15 +409,22 @@ impl Editor { &self.filename }; - let mut message = format!("{:.20} - {} lines", filename, self.rows.len()); - let mut len = message.len(); + let mut left_message = format!("{:.20} - {} lines", filename, self.rows.len()); + let mut right_message = format!("{}/{}", self.cursor_y + 1, self.rows.len()); + let mut len = left_message.len(); + let mut rlen = right_message.len(); if len > self.screen_cols { - len = self.screen_cols; - message.truncate(len); - } - self.append_out(&message); - for _ in len..self.screen_cols { + len = self.screen_cols; + left_message.truncate(len); + } + self.append_out(&left_message); + + for x in len..self.screen_cols { + if self.screen_cols - x == rlen { + self.append_out(&right_message); + break; + } self.append_out(" "); } self.append_out("\x1b[m");