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@redhat.com>
This commit is contained in:
Caolán McNamara 2020-07-24 10:30:00 +01:00
parent 60259499f4
commit 4948b14eed

View file

@ -1026,7 +1026,6 @@ namespace svt
CellModified(); CellModified();
} }
void EditBrowseBox::ColumnResized( sal_uInt16 ) void EditBrowseBox::ColumnResized( sal_uInt16 )
{ {
if (IsEditing()) if (IsEditing())
@ -1034,11 +1033,14 @@ namespace svt
tools::Rectangle aRect( GetCellRect(nEditRow, nEditCol, false)); tools::Rectangle aRect( GetCellRect(nEditRow, nEditCol, false));
CellControllerRef aControllerRef = Controller(); CellControllerRef aControllerRef = Controller();
ResizeController(aControllerRef, aRect); 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(); Controller()->GetWindow().GrabFocus();
} }
} }
sal_uInt16 EditBrowseBox::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId) sal_uInt16 EditBrowseBox::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId)
{ {
if (nId == BROWSER_INVALIDID) if (nId == BROWSER_INVALIDID)