aura: Draw shadows around tooltip windows.

ui/aura_shell/shell_tooltip_manager.cc

 // Copyright (c) 2011 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 "ui/aura_shell/shell_tooltip_manager.h"
 
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/location.h"
 #include "base/string_split.h"
 #include "base/time.h"
+#include "ui/aura/aura_switches.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
-SkColor kTooltipBackground = 0xFFFFFFCC;
-SkColor kTooltipBorder = 0xFF000000;
-int kTooltipBorderWidth = 1;
-int kTooltipTimeoutMs = 500;
+const SkColor kTooltipBackground = 0xFFFFFFCC;
+const SkColor kTooltipBorder = 0xFF646450;
+const int kTooltipBorderWidth = 1;
+const int kTooltipHorizontalPadding = 2;
+// TODO(derat): This padding is needed on Chrome OS devices but seems excessive
+// when running the same binary on a Linux workstation; presumably there's a
+// difference in font metrics.  Rationalize this.
+const int kTooltipVerticalPadding = 2;
+const int kTooltipTimeoutMs = 500;
 
 // FIXME: get cursor offset from actual cursor size.
-int kCursorOffsetX = 10;
-int kCursorOffsetY = 15;
+const int kCursorOffsetX = 10;
+const int kCursorOffsetY = 15;
 
 // Maximum number of characters we allow in a tooltip.
 const size_t kMaxTooltipLength = 1024;
 
 // Maximum number of lines we allow in the tooltip.
 const size_t kMaxLines = 6;
 
 // Trims the tooltip to fit, setting |text| to the clipped result,
 // |max_width| to the width (in pixels) of the clipped text and |line_count|
 // to the number of lines of text in the tooltip. |x| and |y| give the
 // location of the tooltip in screen coordinates.
 void TrimTooltipToFit(string16* text,
                       int* max_width,
                       int* line_count,
                       int x,
                       int y) {
   *max_width = 0;
   *line_count = 0;
 
   // Clamp the tooltip length to kMaxTooltipLength so that we don't
   // accidentally DOS the user with a mega tooltip.
   if (text->length() > kMaxTooltipLength)
     *text = text->substr(0, kMaxTooltipLength);
 
   // Determine the available width for the tooltip.
-  int available_width = aura::TooltipClient::GetMaxWidth(x, y);
+  int available_width =
+      aura::TooltipClient::GetMaxWidth(x, y) - 2 * kTooltipHorizontalPadding;

[varunjain, 2011/12/06 19:25:38]

I think you can simply add the padding to the widget. See for example:
http://codereview.chromium.org/8780001/diff/6001/ui/aura_shell/shell_tooltip_...

[Daniel Erat, 2011/12/06 21:34:18]

Done.

+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))
+    available_width -= 2 * kTooltipBorderWidth;
 
   // Split the string into at most kMaxLines lines.
   std::vector<string16> lines;
   base::SplitString(*text, '\n', &lines);
   if (lines.size() > kMaxLines)
     lines.resize(kMaxLines);
   *line_count = static_cast<int>(lines.size());
 
   // Format each line to fit.
   gfx::Font font = aura::TooltipClient::GetDefaultFont();
@@ skipping 27 matching lines @@
 }  // namespace
 
 namespace aura_shell {
 
 // Displays a widget with tooltip using a views::Label.
 class ShellTooltipManager::Tooltip {
  public:
   Tooltip() {
     label_.set_background(
         views::Background::CreateSolidBackground(kTooltipBackground));
-    label_.set_border(
-        views::Border::CreateSolidBorder(kTooltipBorderWidth, kTooltipBorder));
+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))

[Ben Goodger (Google), 2011/12/06 19:27:03]

needs braces

[Daniel Erat, 2011/12/06 21:34:18]

Done.

+      label_.set_border(
+          views::Border::CreateSolidBorder(kTooltipBorderWidth,
+                                           kTooltipBorder));
     label_.set_parent_owned(false);
     widget_.reset(CreateTooltip());
     widget_->SetContentsView(&label_);
     widget_->Activate();
   }
 
   ~Tooltip() {
     widget_->Close();
   }
 
   // Updates the text on the tooltip and resizes to fit.
   void SetText(string16 tooltip_text, gfx::Point location) {
     int max_width, line_count;
     TrimTooltipToFit(&tooltip_text, &max_width, &line_count,
                      location.x(), location.y());
     label_.SetText(tooltip_text);
 
-    SetTooltipBounds(location, max_width + 2 * kTooltipBorderWidth,
-                     label_.GetPreferredSize().height());
+    int width = max_width +  + 2 * kTooltipHorizontalPadding;
+    int height = label_.GetPreferredSize().height() +
+        2 * kTooltipVerticalPadding;
+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows)) {
+      width += 2 * kTooltipBorderWidth;
+      height += 2 * kTooltipBorderWidth;
+    }
+    SetTooltipBounds(location, width, height);
   }
 
   // Shows the tooltip.
   void Show() {
     widget_->Show();
   }
 
   // Hides the tooltip.
   void Hide() {
     widget_->Hide();
@@ skipping 19 matching lines @@
     gfx::Rect monitor_bounds =
         gfx::Screen::GetMonitorAreaNearestPoint(tooltip_rect.origin());
     widget_->SetBounds(tooltip_rect.AdjustToFit(monitor_bounds));
   }
 
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellTooltipManager public:
 
-ShellTooltipManager::ShellTooltipManager() : aura::EventFilter(NULL),
-                                             tooltip_window_(NULL),
-                                             tooltip_(new Tooltip) {
+ShellTooltipManager::ShellTooltipManager()
+    : aura::EventFilter(NULL),
+      tooltip_window_(NULL),
+      tooltip_(new Tooltip) {
   tooltip_timer_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs),
       this, &ShellTooltipManager::TooltipTimerFired);
 }
 
 ShellTooltipManager::~ShellTooltipManager() {
   if (tooltip_window_)
     tooltip_window_->RemoveObserver(this);
 }
 
@@ skipping 89 matching lines @@
 }
 
 // static
 int TooltipClient::GetMaxWidth(int x, int y) {
   gfx::Rect monitor_bounds =
       gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
   return (monitor_bounds.width() + 1) / 2;
 }
 
 }  // namespace aura