commit 2e602bab5d34fa9220da0885d07ff43537c27fcc
author Caolán McNamara <caolanm@redhat.com> Thu Jul 28 15:49:32 2022 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri Jul 29 21:36:48 2022 +0200
tree 790502d8ee55cbbc4e85d72b420c8f89487a6161
parent de159e1ea264dae35cae90af24700bf971f065be

Resolves: tdf#147782 restore focus to launching frame asynchronously

Change-Id: I7ebde70e4e1aae861f6ac7d70a91741596cb2cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137525
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins

sfx2/source/dialog/recfloat.cxx

diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index d835e76..1b674f6 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -101,6 +101,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(SfxBindings* pBind, SfxChildWindo
                                  "FloatingRecord")
    , m_xToolbar(m_xBuilder->weld_toolbar("toolbar"))
    , m_xDispatcher(new ToolbarUnoDispatcher(*m_xToolbar, *m_xBuilder, pBind->GetActiveFrame()))
    , mnPostUserEventId(nullptr)
    , m_bFirstActivate(true)
{
    // start recording
@@ -109,6 +110,14 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(SfxBindings* pBind, SfxChildWindo
            SfxCallMode::SYNCHRON, { &aItem });
}

IMPL_LINK_NOARG(SfxRecordingFloat_Impl, PresentParentFrame, void*, void)
{
    mnPostUserEventId = nullptr;
    css::uno::Reference<css::awt::XTopWindow> xTopWindow(m_xDispatcher->GetFrame()->getContainerWindow(), css::uno::UNO_QUERY);
    if (xTopWindow.is())
        xTopWindow->toFront();
}

void SfxRecordingFloat_Impl::Activate()
{
    SfxModelessDialogController::Activate();
@@ -116,13 +125,13 @@ void SfxRecordingFloat_Impl::Activate()
        return;
    // tdf#147782 retain focus in launching frame on the first activate on automatically gaining focus on getting launched
    m_bFirstActivate = false;
    css::uno::Reference<css::awt::XTopWindow> xTopWindow(m_xDispatcher->GetFrame()->getContainerWindow(), css::uno::UNO_QUERY);
    if (xTopWindow.is())
        xTopWindow->toFront();
    mnPostUserEventId = Application::PostUserEvent(LINK(this, SfxRecordingFloat_Impl, PresentParentFrame));
}

SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl()
{
    if (mnPostUserEventId)
        Application::RemoveUserEvent(mnPostUserEventId);
    m_xDispatcher->dispose();
}

sfx2/source/inc/recfloat.hxx

diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index b7a4882..e5720e1 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -42,7 +42,11 @@ class SfxRecordingFloat_Impl final : public SfxModelessDialogController
{
    std::unique_ptr<weld::Toolbar> m_xToolbar;
    std::unique_ptr<ToolbarUnoDispatcher> m_xDispatcher;
    ImplSVEvent *mnPostUserEventId;
    bool m_bFirstActivate;

    DECL_LINK(PresentParentFrame, void*, void);

public:
    SfxRecordingFloat_Impl(SfxBindings* pBindings,
                           SfxChildWindow* pChildWin,