refactor to use statusLineHeight().

contour-terminal · Feb 25, 2023 · affee03 · affee03
1 parent 8db7840
commit affee03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/vtbackend/Terminal.cpp b/src/vtbackend/Terminal.cpp
@@ -1056,10 +1056,7 @@ void Terminal::resizeScreenInternal(PageSize totalPageSize, std::optional<ImageS
 {
     // NOTE: This will only resize the currently active buffer.
     // Any other buffer will be resized when it is switched to.
-    auto const statusLineHeight = _hostWritableStatusLineScreen.pageSize().lines;
-    auto const mainDisplayPageSize = _state.statusDisplayType == StatusDisplayType::None
-                                         ? totalPageSize
-                                         : totalPageSize - statusLineHeight;
+    auto const mainDisplayPageSize = totalPageSize - statusLineHeight();
 
     auto const oldMainDisplayPageSize = _settings.pageSize;
 
@@ -1692,10 +1689,7 @@ void Terminal::hardReset()
     _hostWritableStatusLineScreen.clearScreen();
     _hostWritableStatusLineScreen.updateCursorIterator();
 
-    auto const statusLineHeight = LineCount(1);
-    auto const mainDisplayPageSize = _state.statusDisplayType == StatusDisplayType::None
-                                         ? _settings.pageSize
-                                         : _settings.pageSize - statusLineHeight;
+    auto const mainDisplayPageSize = _settings.pageSize - statusLineHeight();
 
     _primaryScreen.margin() =
         Margin { Margin::Vertical { {}, boxed_cast<LineOffset>(mainDisplayPageSize.lines) - 1 },
@@ -1761,10 +1755,7 @@ void Terminal::applyPageSizeToCurrentBuffer()
 
 void Terminal::applyPageSizeToMainDisplay(ScreenType screenType)
 {
-    auto const statusLineHeight = LineCount(1);
-    auto const mainDisplayPageSize = _state.statusDisplayType == StatusDisplayType::None
-                                         ? _settings.pageSize
-                                         : _settings.pageSize - statusLineHeight;
+    auto const mainDisplayPageSize = _settings.pageSize - statusLineHeight();
 
     // clang-format off
     switch (screenType)

diff --git a/src/vtrasterizer/Renderer.cpp b/src/vtrasterizer/Renderer.cpp
@@ -293,9 +293,7 @@ void Renderer::updateFontMetrics()
 
 void Renderer::render(Terminal& terminal, bool pressure)
 {
-    auto const statusLineHeight = terminal.state().statusDisplayType == StatusDisplayType::None
-                                      ? LineCount(0)
-                                      : terminal.hostWritableStatusLineDisplay().pageSize().lines;
+    auto const statusLineHeight = terminal.statusLineHeight();
     _gridMetrics.pageSize = terminal.pageSize() + statusLineHeight;
 
     executeImageDiscards();