Kaydet (Commit) 6fbba11d authored tarafından Lennard's avatar Lennard Kaydeden (comit) Tor Lillqvist

fdo#55430 click object in front of current after editing text

additional patch for 55430,
patch 85ea03ae
failed when underlying object was in text mode, switched
back to normal mode, but still had the MouseButtonUp handle for text mode.
This one compensates that!

Change-Id: I69aecacc264c9a9b766ccfa48c0deb1f153e88da
Signed-off-by: 's avatarLennard <Wasserthal@nefkom.net>
Reviewed-on: https://gerrit.libreoffice.org/1037Reviewed-by: 's avatarTor Lillqvist <tml@iki.fi>
Tested-by: 's avatarTor Lillqvist <tml@iki.fi>
üst bca28d7a
......@@ -628,7 +628,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_Bool bReturn = sal_False;
SdrObject* pObj;
SdrPageView* pPV;
if (aDragTimer.IsActive())
{
aDragTimer.Stop();
......@@ -702,6 +703,16 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
Abs(aPnt.X() - aMDPos.X()) < nDrgLog &&
Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
{
/*************************************************************
* If a user wants to click on an object in front of a masked
* one, he releases the mouse button immediately
**************************************************************/
if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_BEFOREMARK))
{
mpView->UnmarkAllObj();
mpView->MarkObj(pObj,pPV,false,false);
return (bReturn);
}
// toggle to rotation mode
mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_ROTATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment