From c20f1e06c0f338c25c5fea2544a7e86fa623cb19 Mon Sep 17 00:00:00 2001
From: bugreport0 <32939607+bugreport0@users.noreply.github.com>
Date: Sat, 29 Jan 2022 16:13:42 +0100
Subject: [PATCH] LibGUI: Flash menubar when using command palette

---
 Userland/Libraries/LibGUI/Action.cpp                 | 8 +++-----
 Userland/Libraries/LibGUI/Action.h                   | 2 +-
 Userland/Libraries/LibGUI/WindowServerConnection.cpp | 3 ++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Userland/Libraries/LibGUI/Action.cpp b/Userland/Libraries/LibGUI/Action.cpp
index 89beb9082c..5095fe0664 100644
--- a/Userland/Libraries/LibGUI/Action.cpp
+++ b/Userland/Libraries/LibGUI/Action.cpp
@@ -135,12 +135,10 @@ void Action::activate(Core::Object* activator)
     m_activator = nullptr;
 }
 
-void Action::flash_menubar_menu()
+void Action::flash_menubar_menu(GUI::Window& window)
 {
-    if (auto* app = Application::the())
-        if (auto* window = app->active_window())
-            for (auto& menu_item : m_menu_items)
-                window->flash_menubar_menu_for(*menu_item);
+    for (auto& menu_item : m_menu_items)
+        window.flash_menubar_menu_for(*menu_item);
 }
 
 void Action::register_button(Badge<Button>, Button& button)
diff --git a/Userland/Libraries/LibGUI/Action.h b/Userland/Libraries/LibGUI/Action.h
index 53b93e30d0..0769822650 100644
--- a/Userland/Libraries/LibGUI/Action.h
+++ b/Userland/Libraries/LibGUI/Action.h
@@ -92,7 +92,7 @@ public:
     Function<void(Action&)> on_activation;
 
     void activate(Core::Object* activator = nullptr);
-    void flash_menubar_menu();
+    void flash_menubar_menu(GUI::Window& window);
 
     bool is_enabled() const { return m_enabled; }
     void set_enabled(bool);
diff --git a/Userland/Libraries/LibGUI/WindowServerConnection.cpp b/Userland/Libraries/LibGUI/WindowServerConnection.cpp
index dcd7a015f7..f5ad28a42d 100644
--- a/Userland/Libraries/LibGUI/WindowServerConnection.cpp
+++ b/Userland/Libraries/LibGUI/WindowServerConnection.cpp
@@ -173,7 +173,7 @@ void WindowServerConnection::key_down(i32 window_id, u32 code_point, u32 key, u3
 
     if (auto* action = action_for_key_event(*window, *key_event)) {
         if (action->is_enabled()) {
-            action->flash_menubar_menu();
+            action->flash_menubar_menu(*window);
             action->activate();
             return;
         }
@@ -202,6 +202,7 @@ void WindowServerConnection::key_down(i32 window_id, u32 code_point, u32 key, u3
             return;
         auto* action = command_palette->selected_action();
         VERIFY(action);
+        action->flash_menubar_menu(*window);
         action->activate();
         return;
     }