fix(webview): sync Qt/Win32 focus on WebView2 transitions

- Switch focusChanged to inspect `now` instead of `old` so
  notifyFocusLost is only called when focus actually leaves a
  WebView, not when it arrives — avoids spurious releases.
- Pass `newFocusWidget` to notifyFocusLost so the Win32 impl can
  SetFocus on the correct top-level HWND rather than blindly
  calling MoveFocus, which was unreliable across windows.
- Guard the SetFocus call with GetFocus() to skip it when the
  WebView2 controller no longer holds native focus.
- Add GotFocusHandler to sync Qt focus state when WebView2 grabs
  native focus; without this Qt's focus tracking diverges from
  Win32, causing the next click on a Qt widget to not fire
  focusChanged.
- Set ClickFocus policy on m_hostWidget so Qt registers it as a
  focusable target, completing the round-trip.

Author: nullmastermind

src/MiniAppManager.cpp

@@ -100,19 +100,19 @@ MiniAppManager::MiniAppManager(NotepadNextApplication *app,
     // Re-tint tab icons on theme change
     connect(app, &NotepadNextApplication::effectiveThemeChanged, this, &MiniAppManager::retintAllIcons);
 
-    // When Qt focus leaves a WebView2 widget, tell it to release Win32 keyboard
-    // focus so keystrokes go to the newly focused Qt widget (e.g. AI chat input).
-    connect(qApp, &QApplication::focusChanged, this, [this](QWidget *old, QWidget * /*now*/) {
-        if (!old) return;
-        auto checkAndNotify = [old](WebViewWidget *wv) {
-            if (!wv) return;
-            if (old == wv || wv->isAncestorOf(old))
-                wv->notifyFocusLost();
-        };
-        for (MiniAppInstance *inst : m_instances)
-            checkAndNotify(inst->webViewWidget());
-        for (const QuickBrowserTab &tab : m_quickBrowserTabs)
-            checkAndNotify(tab.webView);
+    // When Qt focus moves to a non-WebView widget, tell all WebViews to release
+    // Win32 keyboard focus so keystrokes reach the newly focused Qt widget.
+    connect(qApp, &QApplication::focusChanged, this, [this](QWidget * /*old*/, QWidget *now) {
+        if (!now) return;
+        for (MiniAppInstance *inst : m_instances) {
+            WebViewWidget *wv = inst->webViewWidget();
+            if (wv && now != wv && !wv->isAncestorOf(now))
+                wv->notifyFocusLost(now);
+        }
+        for (const QuickBrowserTab &tab : m_quickBrowserTabs) {
+            if (tab.webView && now != tab.webView && !tab.webView->isAncestorOf(now))
+                tab.webView->notifyFocusLost(now);
+        }
     });
 }
 

src/widgets/WebViewWidget.h

@@ -41,9 +41,10 @@ class WebViewWidget : public QWidget
     virtual void destroy() = 0;
     virtual QString debugInfo() const { return QString(); }
 
-    // Called when Qt focus leaves this WebView widget. Platform implementations
-    // use this to release native keyboard focus (e.g. WebView2 on Windows).
-    virtual void notifyFocusLost() {}
+    // Called when Qt focus moves to a widget outside this WebView. Platform
+    // implementations use this to release native keyboard focus back to the
+    // target widget's top-level window (e.g. WebView2 on Windows).
+    virtual void notifyFocusLost(QWidget *newFocusWidget) { Q_UNUSED(newFocusWidget); }
 
     virtual void executeScript(const QString &js, std::function<void(const QString &)> callback = nullptr) = 0;
     virtual QString nativePostMessage() const = 0;

src/widgets/WebViewWidget_win.cpp

@@ -99,6 +99,7 @@ class WebViewWidgetWin : public WebViewWidget
         m_hostWidget = new QWidget(this);
         m_hostWidget->setAttribute(Qt::WA_NativeWindow);
         m_hostWidget->setAttribute(Qt::WA_DontCreateNativeAncestors, false);
+        m_hostWidget->setFocusPolicy(Qt::ClickFocus);
         mainLayout()->addWidget(m_hostWidget, 1);
     }
 
@@ -232,10 +233,18 @@ class WebViewWidgetWin : public WebViewWidget
         hideCdpUrl();
     }
 
-    void notifyFocusLost() override
+    void notifyFocusLost(QWidget *newFocusWidget) override
     {
-        if (m_controller)
-            m_controller->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);
+        if (!m_controller) return;
+        HWND focused = GetFocus();
+        if (!focused) return;
+        if (focused == m_hwnd || IsChild(m_hwnd, focused)) {
+            HWND target = newFocusWidget
+                ? GetAncestor(reinterpret_cast<HWND>(newFocusWidget->effectiveWinId()), GA_ROOT)
+                : GetAncestor(m_hwnd, GA_ROOT);
+            if (target)
+                SetFocus(target);
+        }
     }
 
 protected:
@@ -444,6 +453,13 @@ class WebViewWidgetWin : public WebViewWidget
         m_webView->add_WebMessageReceived(
             new WebMessageReceivedHandler(this), &msgToken);
 
+        // Sync Qt focus state when WebView2 grabs native focus. Without this,
+        // Qt doesn't know focus left the previously focused widget, so clicking
+        // back on that widget won't fire focusChanged (Qt thinks it already has
+        // focus there).
+        EventRegistrationToken gotFocusToken;
+        m_controller->add_GotFocus(new GotFocusHandler(this), &gotFocusToken);
+
         // Navigate to initial URL
         setLoading(true);
         m_dbgNavigateCalled = true;
@@ -656,6 +672,29 @@ class WebViewWidgetWin : public WebViewWidget
         }
     };
 
+    // GotFocusHandler: fires when WebView2 acquires native focus. Sets Qt focus
+    // to the host widget so Qt's focus tracking stays in sync with Win32.
+    struct GotFocusHandler : ICoreWebView2FocusChangedEventHandler {
+        WebViewWidgetWin *owner;
+        std::shared_ptr<std::atomic<bool>> alive;
+        ULONG refCount = 1;
+        GotFocusHandler(WebViewWidgetWin *o) : owner(o), alive(o->m_alive) {}
+        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppv) override {
+            if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ICoreWebView2FocusChangedEventHandler)) {
+                *ppv = this; AddRef(); return S_OK;
+            }
+            *ppv = nullptr; return E_NOINTERFACE;
+        }
+        ULONG STDMETHODCALLTYPE AddRef() override { return ++refCount; }
+        ULONG STDMETHODCALLTYPE Release() override { if (--refCount == 0) { delete this; return 0; } return refCount; }
+        HRESULT STDMETHODCALLTYPE Invoke(ICoreWebView2Controller *, IUnknown *) override {
+            if (!alive->load(std::memory_order_acquire)) return S_OK;
+            if (owner->m_hostWidget)
+                owner->m_hostWidget->setFocus(Qt::OtherFocusReason);
+            return S_OK;
+        }
+    };
+
     // --- CDP Discovery ---
 
     void startCdpDiscovery()