diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-17 19:33:35 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-05-18 23:39:22 +0200 |
| commit | 58981c2d316ffeaf626667fbd2822443588efbed (patch) | |
| tree | c41e7eb0f135517c11c536026b4fbc5397657ece /vcl | |
| parent | 0a4d3852794bae8887dc11613b47cb8d2c4aa829 (diff) | |
Resolves: tdf#131076 GdkEventKey::state can contain e.g. num lock
which we don't want to consider
Change-Id: Idad3ae428450590b366897d08a845b43000b48e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94388
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 93b2a94b4c07..14be34515a50 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -11454,12 +11454,12 @@ private: case KEY_RETURN: m_aQuickSelectionEngine.Reset(); // tdf#131076 don't let bare return toggle menu popup active, but do allow deactive - if (nCode == KEY_RETURN && !pEvent->state && !m_bPopupActive) + if (nCode == KEY_RETURN && !aKeyCode.GetModifier() && !m_bPopupActive) bDone = combobox_activate(); break; default: // tdf#131076 let base space toggle menu popup when its not already visible - if (nCode == KEY_SPACE && !pEvent->state && !m_bPopupActive) + if (nCode == KEY_SPACE && !aKeyCode.GetModifier() && !m_bPopupActive) bDone = false; else bDone = m_aQuickSelectionEngine.HandleKeyEvent(aKEvt); @@ -12051,7 +12051,7 @@ private: bool signal_key_press(GdkEventKey* pEvent) { - if (pEvent->state) // only with no modifiers held + if (GtkSalFrame::GetMouseModCode(pEvent->state)) // only with no modifiers held return false; if (pEvent->keyval == GDK_KEY_KP_Up || pEvent->keyval == GDK_KEY_Up || pEvent->keyval == GDK_KEY_KP_Page_Up || pEvent->keyval == GDK_KEY_Page_Up || |