From 90d9c83067f2a0b1ea576e5e3f995d4f5c5ac72c Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 9 Sep 2020 18:49:21 -0400 Subject: [PATCH] LibVT: Let Terminal only expose history_size, not storage --- Libraries/LibVT/Terminal.h | 2 +- Libraries/LibVT/TerminalWidget.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/LibVT/Terminal.h b/Libraries/LibVT/Terminal.h index c1f7fc0b6b..49a73fd32e 100644 --- a/Libraries/LibVT/Terminal.h +++ b/Libraries/LibVT/Terminal.h @@ -96,7 +96,7 @@ public: } size_t max_history_size() const { return 500; } - const NonnullOwnPtrVector& history() const { return m_history; } + size_t history_size() const { return m_history.size(); } void inject_string(const StringView&); void handle_key_press(KeyCode, u32, u8 flags); diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp index 973cf7293d..8e5483acac 100644 --- a/Libraries/LibVT/TerminalWidget.cpp +++ b/Libraries/LibVT/TerminalWidget.cpp @@ -274,11 +274,11 @@ void TerminalWidget::paint_event(GUI::PaintEvent& event) invalidate_cursor(); int rows_from_history = 0; - int first_row_from_history = m_terminal.history().size(); + int first_row_from_history = m_terminal.history_size(); int row_with_cursor = m_terminal.cursor_row(); if (m_scrollbar->value() != m_scrollbar->max()) { rows_from_history = min((int)m_terminal.rows(), m_scrollbar->max() - m_scrollbar->value()); - first_row_from_history = m_terminal.history().size() - (m_scrollbar->max() - m_scrollbar->value()); + first_row_from_history = m_terminal.history_size() - (m_scrollbar->max() - m_scrollbar->value()); row_with_cursor = m_terminal.cursor_row() + rows_from_history; } @@ -742,7 +742,7 @@ int TerminalWidget::last_selection_column_on_row(int row) const void TerminalWidget::terminal_history_changed() { bool was_max = m_scrollbar->value() == m_scrollbar->max(); - m_scrollbar->set_max(m_terminal.history().size()); + m_scrollbar->set_max(m_terminal.history_size()); if (was_max) m_scrollbar->set_value(m_scrollbar->max()); m_scrollbar->update();