vcl/unx/gtk3/gtk3gtkinst.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0d81a613ef5af22253e51d9917c5d5c94d764456
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Mar 8 15:13:50 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Mar 8 17:08:32 2020 +0100
tdf#131223 let return deactive active popup
Change-Id: Ib116a1eb047aa9f1a5ca7a2ec9333a793addd304
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90188
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f589667bd4e4..202b5f4c1c10 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12397,8 +12397,8 @@ private:
case KEY_RIGHT:
case KEY_RETURN:
m_aQuickSelectionEngine.Reset();
- // tdf#131076 don't let bare return toggle menu popup
- if (nCode == KEY_RETURN && !pEvent->state)
+ // tdf#131076 don't let bare return toggle menu popup active,
but do allow deactive
+ if (nCode == KEY_RETURN && !pEvent->state && !m_bPopupActive)
bDone = combobox_activate();
break;
default:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
