RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:57:45 +00:00
Code Issues Activity Actions

LibVT: Correctly wrap text when the scrollbar is hidden

Browse source
This commit is contained in:
networkException 2023-05-15 21:33:36 +02:00 • committed by Andreas Kling
parent b15128c45b
commit 63d2b26b17
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibVT/TerminalWidget.cpp
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers. * Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2023, networkException <networkexception@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -527,7 +528,7 @@ void TerminalWidget::relayout(Gfx::IntSize size)
Gfx::IntSize TerminalWidget::compute_base_size() const Gfx::IntSize TerminalWidget::compute_base_size() const
{ {
int base_width = frame_thickness() * 2 + m_inset * 2 + m_scrollbar->width(); int base_width = frame_thickness() * 2 + m_inset * 2 + (m_scrollbar->is_visible() ? m_scrollbar->width() : 0);
int base_height = frame_thickness() * 2 + m_inset * 2; int base_height = frame_thickness() * 2 + m_inset * 2;
return { base_width, base_height }; return { base_width, base_height };
} }
@ -557,6 +558,7 @@ void TerminalWidget::set_opacity(u8 new_opacity)
void TerminalWidget::set_show_scrollbar(bool show_scrollbar) void TerminalWidget::set_show_scrollbar(bool show_scrollbar)
{ {
m_scrollbar->set_visible(show_scrollbar); m_scrollbar->set_visible(show_scrollbar);
relayout(size());
} }
bool TerminalWidget::has_selection() const bool TerminalWidget::has_selection() const