From 00d26457c5390237f0c88a5f55ffc0c24aa6d6e8 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Mon, 30 Dec 2019 01:18:38 +0100
Subject: [PATCH] WindowServer: Don't repaint entire menubar on applet update

---
 Servers/WindowServer/WSMenuManager.cpp | 4 +---
 Servers/WindowServer/WSWindow.cpp      | 5 +++++
 Servers/WindowServer/WSWindow.h        | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Servers/WindowServer/WSMenuManager.cpp b/Servers/WindowServer/WSMenuManager.cpp
index a2321717b7..5c9088837a 100644
--- a/Servers/WindowServer/WSMenuManager.cpp
+++ b/Servers/WindowServer/WSMenuManager.cpp
@@ -283,10 +283,8 @@ void WSMenuManager::draw_applet(const WSWindow& applet)
 
 void WSMenuManager::invalidate_applet(const WSWindow& applet, const Rect& rect)
 {
-    // FIXME: This should only invalidate the applet's own rect, not the whole menubar.
-    (void)rect;
     draw_applet(applet);
-    window().invalidate();
+    window().invalidate(rect.translated(applet.rect_in_menubar().location()));
 }
 
 Rect WSMenuManager::menubar_rect() const
diff --git a/Servers/WindowServer/WSWindow.cpp b/Servers/WindowServer/WSWindow.cpp
index eaf45f4df0..05506a5531 100644
--- a/Servers/WindowServer/WSWindow.cpp
+++ b/Servers/WindowServer/WSWindow.cpp
@@ -263,6 +263,11 @@ void WSWindow::invalidate()
     WSWindowManager::the().invalidate(*this);
 }
 
+void WSWindow::invalidate(const Rect& rect)
+{
+    WSWindowManager::the().invalidate(*this, rect);
+}
+
 bool WSWindow::is_active() const
 {
     return WSWindowManager::the().active_window() == this;
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index 67058a0a14..1957f2b32f 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/Servers/WindowServer/WSWindow.h
@@ -115,6 +115,7 @@ public:
     Size size() const { return m_rect.size(); }
 
     void invalidate();
+    void invalidate(const Rect&);
 
     virtual void event(CEvent&) override;