From 97eb662e6203ff484fd9509706ddcdd89a425d67 Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Mon, 22 Nov 2021 21:48:48 +0000
Subject: [PATCH] Browser: Scope bookmark actions so that they don't block the
 delete key

This fixes #10940.

Previously, all presses of the Delete key without a modifier in Browser
were uselessly consumed by the "Delete" action in the bookmark context
menu.
---
 .../Browser/BookmarksBarWidget.cpp            | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp
index 58563bf44a..2b2223d32b 100644
--- a/Userland/Applications/Browser/BookmarksBarWidget.cpp
+++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp
@@ -124,23 +124,31 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable
     m_separator = GUI::Widget::construct();
 
     m_context_menu = GUI::Menu::construct();
-    auto default_action = GUI::Action::create("&Open", [this](auto&) {
-        if (on_bookmark_click)
-            on_bookmark_click(m_context_menu_url, Mod_None);
-    });
+    auto default_action = GUI::Action::create(
+        "&Open", [this](auto&) {
+            if (on_bookmark_click)
+                on_bookmark_click(m_context_menu_url, Mod_None);
+        },
+        this);
     m_context_menu_default_action = default_action;
     m_context_menu->add_action(default_action);
-    m_context_menu->add_action(GUI::Action::create("Open in New &Tab", [this](auto&) {
-        if (on_bookmark_click)
-            on_bookmark_click(m_context_menu_url, Mod_Ctrl);
-    }));
+    m_context_menu->add_action(GUI::Action::create(
+        "Open in New &Tab", [this](auto&) {
+            if (on_bookmark_click)
+                on_bookmark_click(m_context_menu_url, Mod_Ctrl);
+        },
+        this));
     m_context_menu->add_separator();
-    m_context_menu->add_action(GUI::Action::create("&Edit...", [this](auto&) {
-        edit_bookmark(m_context_menu_url);
-    }));
-    m_context_menu->add_action(GUI::CommonActions::make_delete_action([this](auto&) {
-        remove_bookmark(m_context_menu_url);
-    }));
+    m_context_menu->add_action(GUI::Action::create(
+        "&Edit...", [this](auto&) {
+            edit_bookmark(m_context_menu_url);
+        },
+        this));
+    m_context_menu->add_action(GUI::CommonActions::make_delete_action(
+        [this](auto&) {
+            remove_bookmark(m_context_menu_url);
+        },
+        this));
 
     Vector<GUI::JsonArrayModel::FieldSpec> fields;
     fields.empend("title", "Title", Gfx::TextAlignment::CenterLeft);