From 195cdb33de6c4c25a03704aff198d48027b2b892 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 11 Oct 2022 17:17:49 +0200 Subject: [PATCH] Ladybird/WebContentView: Make Tab and Shift+Tab work These didn't work, for two reasons: 1. Qt swallows all Tab key presses by default. We have to override the event() function in order to receive them. 2. Qt transforms Shift+Tab into a fake "Backtab" key. We have to undo this transformation and send Shift+Tab to WebContent. --- Ladybird/WebContentView.cpp | 22 ++++++++++++++++++++++ Ladybird/WebContentView.h | 1 + 2 files changed, 23 insertions(+) diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp index 939bb3036b..4dbbe424f9 100644 --- a/Ladybird/WebContentView.cpp +++ b/Ladybird/WebContentView.cpp @@ -334,6 +334,12 @@ void WebContentView::keyPressEvent(QKeyEvent* event) break; } + if (event->key() == Qt::Key_Backtab) { + // NOTE: Qt transforms Shift+Tab into a "Backtab", so we undo that transformation here. + client().async_key_down(KeyCode::Key_Tab, Mod_Shift, '\t'); + return; + } + auto text = event->text(); if (text.isEmpty()) { return; @@ -919,3 +925,19 @@ void WebContentView::request_repaint() m_client_state.back_bitmap.pending_paints++; client().async_paint(m_client_state.back_bitmap.bitmap->rect().translated(horizontalScrollBar()->value(), verticalScrollBar()->value()), m_client_state.back_bitmap.id); } + +bool WebContentView::event(QEvent* event) +{ + // NOTE: We have to implement event() manually as Qt's focus navigation mechanism + // eats all the Tab key presses by default. + + if (event->type() == QEvent::KeyPress) { + keyPressEvent(static_cast(event)); + return true; + } + if (event->type() == QEvent::KeyRelease) { + keyReleaseEvent(static_cast(event)); + return true; + } + return QAbstractScrollArea::event(event); +} diff --git a/Ladybird/WebContentView.h b/Ladybird/WebContentView.h index 975ca0b68a..b11277af6f 100644 --- a/Ladybird/WebContentView.h +++ b/Ladybird/WebContentView.h @@ -87,6 +87,7 @@ public: virtual void hideEvent(QHideEvent*) override; virtual void focusInEvent(QFocusEvent*) override; virtual void focusOutEvent(QFocusEvent*) override; + virtual bool event(QEvent*) override; void debug_request(String const& request, String const& argument);