Fix coordinate transformation for text bbox.

Of course a bbox does have 4 coordinates, not just one. Now displaying
of text looks as expected. We can revert the text hack from qt5.

2 files changed, 6 insertions, 3 deletions

diff --git a/navit/graphics.c b/navit/graphics.c
index 4b0c173b2..8216dc719 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -1131,7 +1131,10 @@ void graphics_draw_text(struct graphics *this_, struct graphics_gc *gc1, struct
 void graphics_get_text_bbox(struct graphics *this_, struct graphics_font *font, char *text, int dx, int dy,
                             struct point *ret, int estimate) {
     this_->meth.get_text_bbox(this_->priv, font->priv, text, dx, dy, ret, estimate);
-    *ret=graphics_dpi_unscale_point(this_,ret);
+    ret[0]=graphics_dpi_unscale_point(this_,&(ret[0]));
+    ret[1]=graphics_dpi_unscale_point(this_,&(ret[1]));
+    ret[2]=graphics_dpi_unscale_point(this_,&(ret[2]));
+    ret[3]=graphics_dpi_unscale_point(this_,&(ret[3]));
 }
 
 /**
diff --git a/navit/graphics/qt5/graphics_qt5.cpp b/navit/graphics/qt5/graphics_qt5.cpp
index b34ad7250..80b7b601f 100644
--- a/navit/graphics/qt5/graphics_qt5.cpp
+++ b/navit/graphics/qt5/graphics_qt5.cpp
@@ -536,11 +536,11 @@ static void draw_text(struct graphics_priv* gr, struct graphics_gc_priv* fg, str
         shadow.setColor(bg->pen->color());
         shadow.setWidth(3);
         painter->setPen(shadow);
-        path.addText(0, (font->font->pixelSize()/2) * -1, *font->font, tmp);
+        path.addText(0, 0, *font->font, tmp);
         painter->drawPath(path);
     }
     painter->setPen(*fg->pen);
-    painter->drawText(0, (font->font->pixelSize()/2) *-1, tmp);
+    painter->drawText(0, 0, tmp);
     painter->setWorldMatrix(sav);
 #endif
 }