aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog4
-rw-r--r--e-util/e-canvas.c14
-rw-r--r--widgets/misc/e-canvas.c14
3 files changed, 30 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index d4dc809aa9..f02808dcfc 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-10 Christopher James Lahey <clahey@helixcode.com>
+
+ * e-canvas.c: Added proper keyboard focus handling.
+
2000-04-06 Matt Loper <matt@helixcode.com>
* e-setup.c (e_setup_base_dir): Get/set Evolution's base directory
diff --git a/e-util/e-canvas.c b/e-util/e-canvas.c
index 5c6cfd3278..704b6ca12b 100644
--- a/e-util/e-canvas.c
+++ b/e-util/e-canvas.c
@@ -288,7 +288,19 @@ e_canvas_item_grab_focus (GnomeCanvasItem *item)
}
item->canvas->focused_item = item;
- gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
+
+ if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET(item->canvas))) {
+ gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
+ }
+
+ if (focused_item) {
+ ev.focus_change.type = GDK_FOCUS_CHANGE;
+ ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
+ ev.focus_change.send_event = FALSE;
+ ev.focus_change.in = TRUE;
+
+ emit_event (item->canvas, &ev);
+ }
}
/* Focus in handler for the canvas */
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 5c6cfd3278..704b6ca12b 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -288,7 +288,19 @@ e_canvas_item_grab_focus (GnomeCanvasItem *item)
}
item->canvas->focused_item = item;
- gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
+
+ if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET(item->canvas))) {
+ gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
+ }
+
+ if (focused_item) {
+ ev.focus_change.type = GDK_FOCUS_CHANGE;
+ ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
+ ev.focus_change.send_event = FALSE;
+ ev.focus_change.in = TRUE;
+
+ emit_event (item->canvas, &ev);
+ }
}
/* Focus in handler for the canvas */