From fe0451259d2fb93c809c1bfa3baf5abd90019c58 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Fri, 5 May 2017 01:30:30 +0300 Subject: tdf#103158 ctrl+shift should work on key up Under gtk/gtk3 we send CommandEventId::ModKeyChange on key down, to support the auto-accelerator feature. But at least the handler in SwEditWin::Command must get it on key up, in order to not interfere with other ctrl+shift+X shortcuts, which work on key down. To achieve that, we need: - On key up pass the key that was just released, instead of the current state of nothing being pressed. - Have a flag of whether it's a key down or up event, so it can be checked by the application code. Change-Id: If188d6ccdc3b214a2c3ed20aad291d74d46b358f Reviewed-on: https://gerrit.libreoffice.org/37275 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky --- vcl/inc/salwtype.hxx | 1 + vcl/inc/unx/gtk/gtkframe.hxx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/inc') diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 316165f3d44c..168185913880 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -122,6 +122,7 @@ struct SalMenuEvent // KEYMODCHANGE struct SalKeyModEvent { + bool mbDown; // Whether the change occurred on a key down event sal_uInt64 mnTime; // Time in ms, when event is created sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2) ModKeyFlags mnModKeyCode; // extended Modifier (MODKEY_LEFT,MODKEY_RIGHT,MODKEY_PRESS,MODKEY_RELEASE) diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 5ab7296081b0..00a687422f82 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -195,7 +195,6 @@ class GtkSalFrame : public SalFrame bool m_bSpanMonitorsWhenFullscreen; bool m_bDefaultPos; bool m_bDefaultSize; - bool m_bSendModChangeOnRelease; bool m_bWindowIsGtkPlug; OUString m_aTitle; OUString m_sWMClass; -- cgit