Fix OpaqueBrowserFrameView title painting.

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2012 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/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 24 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/window_shape.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif  // OS_WIN
 
 using content::WebContents;
 
@@ skipping 77 matching lines @@
 // OpaqueBrowserFrameView, public:
 
 OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
                                                BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       minimize_button_(NULL),
       maximize_button_(NULL),
       restore_button_(NULL),
       close_button_(NULL),
       window_icon_(NULL),
+      window_title_(NULL),
       frame_background_(new views::FrameBackground()) {
   if (ShouldAddDefaultCaptionButtons()) {
     minimize_button_ = InitWindowCaptionButton(IDR_MINIMIZE,
                                                IDR_MINIMIZE_H,
                                                IDR_MINIMIZE_P,
                                                IDR_MINIMIZE_BUTTON_MASK,
                                                IDS_ACCNAME_MINIMIZE);
     maximize_button_ = InitWindowCaptionButton(IDR_MAXIMIZE,
                                                IDR_MAXIMIZE_H,
                                                IDR_MAXIMIZE_P,
@@ skipping 12 matching lines @@
   }
 
   // Initializing the TabIconView is expensive, so only do it if we need to.
   if (browser_view->ShouldShowWindowIcon()) {
     window_icon_ = new TabIconView(this);
     window_icon_->set_is_light(true);
     AddChildView(window_icon_);
     window_icon_->Update();
   }
 
+  window_title_ = new views::Label(browser_view->GetWindowTitle(),
+                                   BrowserFrame::GetTitleFont());
+  window_title_->SetVisible(browser_view->ShouldShowWindowTitle());
+  window_title_->SetEnabledColor(SK_ColorWHITE);
+  // TODO(msw): Use a transparent background color as a workaround to use the
+  // gfx::Canvas::NO_SUBPIXEL_RENDERING flag and avoid some visual artifacts.
+  window_title_->SetBackgroundColor(0x00000000);
+  window_title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  window_title_->SetElideBehavior(views::Label::ELIDE_AT_END);
+  AddChildView(window_title_);
+
   UpdateAvatarInfo();
   if (!browser_view->IsOffTheRecord()) {
     registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                    content::NotificationService::AllSources());
   }
 }
 
 OpaqueBrowserFrameView::~OpaqueBrowserFrameView() {
 }
 
@@ skipping 197 matching lines @@
 // OpaqueBrowserFrameView, views::View overrides:
 
 void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (frame()->IsFullscreen())
     return;  // Nothing is visible, so don't bother to paint.
 
   if (frame()->IsMaximized())
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
-  PaintTitleBar(canvas);
+
+  // The window icon and title are painted by their respective views.
+  /* TODO(pkasting):  If this window is active, we should also draw a drop
+   * shadow on the title.  This is tricky, because we don't want to hardcode a
+   * shadow color (since we want to work with various themes), but we can't
+   * alpha-blend either (since the Windows text APIs don't really do this).
+   * So we'd need to sample the background color at the right location and
+   * synthesize a good shadow color. */
+
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
   if (!frame()->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
 
 void OpaqueBrowserFrameView::Layout() {
   LayoutWindowControls();
   LayoutTitleBar();
   LayoutAvatar();
@@ skipping 250 matching lines @@
     // edge.  The graphic we use for this has a built in client edge, so we clip
     // it off the bottom.
     gfx::ImageSkia* top_center =
         GetThemeProvider()->GetImageSkiaNamed(IDR_APP_TOP_CENTER);
     int edge_height = top_center->height() - kClientEdgeThickness;
     canvas->TileImageInt(*top_center, 0,
         frame()->client_view()->y() - edge_height, width(), edge_height);
   }
 }
 
-void OpaqueBrowserFrameView::PaintTitleBar(gfx::Canvas* canvas) {
-  // The window icon is painted by the TabIconView.
-  views::WidgetDelegate* delegate = frame()->widget_delegate();
-  if (!delegate) {
-    LOG(WARNING) << "delegate is NULL";
-    return;
-  }
-  if (delegate->ShouldShowWindowTitle()) {
-    canvas->DrawStringInt(delegate->GetWindowTitle(),
-                          BrowserFrame::GetTitleFont(),
-        SK_ColorWHITE, GetMirroredXForRect(title_bounds_),
-        title_bounds_.y(), title_bounds_.width(), title_bounds_.height());
-    /* TODO(pkasting):  If this window is active, we should also draw a drop
-     * shadow on the title.  This is tricky, because we don't want to hardcode a
-     * shadow color (since we want to work with various themes), but we can't
-     * alpha-blend either (since the Windows text APIs don't really do this).
-     * So we'd need to sample the background color at the right location and
-     * synthesize a good shadow color. */
-  }
-}
-
 void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (toolbar_bounds.IsEmpty())
     return;
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   ConvertPointToTarget(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
 
   int x = toolbar_bounds.x();
   int w = toolbar_bounds.width();
@@ skipping 301 matching lines @@
   minimize_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
                                       views::ImageButton::ALIGN_BOTTOM);
   gfx::Size minimize_button_size = minimize_button_->GetPreferredSize();
   minimize_button_->SetBounds(
       visible_button->x() - minimize_button_size.width(), caption_y,
       minimize_button_size.width(),
       minimize_button_size.height());
 }
 
 void OpaqueBrowserFrameView::LayoutTitleBar() {
-  // The window title is based on the calculated icon position, even when there
-  // is no icon.
-  gfx::Rect icon_bounds(IconBounds());
-  views::WidgetDelegate* delegate = frame()->widget_delegate();
-  if (delegate && delegate->ShouldShowWindowIcon())
-    window_icon_->SetBoundsRect(icon_bounds);
+  const views::WidgetDelegate* delegate = frame()->widget_delegate();
+  if (delegate) {
+    gfx::Rect icon_bounds(IconBounds());
+    if (delegate->ShouldShowWindowIcon())
+      window_icon_->SetBoundsRect(icon_bounds);
 
-  // Size the title, if visible.
-  if (delegate && delegate->ShouldShowWindowTitle()) {
-    int title_x = delegate->ShouldShowWindowIcon() ?
+    window_title_->SetVisible(delegate->ShouldShowWindowTitle());
+    window_title_->SetText(delegate->GetWindowTitle());
+    const int title_x = delegate->ShouldShowWindowIcon() ?
         icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();
-    int title_height = BrowserFrame::GetTitleFont().GetHeight();
-    // We bias the title position so that when the difference between the icon
-    // and title heights is odd, the extra pixel of the title is above the
-    // vertical midline rather than below.  This compensates for how the icon is
-    // already biased downwards (see IconBounds()) and helps prevent descenders
-    // on the title from overlapping the 3D edge at the bottom of the titlebar.
-    title_bounds_.SetRect(title_x,
-        icon_bounds.y() + ((icon_bounds.height() - title_height - 1) / 2),
+    window_title_->SetBounds(title_x, icon_bounds.y(),
         std::max(0, minimize_button_->x() - kTitleLogoSpacing - title_x),
-        title_height);
+        icon_bounds.height());
   }
 }
 
 void OpaqueBrowserFrameView::LayoutAvatar() {
   // Even though the avatar is used for both incognito and profiles we always
   // use the incognito icon to layout the avatar button. The profile icon
   // can be customized so we can't depend on its size to perform layout.
   gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon();
 
   int avatar_bottom = GetTabStripInsets(false).top +
@@ skipping 12 matching lines @@
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }