Indicator Display Objects

Merge lp:~bratsche/ido/keyboard-fixes into lp:ido/0.3

  1. keyboard-fixes
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/ido/keyboard-fixes
Merge into: lp:ido/0.3
Diff against target: 78 lines (+24/-6)
2 files modified
src/idoentrymenuitem.c (+21/-3)
src/idoscalemenuitem.c (+3/-3)
To merge this branch: bzr merge lp:~bratsche/ido/keyboard-fixes
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Ted Gould (community) Approve
Review via email: mp+21375@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Looks good to me.

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

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/idoentrymenuitem.c'
2--- src/idoentrymenuitem.c 2010-03-11 05:30:45 +0000
3+++ src/idoentrymenuitem.c 2010-03-15 14:17:15 +0000
4@@ -120,6 +120,24 @@
5 }
6
7 static gboolean
8+is_key_press_valid (IdoEntryMenuItem *item,
9+ gint key)
10+{
11+ switch (key)
12+ {
13+ case GDK_Escape:
14+ case GDK_Up:
15+ case GDK_Down:
16+ case GDK_KP_Up:
17+ case GDK_KP_Down:
18+ return FALSE;
19+
20+ default:
21+ return TRUE;
22+ }
23+}
24+
25+static gboolean
26 ido_entry_menu_item_key_press (GtkWidget *widget,
27 GdkEventKey *event,
28 gpointer data)
29@@ -127,7 +145,7 @@
30 IdoEntryMenuItem *menuitem = (IdoEntryMenuItem *)data;
31
32 if (menuitem->priv->selected &&
33- event->keyval != GDK_Escape)
34+ is_key_press_valid (menuitem, event->keyval))
35 {
36 gtk_widget_event (menuitem->priv->entry,
37 ((GdkEvent *)(void*)(event)));
38@@ -140,7 +158,7 @@
39
40 static void
41 ido_entry_menu_item_send_focus_change (GtkWidget *widget,
42- gboolean in)
43+ gboolean in)
44 {
45 GdkEvent *event = gdk_event_new (GDK_FOCUS_CHANGE);
46
47@@ -182,7 +200,7 @@
48 gdk_window_raise (entry->window);
49 }
50
51- if (!GTK_WIDGET_HAS_FOCUS (entry))
52+ if (!gtk_widget_has_focus (entry))
53 {
54 gtk_widget_grab_focus (entry);
55 }
56
57=== modified file 'src/idoscalemenuitem.c'
58--- src/idoscalemenuitem.c 2010-03-09 17:43:40 +0000
59+++ src/idoscalemenuitem.c 2010-03-15 14:17:15 +0000
60@@ -135,8 +135,8 @@
61 "horizontal-padding", &horizontal_padding,
62 NULL);
63
64- primary_padding = GTK_WIDGET_VISIBLE (priv->primary_image) ? primary_image_req.width : 0;
65- secondary_padding = GTK_WIDGET_VISIBLE (priv->secondary_image) ? secondary_image_req.width : 0;
66+ primary_padding = gtk_widget_get_visible (priv->primary_image) ? primary_image_req.width : 0;
67+ secondary_padding = gtk_widget_get_visible (priv->secondary_image) ? secondary_image_req.width : 0;
68
69 priv->left_padding = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? primary_padding : secondary_padding;
70
71@@ -297,7 +297,7 @@
72 {
73 IdoScaleMenuItemPrivate *priv = GET_PRIVATE (widget);
74
75- if (GTK_WIDGET_DRAWABLE (widget))
76+ if (gtk_widget_is_drawable (widget))
77 {
78 GdkPixbuf *pixbuf = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW (priv->offscreen));
79

Subscribers

People subscribed via source and target branches

to all changes: