diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-02-20 00:20:52 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-02-20 00:20:52 +0000 |
| commit | af68bf6662a6c33057b53f6afca57f0fca7276f3 (patch) | |
| tree | da68d197a67a8fed8408808ca33f1b5641b6c954 /navit/osd.c | |
| parent | 3fe2d5dcdb9c039e87f7a6e04cf6762ceeea86aa (diff) | |
| download | navit-svn-af68bf6662a6c33057b53f6afca57f0fca7276f3.tar.gz | |
Refactor:osd:Rename osd_std_draw to osd_fill_with_bgcolor; extract variable.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6014 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/osd.c')
| -rw-r--r-- | navit/osd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/navit/osd.c b/navit/osd.c index 3671f331..d0e88d15 100644 --- a/navit/osd.c +++ b/navit/osd.c @@ -135,11 +135,13 @@ osd_evaluate_command(struct osd_item *this, struct navit *nav) void osd_std_click(struct osd_item *this, struct navit *nav, int pressed, int button, struct point *p) { + int click_is_outside_item; struct point bp = this->p; if (!this->command || !this->command[0]) return; osd_wrap_point(&bp, nav); - if ((p->x < bp.x || p->y < bp.y || p->x > bp.x + this->w || p->y > bp.y + this->h || !this->configured) && !this->pressed) + click_is_outside_item = p->x < bp.x || p->y < bp.y || p->x > bp.x + this->w || p->y > bp.y + this->h; + if ((click_is_outside_item || !this->configured) && !this->pressed) return; if (button != 1) return; @@ -393,9 +395,9 @@ osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *p } void -osd_std_draw(struct osd_item *item) +osd_fill_with_bgcolor(struct osd_item *item) { - struct point p[2]; + struct point p[1]; graphics_draw_mode(item->gr, draw_mode_begin); p[0].x=0; p[0].y=0; |