hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-23 20:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Revert "fix:ctrl +c triggered unintentionally"

Browse source 
This reverts commit a7cdb9dd72.
This commit is contained in:
Xiao YiFang 2022-09-11 09:36:39 +08:00
parent a7cdb9dd72
commit 371fb66bdf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hotkeywrapper.cc
View file

@ -158,7 +158,7 @@ bool HotkeyWrapper::checkState(quint32 vk, quint32 mod)
#ifdef Q_OS_WIN32
if( hs.key2 != 0 /*|| ( mod == MOD_CONTROL && ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) )*/ )
if( hs.key2 != 0 || ( mod == MOD_CONTROL && ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) ) )
{
// Pass-through first part of compound hotkey or clipdoard copy command
@ -258,7 +258,7 @@ bool HotkeyWrapper::checkState(quint32 vk, quint32 mod)
// Note that we only grab the clipboard key only if
// the sequence didn't begin with it
if ( ( isCopyToClipboardKey( hs.key, hs.modifier ) &&
if ( ( isCopyToClipboardKey( hs.key, hs.modifier ) ||
!isCopyToClipboardKey( hs.key2, hs.modifier ) ) &&
!isKeyGrabbed( hs.key2, hs.modifier ) )
keyToUngrab = grabKey( hs.key2, hs.modifier );