[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/tabbar.cxx |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ae2480960e3f37c06bfb5b61e480aba62c23c065
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 20 15:54:22 2023 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Feb 27 11:08:41 2023 +0000

    Resolves: tdf#153763 first/last buttons in tabbar not responding
    
    Change-Id: Id6e70eca7c2d523643d9e38e8c7402879464bf5a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147292
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index d2aabc1c20b0..de7cd8d435af 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -871,13 +871,16 @@ void TabBar::ImplShowPage( sal_uInt16 nPos )
 
 IMPL_LINK( TabBar, ImplClickHdl, weld::Button&, rBtn, void )
 {
-    if ((GetPointerState().mnState & (MOUSE_LEFT | MOUSE_MIDDLE | 
MOUSE_RIGHT)) == 0)
+    if (&rBtn != mpImpl->mxButtonBox->m_xFirstButton.get() && &rBtn != 
mpImpl->mxButtonBox->m_xLastButton.get())
     {
-        // like tdf#149482 if we didn't see a mouse up, but find that the 
mouse is no
-        // longer pressed at this point, then bail
-        mpImpl->mxButtonBox->m_xPrevRepeater->Stop();
-        mpImpl->mxButtonBox->m_xNextRepeater->Stop();
-        return;
+        if ((GetPointerState().mnState & (MOUSE_LEFT | MOUSE_MIDDLE | 
MOUSE_RIGHT)) == 0)
+        {
+            // like tdf#149482 if we didn't see a mouse up, but find that the 
mouse is no
+            // longer pressed at this point, then bail
+            mpImpl->mxButtonBox->m_xPrevRepeater->Stop();
+            mpImpl->mxButtonBox->m_xNextRepeater->Stop();
+            return;
+        }
     }
 
     EndEditMode();