Indicator Display Objects

Merge lp:~bratsche/ido/focus-changes into lp:ido/0.3

  1. focus-changes
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merge reported by: David Barth
Merged at revision: not available
Proposed branch: lp:~bratsche/ido/focus-changes
Merge into: lp:ido/0.3
Diff against target: 57 lines (+11/-7) (has conflicts)
2 files modified
configure.ac (+5/-0)
src/idoentrymenuitem.c (+6/-7)
Text conflict in configure.ac
To merge this branch: bzr merge lp:~bratsche/ido/focus-changes
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+35603@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve
Revision history for this message
David Barth (dbarth) wrote :

That solves the focus issue on the entry

lp:~bratsche/ido/focus-changes updated
66. By Cody Russell

Remove notify.

Revision history for this message
David Barth (dbarth) wrote :

The code was merged in ido/meerkat

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-09-14 00:31:26 +0000
3+++ configure.ac 2010-09-16 15:01:07 +0000
4@@ -2,8 +2,13 @@
5 # shamelessly stolen from clutter-gtk
6 #
7 m4_define([ido_major_version], [0])
8+<<<<<<< TREE
9 m4_define([ido_minor_version], [2])
10 m4_define([ido_micro_version], [0])
11+=======
12+m4_define([ido_minor_version], [1])
13+m4_define([ido_micro_version], [13])
14+>>>>>>> MERGE-SOURCE
15
16 m4_define([ido_api_version],
17 [ido_major_version.ido_minor_version])
18
19=== modified file 'src/idoentrymenuitem.c'
20--- src/idoentrymenuitem.c 2010-09-10 21:26:16 +0000
21+++ src/idoentrymenuitem.c 2010-09-16 15:01:07 +0000
22@@ -161,6 +161,10 @@
23 {
24 GdkEvent *event = gdk_event_new (GDK_FOCUS_CHANGE);
25
26+ gdk_keyboard_ungrab (GDK_CURRENT_TIME);
27+
28+ gdk_keyboard_grab (widget->window, TRUE, GDK_CURRENT_TIME);
29+
30 g_object_ref (widget);
31
32 event->focus_change.type = GDK_FOCUS_CHANGE;
33@@ -169,8 +173,6 @@
34
35 gtk_widget_event (widget, event);
36
37- g_object_notify (G_OBJECT (widget), "has-focus");
38-
39 g_object_unref (widget);
40 gdk_event_free (event);
41 }
42@@ -181,13 +183,10 @@
43 {
44 GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry;
45
46+ ido_entry_menu_item_send_focus_change (widget, TRUE);
47+
48 if (event->button == 1)
49 {
50- if (entry->window != NULL)
51- {
52- gdk_window_raise (entry->window);
53- }
54-
55 if (!gtk_widget_has_focus (entry))
56 {
57 gtk_widget_grab_focus (entry);

Subscribers

People subscribed via source and target branches

to all changes: