diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-13 14:31:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-13 16:32:48 +0200 |
| commit | 9debed4ca680706da74824f7d46198ac0e422f80 (patch) | |
| tree | 3c38261af419ab6f9bb29d93d3bc9478fed64d10 /sc | |
| parent | ed18da532f56f7fba076fc83f12507b6361b1e00 (diff) | |
tdf#133953 use a popover to show interactive row/column resize into
because a simple tooltip won't fire under gtk for that interaction
Change-Id: I487b5c05805e3d0233da9a3b3c5ff1912d98baf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96255
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/hdrcont.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/hdrcont.cxx | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 5b1dc000f656..08be7eba5010 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -56,6 +56,7 @@ private: SCCOLROW nDragNo; long nDragStart; long nDragPos; + void* nTipVisible; bool bDragMoved; bool bIgnoreMove; diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 601f982efd75..a8aeb47f9f88 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -57,6 +57,7 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelect nDragNo ( 0 ), nDragStart ( 0 ), nDragPos ( 0 ), + nTipVisible ( nullptr ), bDragMoved ( false ), bIgnoreMove ( false ), bInRefMode ( false ), @@ -712,6 +713,11 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt ) { DrawInvert( nDragPos ); ReleaseMouse(); + if (nTipVisible) + { + Help::HidePopover(this, nTipVisible); + nTipVisible = nullptr; + } bDragging = false; long nScrPos = GetScrPos( nDragNo ); @@ -879,6 +885,11 @@ void ScHeaderControl::StopMarking() if ( bDragging ) { DrawInvert( nDragPos ); + if (nTipVisible) + { + Help::HidePopover(this, nTipVisible); + nTipVisible = nullptr; + } bDragging = false; } @@ -926,7 +937,9 @@ void ScHeaderControl::ShowDragHelp() aRect.SetRight( aRect.Left() ); aRect.SetBottom( aRect.Top() ); - Help::ShowQuickHelp(this, aRect, aHelpStr, nAlign); + if (nTipVisible) + Help::HidePopover(this, nTipVisible); + nTipVisible = Help::ShowPopover(this, aRect, aHelpStr, nAlign); } } |