From 582f19ba24769a2079ba0955d5947174c4a6e77a Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Sat, 2 Dec 2023 10:58:17 -0500 Subject: [PATCH] Ladybird: Allow opening the Inspector with both ctrl+shift+I and F12 Ladybird on Serenity currently only uses F12, and on other platforms only uses ctrl+shift+I. Most browsers support both hotkeys, so let's do the same for consistency. Note that the AppKit chrome cannot support both shortcuts. macOS does not allow setting multiple "key equivalent" strings on an action. There are some questionable hacks we could do to support this eventually, but for now, just ctrl+shift+I is supported on macOS. --- Ladybird/Qt/BrowserWindow.cpp | 2 +- Userland/Applications/Browser/BrowserWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ladybird/Qt/BrowserWindow.cpp b/Ladybird/Qt/BrowserWindow.cpp index bbb1832483f..7efedf91af1 100644 --- a/Ladybird/Qt/BrowserWindow.cpp +++ b/Ladybird/Qt/BrowserWindow.cpp @@ -175,7 +175,7 @@ BrowserWindow::BrowserWindow(Vector const& initial_urls, WebView::CookieJar auto* inspector_action = new QAction("Open &Inspector", this); inspector_action->setIcon(load_icon_from_uri("resource://icons/browser/dom-tree.png"sv)); - inspector_action->setShortcut(QKeySequence("Ctrl+Shift+I")); + inspector_action->setShortcuts({ QKeySequence("Ctrl+Shift+I"), QKeySequence("F12") }); inspect_menu->addAction(inspector_action); QObject::connect(inspector_action, &QAction::triggered, this, [this] { if (m_current_tab) { diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index 2c3cdd9901a..ee16b1a490f 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -238,7 +238,7 @@ void BrowserWindow::build_menus() m_view_source_action->set_status_tip("View source code of the current page"_string); m_inspect_dom_tree_action = GUI::Action::create( - "Inspect &DOM Tree", { Mod_None, Key_F12 }, g_icon_bag.dom_tree, [this](auto&) { + "Inspect &DOM Tree", { Mod_Ctrl | Mod_Shift, Key_I }, { Mod_None, Key_F12 }, g_icon_bag.dom_tree, [this](auto&) { active_tab().show_inspector_window(Tab::InspectorTarget::Document); }, this);