LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-13 11:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibGUI: Only redraw the dirty rect in GWidget.

Browse Source 
There is some trouble here with the asynchronous nature of WindowServer
and the single per-window backing store we're drawing into. If we start
repainting a widget with a pending invalidation, that invalidation might
get flushed by the WindowServer mid-paint.
This commit is contained in:
Andreas Kling 2019-01-20 07:56:48 +01:00
parent ea6678b7b3
commit a9e60fc800
Notes: sideshowbarker 2024-07-19 15:59:55 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/a9e60fc8006
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibGUI/GWidget.cpp
View File

@ -61,7 +61,7 @@ void GWidget::paintEvent(GPaintEvent& event)
{
if (fillWithBackgroundColor()) {
Painter painter(*this);
painter.fill_rect(rect(), backgroundColor());
painter.fill_rect(event.rect(), backgroundColor());
}
for (auto* ch : children()) {
auto* child = (GWidget*)ch;

12
LibGUI/GWindow.cpp
View File

@ -102,12 +102,12 @@ void GWindow::event(GEvent& event)
if (!m_main_widget)
return;
auto& paint_event = static_cast<GPaintEvent&>(event);
if (paint_event.rect().is_empty()) {
m_main_widget->paintEvent(*make<GPaintEvent>(m_main_widget->rect()));
} else {
m_main_widget->event(event);
}
int rc = gui_invalidate_window(m_window_id, nullptr);
auto rect = paint_event.rect();
if (rect.is_empty())
rect = m_main_widget->rect();
m_main_widget->event(*make<GPaintEvent>(rect));
GUI_Rect gui_rect = rect;
int rc = gui_invalidate_window(m_window_id, &gui_rect);
ASSERT(rc == 0);
}

2
LibGUI/GWindow.h
View File

@ -37,6 +37,8 @@ public:
void close();
GWidget* main_widget() { return m_main_widget; }
const GWidget* main_widget() const { return m_main_widget; }
void set_main_widget(GWidget*);
GraphicsBitmap* backing() { return m_backing.ptr(); }

2
SharedGraphics/Painter.cpp
View File

@ -31,7 +31,7 @@ Painter::Painter(GWidget& widget)
#ifdef DEBUG_WIDGET_UNDERDRAW
// If the widget is not opaque, let's not mess it up with debugging color.
if (widget.fillWithBackgroundColor())
if (widget.fillWithBackgroundColor() && m_window->main_widget() != &widget)
fill_rect(widget.rect(), Color::Red);
#endif
}