diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-18 20:52:11 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-18 20:52:11 +0000 |
| commit | 421f5db90fd9f6c2e4c19e0526e998dbe121b3f2 (patch) | |
| tree | ae9abd2ab7c92528e6dc84d6ca2cc512172479a3 /navit/osd | |
| parent | 61fe2bf281e656e7ea7bfb10d34cf1e8f17f4b67 (diff) | |
| download | navit-421f5db90fd9f6c2e4c19e0526e998dbe121b3f2.tar.gz | |
Fix:core:Fix regressions of svn 5989. Do not crash if gps_status width is not specified, draw circle around osd_speedwarner, fix comment of attr_rel2real.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5997 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/osd')
| -rw-r--r-- | navit/osd/core/osd_core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index 1d17545f8..0fbb9d1cc 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -2396,6 +2396,11 @@ osd_speed_warner_init(struct osd_priv_common *opc, struct navit *nav) osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc); navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_speed_warner_draw), attr_position_coord_geo, opc)); + this->d=opc->osd_item.w; + if (opc->osd_item.h < this->d) + this->d=opc->osd_item.h; + this->width=this->d/10; + if(this->label_str && !strncmp("images:",this->label_str,7)) { char *tok1=NULL, *tok2=NULL, *tok3=NULL; strtok(this->label_str,":"); @@ -2490,10 +2495,6 @@ osd_speed_warner_new(struct navit *nav, struct osd_methods *meth, struct attr ** else this->announce_on = 1; //announce by default osd_set_std_attr(attrs, &opc->osd_item, 2); - this->d=opc->osd_item.w; - if (opc->osd_item.h < this->d) - this->d=opc->osd_item.h; - this->width=this->d/10; navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_speed_warner_init), attr_graphics_ready, opc)); return (struct osd_priv *) opc; } @@ -3244,7 +3245,7 @@ osd_gps_status_new(struct navit *nav, struct osd_methods *meth, opc->osd_item.rel_y = -80; opc->osd_item.rel_w = 60; opc->osd_item.navit = nav; - opc->osd_item.h = 40; + opc->osd_item.rel_h = 40; opc->osd_item.font_size = 200; opc->osd_item.meth.draw = osd_draw_cast(osd_gps_status_draw); meth->set_attr = set_std_osd_attr; |