[Libreoffice-commits] core.git: svtools/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 24 13:08:59 UTC 2020


 svtools/source/brwbox/editbrowsebox.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4948b14eedb79a1408e20ab477929fe062d13c27
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 24 10:30:00 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 24 15:08:20 2020 +0200

    don't grab focus if Field Properties panel is actively being resized
    
    by split pane drag resizing
    
    Change-Id: I69ae50400e74ed292b4a8110a4767169e9353239
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99359
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index a5c13f067400..996b68b4b194 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1026,7 +1026,6 @@ namespace svt
         CellModified();
     }
 
-
     void EditBrowseBox::ColumnResized( sal_uInt16 )
     {
         if (IsEditing())
@@ -1034,11 +1033,14 @@ namespace svt
             tools::Rectangle aRect( GetCellRect(nEditRow, nEditCol, false));
             CellControllerRef aControllerRef = Controller();
             ResizeController(aControllerRef, aRect);
+            // don't grab focus if Field Properties panel is being
+            // resized by split pane drag resizing
+            if (Application::IsUICaptured())
+                return;
             Controller()->GetWindow().GrabFocus();
         }
     }
 
-
     sal_uInt16 EditBrowseBox::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId)
     {
         if (nId == BROWSER_INVALIDID)


More information about the Libreoffice-commits mailing list