diff options
| author |  reed <reed@google.com> | 2016-08-21 19:30:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-21 19:30:13 -0700 |
| commit | 5755cd98a749fefd9307f1dc187028bf76cef3bb (patch) | |
| tree | b0edbcbd3ae359494d0fe869c1abe3d436715d2e | |
| parent | 577e012e4058a5264477f760a6488c766ec942e7 (diff) | |
make zoomer text clearer
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2267623002
TBR=
Review-Url: https://codereview.chromium.org/2267623002
| -rw-r--r-- | samplecode/SampleApp.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 62970302df..9e7e651b1c 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -837,7 +837,9 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fMouseX = fMouseY = 0; fFatBitsScale = 8; - fTypeface = SkTypeface::MakeFromTypeface(nullptr, SkTypeface::kBold); + fTypeface = SkTypeface::MakeFromName("Courier", SkFontStyle(SkFontStyle::kBold_Weight, + SkFontStyle::kNormal_Width, + SkFontStyle::kUpright_Slant)); fShowZoomer = false; fZoomLevel = 0; @@ -999,10 +1001,6 @@ static void drawText(SkCanvas* canvas, SkString str, SkScalar left, SkScalar top SkScalar inset = SkIntToScalar(-2); bounds.inset(inset, inset); canvas->drawRect(bounds, paint); - if (desiredColor != SK_ColorBLACK) { - paint.setColor(SK_ColorBLACK); - canvas->drawText(c_str, size, left + SK_Scalar1, top + SK_Scalar1, paint); - } paint.setColor(desiredColor); canvas->drawText(c_str, size, left, top, paint); } @@ -1247,6 +1245,7 @@ void SampleWindow::showZoomer(SkCanvas* canvas) { // Identify the pixel and its color on screen paint.setTypeface(fTypeface); paint.setAntiAlias(true); + paint.setTextSize(18); SkScalar lineHeight = paint.getFontMetrics(nullptr); SkString string; string.appendf("(%i, %i)", fMouseX, fMouseY); @@ -1268,7 +1267,7 @@ void SampleWindow::showZoomer(SkCanvas* canvas) { i += SK_Scalar1; string.reset(); string.appendf("G: %X", SkColorGetG(color)); - paint.setColor(SK_ColorGREEN); + paint.setColor(0xFF008800); drawText(canvas, string, left, SkScalarMulAdd(lineHeight, i, dest.fTop), paint); // Blue i += SK_Scalar1; |