diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-27 20:06:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-10-01 09:55:35 +0200 |
| commit | 9d30d3bb93171a12655dc89066fe065e2c2af658 (patch) | |
| tree | 2c8f841250f4b6d7a92adf2e5ecd4979962940d1 /dbaccess | |
| parent | 77960eb573e548816064690c5b1de5ca18ae9cbd (diff) | |
Related: tdf#137016 check if subcontrol has the focus
backport some required pieces from master to support that
Change-Id: I632188bc0512c9d8935bd0898c96e066881ebeb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103524
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/RelationControl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index d9de91ba494b..69f0a00cae2d 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -184,7 +184,7 @@ namespace dbaui bool ORelationControl::PreNotify(NotifyEvent& rNEvt) { - if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) + if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() && !ControlHasFocus()) PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate), nullptr, true); else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) PostUserEvent(LINK(this, ORelationControl, AsynchActivate), nullptr, true); |