Handle titlebar text updates properly

ash/wm/frame_painter.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 "ash/wm/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 30 matching lines @@
 // Space between top of window and popup window icon.
 const int kIconOffsetY = 9;
 // Height and width of window icon.
 const int kIconSize = 16;
 // Space between the title text and the caption buttons.
 const int kTitleLogoSpacing = 5;
 // Space between window icon and title text.
 const int kTitleIconOffsetX = 4;
 // Space between window edge and title text, when there is no icon.
 const int kTitleNoIconOffsetX = 8;
-// Space between title text and top of window.
-const int kTitleOffsetY = 10;
 // Color for the title text.
 const SkColor kTitleTextColor = SkColorSetRGB(40, 40, 40);
 // Size of header/content separator line below the header image.
 const int kHeaderContentSeparatorSize = 1;
 // Color of header bottom edge line.
 const SkColor kHeaderContentSeparatorColor = SkColorSetRGB(128, 128, 128);
 // Space between close button and right edge of window.
 const int kCloseButtonOffsetX = 0;
 // Space between close button and top edge of window.
 const int kCloseButtonOffsetY = 0;
@@ skipping 382 matching lines @@
 int FramePainter::HeaderContentSeparatorSize() const {
   return kHeaderContentSeparatorSize;
 }
 
 void FramePainter::PaintTitleBar(views::NonClientFrameView* view,
                                  gfx::Canvas* canvas,
                                  const gfx::Font& title_font) {
   // The window icon is painted by its own views::View.
   views::WidgetDelegate* delegate = frame_->widget_delegate();
   if (delegate && delegate->ShouldShowWindowTitle()) {
-    int title_x = GetTitleOffsetX();
-    int title_y = ui::LAYOUT_TOUCH == ui::GetDisplayLayout() ?
-        (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2
-        : kTitleOffsetY;
-    gfx::Rect title_bounds(
-        title_x,
-        std::max(0, title_y),
-        std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
-        title_font.GetHeight());
+    gfx::Rect title_bounds = GetTitleBounds(view, title_font);
     canvas->DrawStringInt(delegate->GetWindowTitle(),
                           title_font,
                           kTitleTextColor,
                           view->GetMirroredXForRect(title_bounds),
                           title_bounds.y(),
                           title_bounds.width(),
                           title_bounds.height(),
                           gfx::Canvas::NO_SUBPIXEL_RENDERING);
   }
 }
@@ skipping 51 matching lines @@
       close_button_->x() - size_button_size.width() + kButtonOverlap,
       close_button_->y(),
       size_button_size.width(),
       size_button_size.height());
 
   if (window_icon_)
     window_icon_->SetBoundsRect(
         gfx::Rect(kIconOffsetX, kIconOffsetY, kIconSize, kIconSize));
 }
 
+void FramePainter::SchedulePaintForTitle(views::NonClientFrameView* view,
+                                         const gfx::Font& title_font) {
+  frame_->non_client_view()->SchedulePaintInRect(
+      GetTitleBounds(view, title_font));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // aura::WindowObserver overrides:
 
 void FramePainter::OnWindowPropertyChanged(aura::Window* window,
                                            const void* key,
                                            intptr_t old) {
   if (key != aura::client::kShowStateKey)
     return;
 
   // Maximized and fullscreen windows don't want resize handles overlapping the
@@ skipping 174 matching lines @@
 }
 
 void FramePainter::SchedulePaintForHeader() {
   int top_left_height = top_left_corner_->height();
   int top_right_height = top_right_corner_->height();
   frame_->non_client_view()->SchedulePaintInRect(
       gfx::Rect(0, 0, frame_->non_client_view()->width(),
                 std::max(top_left_height, top_right_height)));
 }
 
+gfx::Rect FramePainter::GetTitleBounds(views::NonClientFrameView* view,
+                                       const gfx::Font& title_font) {
+  int title_x = GetTitleOffsetX();
+  // Center the text in the middle of the caption - this way it adapts
+  // automatically to the caption height (which is given by the owner).
+  int title_y =
+      (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
+  return gfx::Rect(
+      title_x,
+      std::max(0, title_y),
+      std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
+      title_font.GetHeight());
+}
+
 }  // namespace ash