vcl/unx/gtk3/gtk3gtkinst.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bc94fe8a7415cb0df0e613fb764f886f45a648e3
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun May 17 19:28:17 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun May 17 21:23:19 2020 +0200
GdkEventKey::state can contain states, e.g. num lock, which we don't use
Change-Id: I280777c1524de2b640564183461903fd80d345be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94387
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 2c34b5db715e..503da469aef5 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13272,7 +13272,7 @@ private:
}
default:
// tdf#131076 let base space toggle menu popup when it's 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);
@@ -14500,7 +14500,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 ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
