Nux

Merge lp:~vbkaisetsu/nux/bug954901 into lp:nux/2.0

Proposed by Koichi Akabe
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 598
Merged at revision: 601
Proposed branch: lp:~vbkaisetsu/nux/bug954901
Merge into: lp:nux/2.0
Diff against target: 57 lines (+9/-7)
1 file modified
Nux/TextEntry.cpp (+9/-7)
To merge this branch: bzr merge lp:~vbkaisetsu/nux/bug954901
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Review via email: mp+97379@code.launchpad.net

Commit message

* Fixes using Enter as a way to commit Preedit text for specific ibus engines.

Description of the change

Hi,

I fixed bug #954901
Please merge this branch.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks good, retval is Return Value but im_filtered works as well. I wasn't aware enter was also a way to commit text, thought it was Ctrl + J for anthy. Thank you!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

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 2012-03-10 01:42:52 +0000
3+++ Nux/TextEntry.cpp 2012-03-17 08:54:19 +0000
4@@ -289,8 +289,7 @@
5 const char* character , /*character*/
6 unsigned short keyCount /*key repeat count*/)
7 {
8- bool retval = FALSE;
9-
10+ bool im_filtered = false;
11 #if defined(NUX_OS_LINUX)
12 if (dead_key_mode_ && keysym == XK_space)
13 {
14@@ -320,7 +319,7 @@
15 KeyEvent event((NuxEventType)event_type, keysym,cur_event.x11_keycode, state, character);
16
17 #if defined(NUX_OS_LINUX)
18- retval = ime_->FilterKeyEvent(event);
19+ im_filtered = ime_->FilterKeyEvent(event);
20 #endif
21
22 if ((!multiline_) && (!lose_key_focus_on_key_nav_direction_up_) && (keysym == NUX_VK_UP))
23@@ -343,7 +342,7 @@
24 if (keysym == NUX_VK_TAB)
25 return;
26
27- if (keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER)
28+ if ((keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER) && !im_filtered)
29 {
30 activated.emit();
31 return;
32@@ -354,7 +353,7 @@
33 bool ctrl = (state & NUX_STATE_CTRL);
34
35 // DLOG("TextEntry::key_down(%d, shift:%d ctrl:%d)", keyval, shift, ctrl);
36- if (event_type == NUX_KEYDOWN && !retval)
37+ if (event_type == NUX_KEYDOWN && !im_filtered)
38 {
39 if (keyval == NUX_VK_LEFT)
40 {
41@@ -467,12 +466,15 @@
42 // }
43 }
44
45- if (!retval && character != 0 && (strlen(character) != 0))
46+ if ((character != 0 && strlen(character) != 0) && !im_filtered)
47 {
48 EnterText(character);
49 }
50
51- QueueRefresh(false, true);
52+ if (!im_filtered)
53+ {
54+ QueueRefresh(false, true);
55+ }
56 return;
57 }
58

Subscribers

People subscribed via source and target branches

to all changes: