From 03c1148c8cfb3a238f1e5d732db3c7f9245b6e75 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Tue, 24 Apr 2012 11:40:49 +0300 Subject: [PATCH] Update OsmAnd/jni/osmand/textdraw.cpp --- OsmAnd/jni/osmand/textdraw.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OsmAnd/jni/osmand/textdraw.cpp b/OsmAnd/jni/osmand/textdraw.cpp index 6662623a12..f2404f7ad6 100644 --- a/OsmAnd/jni/osmand/textdraw.cpp +++ b/OsmAnd/jni/osmand/textdraw.cpp @@ -147,14 +147,13 @@ void drawTextOnCanvas(SkCanvas* cv, std::string text, float centerX, float cente paintText.setStyle(SkPaint::kStroke_Style); paintText.setColor(-1); // white paintText.setStrokeWidth(2 + textShadow); - // FIXME test black areas... - // cv->drawText(text.c_str(), text.length(), centerX, centerY, paintText); + cv->drawText(text.c_str(), text.length(), centerX, centerY, paintText); // reset paintText.setStrokeWidth(2); paintText.setStyle(SkPaint::kFill_Style); paintText.setColor(c); } - // cv->drawText(text.data(), text.length(), centerX, centerY, paintText); + cv->drawText(text.data(), text.length(), centerX, centerY, paintText); } @@ -468,6 +467,10 @@ bool textOrder(TextDrawInfo* text1, TextDrawInfo* text2) { SkTypeface* serif = SkTypeface::CreateFromName("Droid Serif", SkTypeface::kNormal); void drawTextOverCanvas(RenderingContext* rc, SkCanvas* cv) { + if(true) { + // FIXME comment out (after testing) + return; + } SkRect r = SkRect::MakeLTRB(0, 0, rc->width, rc->height); r.inset(-100, -100); quad_tree boundsIntersect(r, 4, 0.6);