diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-18 11:53:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-18 16:05:42 +0200 |
| commit | 573138efec7fa28a98ba3b0301f6e0a97dac7978 (patch) | |
| tree | 7559a661e13e2f3f99a0d9dc8e0a182e31cc5d3e /cui | |
| parent | 0380917ad3e0054039f9a996cfcc025d93c28dc3 (diff) | |
distinguish active dnd-operation case from simple query case
Change-Id: I1d8e95e46b45c71c0c83316ab4f19ba85eddcf75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96598
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/SvxToolbarConfigPage.cxx | 4 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 87f0b5eb952d..57d1baa0268b 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -877,7 +877,7 @@ IMPL_LINK( SvxToolbarConfigPage, ContentContextMenuHdl, const CommandEvent&, rCE // Select clicked entry std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator()); - rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get()); + rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get(), false); rTreeView.select(*xIter); SelectToolbarEntry( rTreeView ); @@ -922,7 +922,7 @@ IMPL_LINK( SvxToolbarConfigPage, FunctionContextMenuHdl, const CommandEvent&, rC // Select clicked entry std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator()); - rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get()); + rTreeView.get_dest_row_at_pos(rCEvt.GetMousePosPixel(), xIter.get(), false); rTreeView.select(*xIter); SelectFunctionHdl( rTreeView ); std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder( &rTreeView, "cui/ui/entrycontextmenu.ui" ) ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 05fc63f442d6..94ed598c1bf3 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3172,7 +3172,7 @@ SvxConfigPageFunctionDropTarget::SvxConfigPageFunctionDropTarget(SvxConfigPage&r sal_Int8 SvxConfigPageFunctionDropTarget::AcceptDrop(const AcceptDropEvent& rEvt) { // to enable the autoscroll when we're close to the edges - m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, nullptr); + m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, nullptr, true); return DND_ACTION_MOVE; } @@ -3189,7 +3189,7 @@ sal_Int8 SvxConfigPageFunctionDropTarget::ExecuteDrop( const ExecuteDropEvent& r std::unique_ptr<weld::TreeIter> xTarget(m_rTreeView.make_iterator()); int nTargetPos = -1; - if (m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, xTarget.get())) + if (m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, xTarget.get(), true)) nTargetPos = m_rTreeView.get_iter_index_in_parent(*xTarget); m_rTreeView.move_subtree(*xSource, nullptr, nTargetPos); |