GTK: touch up appearance of browser actions badge....

chrome/common/extensions/extension_action.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension_action.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 const int ExtensionAction::kDefaultTabId = -1;
 
 void ExtensionAction::ClearAllValuesForTab(int tab_id) {
   title_.erase(tab_id);
   icon_.erase(tab_id);
   icon_index_.erase(tab_id);
   badge_text_.erase(tab_id);
   badge_text_color_.erase(tab_id);
   badge_background_color_.erase(tab_id);
   visible_.erase(tab_id);
 }
 
 void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
-                                  const gfx::Rect& bounds,
-                                  int tab_id) {
+                                 const gfx::Rect& bounds,
+                                 int tab_id) {
   std::string text = GetBadgeText(tab_id);
   if (text.empty())
     return;
 
   SkColor text_color = GetBadgeTextColor(tab_id);
   SkColor background_color = GetBadgeBackgroundColor(tab_id);
 
   if (SkColorGetA(text_color) == 0x00)
     text_color = SK_ColorWHITE;
 
   if (SkColorGetA(background_color) == 0x00)
     background_color = SkColorSetARGB(255, 218, 0, 24);  // default badge color
 
   // Different platforms need slightly different constants to look good.
 #if defined(OS_LINUX)
   const int kTextSize = 9;
-  const int kBottomMargin = 4;
+  const int kBottomMargin = 0;
   const int kPadding = 2;
-  const int kBadgeHeight = 12;
+  const int kTopTextPadding = 0;

[Aaron Boodman, 2009/10/28 03:18:12]

Weird. I wonder why these are different.

+  const int kBadgeHeight = 11;
   const int kMaxTextWidth = 23;
   // The minimum width for center-aligning the badge.
   const int kCenterAlignThreshold = 20;
 #else
   const int kTextSize = 8;
   const int kBottomMargin = 5;
   const int kPadding = 2;
+  // The padding between the top of the badge and the top of the text.
+  const int kTopTextPadding = 1;
   const int kBadgeHeight = 11;
   const int kMaxTextWidth = 23;
   // The minimum width for center-aligning the badge.
   const int kCenterAlignThreshold = 20;
 #endif
 
   canvas->save();
 
 #if defined(OS_MACOSX)
   SkTypeface* typeface =
@@ skipping 57 matching lines @@
   canvas->drawBitmap(*gradient_right,
       rect.fRight - SkIntToScalar(gradient_right->width()), rect.fTop);
 
   // Finally, draw the text centered within the badge. We set a clip in case the
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->clipRect(rect);
   canvas->drawText(text.c_str(), text.size(),
                    rect.fLeft + (rect.width() - text_width) / 2,
-                   rect.fTop + kTextSize + 1,
+                   rect.fTop + kTextSize + kTopTextPadding,
                    text_paint);
   canvas->restore();
 }