Nux

Merge lp:~3v1n0/nux/caps-lock-shortcuts-fix into lp:nux

Proposed by Marco Trevisan (Treviño) on 2017-02-13
Status: Merged
Approved by: Andrea Azzarone on 2017-02-13
Approved revision: 883
Merged at revision: 887
Proposed branch: lp:~3v1n0/nux/caps-lock-shortcuts-fix
Merge into: lp:nux
Diff against target: 33 lines (+7/-4)
1 file modified
Nux/TextEntry.cpp (+7/-4)
To merge this branch: bzr merge lp:~3v1n0/nux/caps-lock-shortcuts-fix
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) 2017-02-13 Approve on 2017-02-13
Review via email: mp+317095@code.launchpad.net

Commit message

TextEntry: Make sure Ctr+{C,V,X,A} work with caps-lock on

To post a comment you must log in.
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/TextEntry.cpp'
2--- Nux/TextEntry.cpp 2014-03-05 03:42:22 +0000
3+++ Nux/TextEntry.cpp 2017-02-13 13:16:50 +0000
4@@ -452,22 +452,25 @@
5
6 handled = true;
7 }
8- else if (((keyval == NUX_VK_x) && ctrl && !shift) || ((keyval == NUX_VK_DELETE) && shift && !ctrl))
9+ else if (((keyval == NUX_VK_x || keyval == NUX_VK_X) && ctrl && !shift) ||
10+ ((keyval == NUX_VK_DELETE) && shift && !ctrl))
11 {
12 CutClipboard();
13 handled = true;
14 }
15- else if (((keyval == NUX_VK_c) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && ctrl && (!shift)))
16+ else if (((keyval == NUX_VK_c || keyval == NUX_VK_C) && ctrl && !shift) ||
17+ ((keyval == NUX_VK_INSERT) && ctrl && !shift))
18 {
19 CopyClipboard();
20 handled = true;
21 }
22- else if (((keyval == NUX_VK_v) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && shift && (!ctrl)))
23+ else if (((keyval == NUX_VK_v || keyval == NUX_VK_V) && ctrl && !shift) ||
24+ ((keyval == NUX_VK_INSERT) && shift && !ctrl))
25 {
26 PasteClipboard();
27 handled = true;
28 }
29- else if ((keyval == NUX_VK_a) && ctrl)
30+ else if ((keyval == NUX_VK_a || keyval == NUX_VK_A) && ctrl)
31 {
32 SelectAll();
33 handled = true;

Subscribers

People subscribed via source and target branches