commit 7dc697addd0895b8aee0c051c0d4d4125414f012
author Caolán McNamara <caolan.mcnamara@collabora.com> Wed Jul 26 09:29:18 2023 +0100
committer Caolán McNamara <caolan.mcnamara@collabora.com> Wed Jul 26 12:26:30 2023 +0200
tree 87f4fb9929a4913cd36092a8ad5c2d43a5766a5c
parent 2b3dcd24e4da1f83bfaf8e0ffd93839eeae621b0

Resolves: tdf#155716 grab focus when context menu is activated

Change-Id: I194aba413d5adf07c8d78823f2f9a086f95cf248
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154933
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

sc/source/ui/app/inputwin.cxx

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2c46b93..70dee0e 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1685,7 +1685,7 @@ bool ScTextWnd::CanFocus() const
    return SC_MOD()->IsEditMode();
}

bool ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
void ScTextWnd::UpdateFocus()
{
    if (!HasFocus())
    {
@@ -1693,6 +1693,11 @@ bool ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
        if (CanFocus())
            TextGrabFocus();
    }
}

bool ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
{
    UpdateFocus();

    bool bClickOnSelection = false;
    if (m_xEditView)
@@ -1808,6 +1813,7 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt )
                }
                if (IsMouseCaptured())
                    ReleaseMouse();
                UpdateFocus();
                pViewFrm->GetDispatcher()->ExecutePopup("formulabar", &mrGroupBar.GetVclParent(), &aPos);
            }
        }

sc/source/ui/inc/inputwin.hxx

diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 500ab23..7d058af 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -135,6 +135,8 @@ private:

    void InitEditEngine();

    void UpdateFocus();

    rtl::Reference<svt::OStringTransferable> m_xHelper;

    typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector;