diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-07-25 13:15:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 13:15:04 +0200 |
| commit | b6c0c8685f802091e2c37d88960266137d0fb6f2 (patch) | |
| tree | f22283fc04fbe093d47b6a3c4cf0781e9a5edcee | |
| parent | 0f08c04dd9816533ffbaa2b684b8b0d57f0da9a5 (diff) | |
| parent | a0e00e963d8217ad3d2ff76cefbca0dd1cb66db7 (diff) | |
| download | navit-b6c0c8685f802091e2c37d88960266137d0fb6f2.tar.gz | |
Merge pull request #814 from hoehnp/trunk
fix:osd: no redraw of map when stopping drag over osd_speed_warner, osd_stopwatch and osd_odometer
| -rw-r--r-- | navit/binding/dbus/binding_dbus.c | 2 | ||||
| -rw-r--r-- | navit/osd/core/osd_core.c | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c index aa776db10..5eddc50f7 100644 --- a/navit/binding/dbus/binding_dbus.c +++ b/navit/binding/dbus/binding_dbus.c @@ -45,9 +45,7 @@ #include "osd.h" #include "route.h" #include "search.h" -#include "callback.h" #include "gui.h" -#include "layout.h" #include "roadprofile.h" #include "util.h" #include "transform.h" diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index e1329ffe2..d8d320695 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -954,10 +954,11 @@ static void osd_odometer_click(struct osd_priv_common *opc, struct navit *nav, i return; if (button != 1) return; - if (navit_ignore_button(nav)) - return; if (!!pressed == !!opc->osd_item.pressed) return; + if (navit_ignore_button(nav)) + return; + opc->osd_item.pressed=pressed; gettimeofday(&tv,NULL); curr_time = (double)(tv.tv_usec)/1000000.0+tv.tv_sec; @@ -1359,10 +1360,11 @@ static void osd_stopwatch_click(struct osd_priv_common *opc, struct navit *nav, return; if (button != 1) return; - if (navit_ignore_button(nav)) - return; if (!!pressed == !!opc->osd_item.pressed) return; + if (navit_ignore_button(nav)) + return; + opc->osd_item.pressed=pressed; if (pressed) { //single click handling @@ -2725,13 +2727,17 @@ static void osd_speed_warner_click(struct osd_priv_common *opc, struct navit *na return; if (button != 1) return; - if (navit_ignore_button(nav)) - return; if (!!pressed == !!opc->osd_item.pressed) return; - this->active = !this->active; - osd_speed_warner_draw(opc, nav, NULL); + if (navit_ignore_button(nav)) + return; + opc->osd_item.pressed=pressed; + if (pressed) + { + this->active = !this->active; + osd_speed_warner_draw(opc, nav, NULL); + } } |