[Libreoffice-commits] core.git: vcl/source
Jim Raykowski (via logerrit)
logerrit at kemper.freedesktop.org
Mon Feb 24 07:04:13 UTC 2020
vcl/source/window/window.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9e329cd476298383d4e68b868f487a1f4ccca9d8
Author: Jim Raykowski <raykowj at gmail..com>
AuthorDate: Sun Feb 23 12:34:07 2020 -0900
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 24 08:03:39 2020 +0100
gtk3: allow handling of ctrl key accelerators
Change-Id: I681354f3b069a16d07a20bcc1fe110397d0ea2a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89315
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index cf56c9331e5e..7afb1fb36e6d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1821,10 +1821,10 @@ void Window::KeyInput( const KeyEvent& rKEvt )
KeyCode cod = rKEvt.GetKeyCode ();
bool autoacc = ImplGetSVData()->maNWFData.mbAutoAccel;
- // do not respond to accelerators unless Alt is held */
+ // do not respond to accelerators unless Alt or Ctrl is held */
if (cod.GetCode () >= 0x200 && cod.GetCode () <= 0x219)
{
- if (autoacc && cod.GetModifier () != KEY_MOD2)
+ if (autoacc && cod.GetModifier () != KEY_MOD2 && !(cod.GetModifier() & KEY_MOD1))
return;
}
More information about the Libreoffice-commits
mailing list