Nux

Merge lp:~unity-team/nux/x-sru2 into lp:nux/xenial

Proposed by Marco Trevisan (Treviño) on 2017-07-04
Status: Merged
Approved by: Andrea Azzarone on 2017-08-09
Approved revision: 880
Merged at revision: 880
Proposed branch: lp:~unity-team/nux/x-sru2
Merge into: lp:nux/xenial
Diff against target: 60 lines (+15/-4)
3 files modified
Nux/InputMethodIBus.cpp (+1/-0)
Nux/TextEntry.cpp (+7/-4)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~unity-team/nux/x-sru2
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) 2017-07-04 Approve on 2017-08-09
Review via email: mp+326791@code.launchpad.net

Commit message

Releasing SRU2 for Xenial

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

+1

review: Approve
lp:~unity-team/nux/x-sru2 updated on 2017-08-16
881. By Marco Trevisan (Treviño) on 2017-08-16

InputMethodIBus: don't set CAPS_LOCK modifier when hitting super

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/InputMethodIBus.cpp'
2--- Nux/InputMethodIBus.cpp 2015-04-22 16:48:10 +0000
3+++ Nux/InputMethodIBus.cpp 2017-08-16 22:02:12 +0000
4@@ -472,6 +472,7 @@
5 case XK_Super_L:
6 case XK_Super_R:
7 ev.key_modifiers |= KEY_MODIFIER_SUPER;
8+ break;
9 case XK_Caps_Lock:
10 ev.key_modifiers |= KEY_MODIFIER_CAPS_LOCK;
11 break;
12
13=== modified file 'Nux/TextEntry.cpp'
14--- Nux/TextEntry.cpp 2014-03-05 03:42:22 +0000
15+++ Nux/TextEntry.cpp 2017-08-16 22:02:12 +0000
16@@ -452,22 +452,25 @@
17
18 handled = true;
19 }
20- else if (((keyval == NUX_VK_x) && ctrl && !shift) || ((keyval == NUX_VK_DELETE) && shift && !ctrl))
21+ else if (((keyval == NUX_VK_x || keyval == NUX_VK_X) && ctrl && !shift) ||
22+ ((keyval == NUX_VK_DELETE) && shift && !ctrl))
23 {
24 CutClipboard();
25 handled = true;
26 }
27- else if (((keyval == NUX_VK_c) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && ctrl && (!shift)))
28+ else if (((keyval == NUX_VK_c || keyval == NUX_VK_C) && ctrl && !shift) ||
29+ ((keyval == NUX_VK_INSERT) && ctrl && !shift))
30 {
31 CopyClipboard();
32 handled = true;
33 }
34- else if (((keyval == NUX_VK_v) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && shift && (!ctrl)))
35+ else if (((keyval == NUX_VK_v || keyval == NUX_VK_V) && ctrl && !shift) ||
36+ ((keyval == NUX_VK_INSERT) && shift && !ctrl))
37 {
38 PasteClipboard();
39 handled = true;
40 }
41- else if ((keyval == NUX_VK_a) && ctrl)
42+ else if ((keyval == NUX_VK_a || keyval == NUX_VK_A) && ctrl)
43 {
44 SelectAll();
45 handled = true;
46
47=== modified file 'debian/changelog'
48--- debian/changelog 2016-07-05 10:54:15 +0000
49+++ debian/changelog 2017-08-16 22:02:12 +0000
50@@ -1,3 +1,10 @@
51+nux (4.0.8+16.04.20160705-0ubuntu2) UNRELEASED; urgency=medium
52+
53+ * TextEntry: Make sure Ctr+{C,V,X,A} work with caps-lock on (LP:
54+ #1664205)
55+
56+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 04 Jul 2017 17:50:40 +0200
57+
58 nux (4.0.8+16.04.20160705-0ubuntu1) xenial; urgency=medium
59
60 * unity_support_test: add llvmpipe as software-rendererd (LP:

Subscribers

People subscribed via source and target branches

to all changes: