Fix status bubble shadow being opaque, which made the bubble appear to be off...

chrome/browser/views/status_bubble_views.cc

 // Copyright (c) 2006-2008 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/browser/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "chrome/common/animation.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/l10n_util_win.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/controls/label.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRect.h"
 
 // The color of the background bubble.
 static const SkColor kBubbleColor = SkColorSetRGB(222, 234, 248);
 
-// The alpha and color of the bubble's shadow. This is a composite of the above
-// background color with 30% gray.
-static const SkColor kShadowColor = SkColorSetRGB(196, 206, 212);
-
-// How wide the bubble's shadow is.
-static const int kShadowSize = 1;
+// The alpha and color of the bubble's shadow.
+static const SkColor kShadowColor = SkColorSetARGB(30, 0, 0, 0);
 
 // The roundedness of the edges of our bubble.
 static const int kBubbleCornerRadius = 4;
 
 // How close the mouse can get to the infobubble before it starts sliding
 // off-screen.
 static const int kMousePadding = 20;
 
 // The color of the text
 static const SkColor kTextColor = SkColorSetRGB(100, 100, 100);
 
 // The color of the highlight text
 static const SkColor kTextHighlightColor = SkColorSetRGB(242, 250, 255);
 
-static const int kTextPadding = 3;
-static const int kTextPositionX = 4;
-static const int kTextPositionY = 1;
+// The horizontal offset of the text within the status bubble, not including the
+// outer shadow ring.
+static const int kTextPositionX = 3;
+
+// The minimum horizontal space between the (right) end of the text and the edge
+// of the status bubble, not including the outer shadow ring, or a 1 px gap we
+// leave so we can shit all the text by 1 px to produce a "highlight" effect.
+static const int kTextHorizPadding = 1;
 
 // Delays before we start hiding or showing the bubble after we receive a
 // show or hide request.
 static const int kShowDelay = 80;
 static const int kHideDelay = 250;
 
 // How long each fade should last for.
 static const int kShowFadeDurationMS = 120;
 static const int kHideFadeDurationMS = 200;
 static const int kFramerate = 25;
@@ skipping 256 matching lines @@
 
 void StatusBubbleViews::StatusView::Paint(ChromeCanvas* canvas) {
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setFlags(SkPaint::kAntiAlias_Flag);
   paint.setColor(kBubbleColor);
 
   RECT parent_rect;
   ::GetWindowRect(popup_->GetNativeView(), &parent_rect);
 
-  // Draw our background.
-  SkRect rect;
-  int width = parent_rect.right - parent_rect.left;
-  int height = parent_rect.bottom - parent_rect.top;
-
   // Figure out how to round the bubble's four corners.
   SkScalar rad[8];
 
   // Top Edges - if the bubble is in its bottom position (sticking downwards),
   // then we square the top edges. Otherwise, we square the edges based on the
   // position of the bubble within the window (the bubble is positioned in the
   // southeast corner in RTL and in the southwest corner in LTR).
   if (style_ == STYLE_BOTTOM) {
     // Top Left corner.
     rad[0] = 0;
@@ skipping 36 matching lines @@
     // Bottom Right Corner.
     rad[4] = SkIntToScalar(kBubbleCornerRadius);
     rad[5] = SkIntToScalar(kBubbleCornerRadius);
 
     // Bottom Left Corner.
     rad[6] = SkIntToScalar(kBubbleCornerRadius);
     rad[7] = SkIntToScalar(kBubbleCornerRadius);
   }
 
   // Draw the bubble's shadow.
+  int width = parent_rect.right - parent_rect.left;
+  int height = parent_rect.bottom - parent_rect.top;
+  SkRect rect;
+  rect.set(0, 0,
+           SkIntToScalar(width),
+           SkIntToScalar(height));
+  SkPath shadow_path;
+  shadow_path.addRoundRect(rect, rad, SkPath::kCW_Direction);
   SkPaint shadow_paint;
   shadow_paint.setFlags(SkPaint::kAntiAlias_Flag);
   shadow_paint.setColor(kShadowColor);
-
-  rect.set(0, 0,
-           SkIntToScalar(width),
-           SkIntToScalar(height));
-
-  SkPath shadow_path;
-  shadow_path.addRoundRect(rect, rad, SkPath::kCW_Direction);
   canvas->drawPath(shadow_path, shadow_paint);
 
   // Draw the bubble.
+  rect.set(SkIntToScalar(kShadowThickness),
+           SkIntToScalar(kShadowThickness),
+           SkIntToScalar(width - kShadowThickness),
+           SkIntToScalar(height - kShadowThickness));
   SkPath path;
-  rect.set(SkIntToScalar(kShadowSize),
-           SkIntToScalar(kShadowSize),
-           SkIntToScalar(width - kShadowSize),
-           SkIntToScalar(height - kShadowSize));
-
   path.addRoundRect(rect, rad, SkPath::kCW_Direction);
   canvas->drawPath(path, paint);
 
-
-  int text_width = std::min(static_cast<int>(parent_rect.right -
-                                parent_rect.left - kTextPositionX -
-                                kTextPadding),
-                            static_cast<int>(views::Label::GetFont()
-                                .GetStringWidth(text_)));
-
   // Draw highlight text and then the text body. In order to make sure the text
   // is aligned to the right on RTL UIs, we mirror the text bounds if the
   // locale is RTL.
-  gfx::Rect body_bounds(kTextPositionX,
-                        kTextPositionY,
+  // The "- 1" on the end of the width and height ensures that when we add one
+  // to x() and y() for the highlight text, we still won't overlap the shadow.
+  int text_width = std::min(views::Label::GetFont().GetStringWidth(text_),
+      width - (kShadowThickness * 2) - kTextPositionX - kTextHorizPadding - 1);
+  gfx::Rect body_bounds(kShadowThickness + kTextPositionX,
+                        kShadowThickness,
                         text_width,
-                        parent_rect.bottom - parent_rect.top);
+                        height - (kShadowThickness * 2) - 1);
   body_bounds.set_x(MirroredLeftPointForRect(body_bounds));
   canvas->DrawStringInt(text_,
                         views::Label::GetFont(),
                         kTextHighlightColor,
                         body_bounds.x() + 1,
                         body_bounds.y() + 1,
                         body_bounds.width(),
                         body_bounds.height());
 
   canvas->DrawStringInt(text_,
                         views::Label::GetFont(),
                         kTextColor,
                         body_bounds.x(),
                         body_bounds.y(),
                         body_bounds.width(),
                         body_bounds.height());
 }
 
 // StatusBubble ---------------------------------------------------------------
 
