Skip to content

panel: Propagate "focus-in" event to browser host #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PatTheMav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

panel: Propagate "focus-in" event to browser host #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions panel/browser-panel-internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ extern std::vector<PopupWhitelistInfo> forced_popups;
class QCefWidgetInternal : public QCefWidget {
Q_OBJECT

private:
virtual bool eventFilter(QObject *object, QEvent *event) override;

public:
QCefWidgetInternal(QWidget *parent, const std::string &url, CefRefPtr<CefRequestContext> rqc);
~QCefWidgetInternal();
Expand Down
30 changes: 30 additions & 0 deletions panel/browser-panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ QCefWidgetInternal::QCefWidgetInternal(QWidget *parent, const std::string &url_,
#ifndef __APPLE__
window = new QWindow();
window->setFlags(Qt::FramelessWindowHint);
window->setObjectName("QCefWidgetInternalWindow");
window->installEventFilter(this);
#endif
}

Expand All @@ -186,6 +188,34 @@ QCefWidgetInternal::~QCefWidgetInternal()
closeBrowser();
}

bool QCefWidgetInternal::eventFilter(QObject *object, QEvent *event)
{
#ifdef __APPLE__
UNUSED_PARAMETER(object);
UNUSED_PARAMETER(event);

return true;
#else
// Return early event does not target the window wrapper or no browser instance is present
if (object != window_ || !cefBrowser) {
Copy link
Member

@WizardCM WizardCM Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (object != window_ || !cefBrowser) {
if (object != window || !cefBrowser) {

You may have uncommitted code where you've renamed it, but currently it's called window.

return true;
}

// Also return early if the event is not a "FocusIn" event, only necessary to check if the wrapper is targeted
if (event->type() != QEvent::FocusIn) {
return true;
}

CefRefPtr<CefBrowserHost> host{cefBrowser->GetHost()};

if (host) {
host->SetFocus(hasFocus);
Copy link
Member

@WizardCM WizardCM Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
host->SetFocus(hasFocus);
host->SetFocus(hasFocus());

Most checks in Qt are functions.

Copy link
Member Author

@PatTheMav PatTheMav Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That should actually simply be true, hasFocus used to be a boolean passed into an explicit setFocus method I moved this code from. So I guess this resolves to a non-zero function pointer and thus implicitly a "truthy" value in this form.

Implicit type conversions are evil like that..

}

return true;
#endif
}

void QCefWidgetInternal::closeBrowser()
{
if (!cefBrowser) {
Expand Down
3 changes: 3 additions & 0 deletions panel/browser-panel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class QCefWidget : public QWidget {
protected:
inline QCefWidget(QWidget *parent) : QWidget(parent) {}

private:
virtual bool eventFilter(QObject *object, QEvent *event) = 0;

public:
virtual void setURL(const std::string &url) = 0;
virtual void setStartupScript(const std::string &script) = 0;
Expand Down