diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-28 16:28:49 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-30 15:06:49 +0200 |
| commit | 45d2f8a4bdd2c805b11ab374fb4946a2c079e7ee (patch) | |
| tree | e895a29848e14a5a17ce60c064e70147447bb66a | |
| parent | 8d8a759da7ca6d2ae9aa53986d40cbbd106ffb86 (diff) | |
Resolves: tdf#124704 need to state the area the tooltip is for
to make it work under gtk3
Change-Id: I4c895181af233a16292ce16b194f0a60994446fb
Reviewed-on: https://gerrit.libreoffice.org/71479
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 99208550315b..e307250ba663 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -337,7 +337,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HelpEventMode::QUICK ) { OUString aHelpText; - Point aTopLeft; + tools::Rectangle aHelpRect; if ( StarBASIC::IsRunning() ) { Point aWindowPos = rHEvt.GetMousePosPixel(); @@ -371,15 +371,20 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt ) } if ( !aHelpText.isEmpty() ) { - aTopLeft = GetEditView()->GetTextEngine()->PaMtoEditCursor( aStartOfWord ).BottomLeft(); - aTopLeft = GetEditView()->GetWindowPos( aTopLeft ); - aTopLeft.AdjustX(5 ); - aTopLeft.AdjustY(5 ); - aTopLeft = OutputToScreenPixel( aTopLeft ); + tools::Rectangle aStartWordRect(GetEditView()->GetTextEngine()->PaMtoEditCursor(aStartOfWord)); + TextPaM aEndOfWord(aStartOfWord.GetPara(), aStartOfWord.GetIndex() + aWord.getLength()); + tools::Rectangle aEndWordRect(GetEditView()->GetTextEngine()->PaMtoEditCursor(aEndOfWord)); + aHelpRect = aStartWordRect.GetUnion(aEndWordRect); + + Point aTopLeft = GetEditView()->GetWindowPos(aHelpRect.TopLeft()); + aTopLeft = GetEditView()->GetWindow()->OutputToScreenPixel(aTopLeft); + + aHelpRect.setX(aTopLeft.X()); + aHelpRect.setY(aTopLeft.Y()); } } } - Help::ShowQuickHelp( this, tools::Rectangle( aTopLeft, Size( 1, 1 ) ), aHelpText, QuickHelpFlags::Top|QuickHelpFlags::Left); + Help::ShowQuickHelp( this, aHelpRect, aHelpText, QuickHelpFlags::NONE); bDone = true; } } |