+const int StatusBubbleViews::kShadowThickness = 1;
+
 StatusBubbleViews::StatusBubbleViews(views::Widget* frame)
     : popup_(NULL),
       frame_(frame),
       view_(NULL),
       opacity_(0),
       position_(0, 0),
       size_(0, 0),
       offset_(0) {
 }
 
@@ skipping 50 matching lines @@
   // display, display that status instead.
   if (url.is_empty() && !status_text_.empty()) {
     url_text_ = std::wstring();
     view_->SetText(status_text_);
     return;
   }
 
   // Set Elided Text corresponding to the GURL object.
   RECT parent_rect;
   ::GetWindowRect(popup_->GetNativeView(), &parent_rect);
-  int text_width = static_cast<int>(parent_rect.right -
-                                    parent_rect.left - kTextPositionX -
-                                    kTextPadding);
+  int text_width = static_cast<int>(parent_rect.right - parent_rect.left - 
+      (kShadowThickness * 2) - kTextPositionX - kTextHorizPadding - 1);
   url_text_ = gfx::ElideUrl(url, view_->Label::GetFont(), text_width,
                             languages);
 
   // An URL is always treated as a left-to-right string. On right-to-left UIs
   // we need to explicitly mark the URL as LTR to make sure it is displayed
   // correctly.
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT &&
       !url_text_.empty())
     l10n_util::WrapStringWithLTRFormatting(&url_text_);
   view_->SetText(url_text_);
@@ skipping 47 matching lines @@
     if (cursor_location.x > size_.cx) {
       offset = static_cast<int>(static_cast<float>(offset) * (
           static_cast<float>(kMousePadding -
               (cursor_location.x - size_.cx)) /
           static_cast<float>(kMousePadding)));
     }
 
     // Cap the offset and change the visual presentation of the bubble
     // depending on where it ends up (so that rounded corners square off
     // and mate to the edges of the tab content).
-    if (offset >= size_.cy - kShadowSize * 2) {
-      offset = size_.cy - kShadowSize * 2;
+    if (offset >= size_.cy - kShadowThickness * 2) {
+      offset = size_.cy - kShadowThickness * 2;
       view_->SetStyle(StatusView::STYLE_BOTTOM);
-    } else if (offset > kBubbleCornerRadius / 2 - kShadowSize) {
+    } else if (offset > kBubbleCornerRadius / 2 - kShadowThickness) {
       view_->SetStyle(StatusView::STYLE_FLOATING);
     } else {
       view_->SetStyle(StatusView::STYLE_STANDARD);
     }
 
     offset_ = offset;
     popup_->MoveWindow(top_left.x() + position_.x,
                        top_left.y() + position_.y + offset_,
                        size_.cx,
                        size_.cy);
@@ skipping 27 matching lines @@
     frame_->GetBounds(&frame_bounds, false);
     int mirrored_x = frame_bounds.width() - x - w;
     position_.SetPoint(mirrored_x, y);
   } else {
     position_.SetPoint(x, y);
   }
 
   size_.SetSize(w, h);
   Reposition();
 }