From 3543236e8f68e74dd2ad9512939dd7786ae1614b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 25 Apr 2019 00:05:48 +0200 Subject: [PATCH] GScrollableWidget: The visible_content_rect() should be max content_size(). When computing the visible content rect, constrain the result to the content size. The content shouldn't feel responsible for painting anything outside. --- LibGUI/GScrollableWidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LibGUI/GScrollableWidget.cpp b/LibGUI/GScrollableWidget.cpp index a4ce1620ca..b2a64f125b 100644 --- a/LibGUI/GScrollableWidget.cpp +++ b/LibGUI/GScrollableWidget.cpp @@ -96,8 +96,8 @@ Rect GScrollableWidget::visible_content_rect() const return { m_horizontal_scrollbar->value(), m_vertical_scrollbar->value(), - frame_inner_rect().width() - width_occupied_by_vertical_scrollbar() - m_size_occupied_by_fixed_elements.width(), - frame_inner_rect().height() - height_occupied_by_horizontal_scrollbar() - m_size_occupied_by_fixed_elements.height() + min(m_content_size.width(), frame_inner_rect().width() - width_occupied_by_vertical_scrollbar() - m_size_occupied_by_fixed_elements.width()), + min(m_content_size.height(), frame_inner_rect().height() - height_occupied_by_horizontal_scrollbar() - m_size_occupied_by_fixed_elements.height()) }; }