diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-03-05 21:04:40 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-03-05 21:04:40 +0000 |
commit | 516ab7463afb934a0ec59a1a44c24812076ef643 (patch) | |
tree | d716513af7d7e08bfd6018224700d768f7dc31eb /navit/osd.c | |
parent | 7ca96663c4513d22bd3192dd92159a2e772c97a5 (diff) | |
download | navit-516ab7463afb934a0ec59a1a44c24812076ef643.tar.gz |
Fix:osd_core:Allow accesskey usage on non-overlay osds
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5399 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/osd.c')
-rw-r--r-- | navit/osd.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/navit/osd.c b/navit/osd.c index 10cc6ea68..637c38e45 100644 --- a/navit/osd.c +++ b/navit/osd.c @@ -318,6 +318,17 @@ osd_set_std_config(struct navit *nav, struct osd_item *item) } void +osd_set_keypress(struct navit *nav, struct osd_item *item) +{ + struct graphics *navit_gr = navit_get_graphics(nav); + dbg(2,"accesskey %s\n",item->accesskey); + if (item->accesskey) { + item->keypress_cb=callback_new_attr_2(callback_cast(osd_std_keypress), attr_keypress, item, nav); + graphics_add_callback(navit_gr, item->keypress_cb); + } +} + +void osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *priv) { struct graphics *navit_gr; @@ -342,12 +353,7 @@ osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *p item->resize_cb = callback_new_attr_2(callback_cast(osd_std_calculate_sizes), attr_resize, item, priv); graphics_add_callback(navit_gr, item->resize_cb); - dbg(2,"accesskey %s\n",item->accesskey); - if (item->accesskey) { - item->keypress_cb=callback_new_attr_2(callback_cast(osd_std_keypress), attr_keypress, item, nav); - graphics_add_callback(navit_gr, item->keypress_cb); - } - + osd_set_keypress(nav, item); } void |