commit 27487243c3ee31927e17a0859614ffa0df7881d7
author Caolán McNamara <caolanm@redhat.com> Wed Dec 08 16:33:43 2021 +0000
committer Caolán McNamara <caolanm@redhat.com> Thu Dec 09 09:32:27 2021 +0100
tree 3a2e86d76556e76887e5f7419c3baeac507e58a7
parent 85bc09d05f4824929d5b1381343c3ca75e7f6006

Related: tdf#145786 cooperate between our own grabs

Change-Id: I97a1868c3f086b7f414d18d0fb4daa1c6d09846f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126558
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

vcl/unx/gtk3/gtkinst.cxx

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6f4c478..1e227e8 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9933,7 +9933,13 @@ void MoveWindowContentsToPopover(GtkWindow* pMenuHack, GtkWidget* pPopover, GtkW
        pFrame->UnblockTooltip();

    if (bHadFocus)
    {
        GdkSurface* pParentSurface = pParent ? widget_get_surface(pParent) : nullptr;
        void* pParentIsPopover = pParentSurface ? g_object_get_data(G_OBJECT(pParentSurface), "g-lo-InstancePopup") : nullptr;
        if (pParentIsPopover)
            do_grab(pAnchor);
        gtk_widget_grab_focus(pAnchor);
    }
}

#endif