[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/hdrcont.hxx  |    1 +
 sc/source/ui/view/hdrcont.cxx |   15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 2a88edb1e102373620f5ca06900f1104f253a6f9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 13 14:31:19 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun Jun 14 11:32:31 2020 +0200

    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/+/96275
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index f3d7ee0b6638..3bb95e34562e 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);
     }
 }