diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-10 15:14:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-10 15:16:04 +0100 |
| commit | eb433f83a5f66dd1ca8ed0c62ef9cc0761b7f0ac (patch) | |
| tree | d5aa80b3f32acf67077a30ee510fa72c24c6595e | |
| parent | 94e6a847e877f73a1aedca5d7f1604e13005b840 (diff) | |
Resolves: tdf#106078 get bounding box of commented region for gtk3 tooltips
Change-Id: I4fdc1f471c6c191be9c7c611926bd2b5b2b41308
| -rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index f120dfcb9453..56850d04753c 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1439,12 +1439,18 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, if( pFieldRect && nullptr != ( pFrame = pTextNd->getLayoutFrame( GetLayout(), &aPt ) ) ) { + //get bounding box of range SwRect aStart; SwPosition aStartPos(*pTextNd, nSt); pFrame->GetCharRect(aStart, aStartPos, &aTmpState); SwRect aEnd; SwPosition aEndPos(*pTextNd, nEnd); pFrame->GetCharRect(aEnd, aEndPos, &aTmpState); + if (aStart.Top() != aEnd.Top() || aStart.Bottom() != aEnd.Bottom()) + { + aStart.Left(pFrame->Frame().Left()); + aEnd.Right(pFrame->Frame().Right()); + } *pFieldRect = aStart.Union(aEnd); } } @@ -1462,7 +1468,19 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, bRet = true; if( pFieldRect && nullptr != ( pFrame = pTextNd->getLayoutFrame( GetLayout(), &aPt ) ) ) - pFrame->GetCharRect( *pFieldRect, aPos, &aTmpState ); + { + //get bounding box of range + SwRect aStart; + pFrame->GetCharRect(aStart, *pRedl->Start(), &aTmpState); + SwRect aEnd; + pFrame->GetCharRect(aEnd, *pRedl->End(), &aTmpState); + if (aStart.Top() != aEnd.Top() || aStart.Bottom() != aEnd.Bottom()) + { + aStart.Left(pFrame->Frame().Left()); + aEnd.Right(pFrame->Frame().Right()); + } + *pFieldRect = aStart.Union(aEnd); + } } } } |