Mac: Align tabpose titles on pixel boundaries, making them less blurry.

chrome/browser/ui/cocoa/tabpose_window.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
@@ skipping 357 matching lines @@
 class Tile {
  public:
   Tile() {}
 
   // Returns the rectangle this thumbnail is at at the beginning of the zoom-in
   // animation. |tile| is the rectangle that's covering the whole tab area when
   // the animation starts.
   NSRect GetStartRectRelativeTo(const Tile& tile) const;
   NSRect thumb_rect() const { return thumb_rect_; }
 
-  NSRect favicon_rect() const { return favicon_rect_; }
+  NSRect favicon_rect() const { return NSIntegralRect(favicon_rect_); }
   SkBitmap favicon() const;
 
   // This changes |title_rect| and |favicon_rect| such that the favicon is on
   // the font's baseline and that the minimum distance between thumb rect and
   // favicon and title rects doesn't change.
   // The view code
   // 1. queries desired font size by calling |title_font_size()|
   // 2. loads that font
   // 3. calls |set_font_metrics()| which updates the title rect
   // 4. receives the title rect and puts the title on it with the font from 2.
   void set_font_metrics(CGFloat ascender, CGFloat descender);
   CGFloat title_font_size() const { return title_font_size_; }
 
-  NSRect title_rect() const { return title_rect_; }
+  NSRect title_rect() const { return NSIntegralRect(title_rect_); }
 
   // Returns an unelided title. The view logic is responsible for eliding.
   const string16& title() const { return contents_->GetTitle(); }
 
   TabContents* tab_contents() const { return contents_; }
   void set_tab_contents(TabContents* new_contents) { contents_ = new_contents; }
 
  private:
   friend class TileSet;
 
@@ skipping 21 matching lines @@
 
 SkBitmap Tile::favicon() const {
   if (contents_->is_app()) {
     SkBitmap* icon = contents_->GetExtensionAppIcon();
     if (icon)
       return *icon;
   }
   return contents_->GetFavIcon();
 }
 
-// Changes |title_rect| and |favicon_rect| such that the favicon is on the
-// font's baseline and that the minimum distance between thumb rect and
-// favicon and title rects doesn't change.
+// Changes |title_rect| and |favicon_rect| such that the favicon's and the

[viettrungluu, 2010/12/09 18:40:52]

"the favicon and title's vertical centers are aligned"

+// title's vertical center is aligned and that the minimum distance between
+// the thumb rect and favicon and title rects doesn't change.
 void Tile::set_font_metrics(CGFloat ascender, CGFloat descender) {
+  // Make the title height big enough to fit the font, and adopt the title
+  // position to keep its distance from the thumb rect.
   title_rect_.origin.y -= ascender + descender - NSHeight(title_rect_);
   title_rect_.size.height = ascender + descender;
 
-  if (NSHeight(favicon_rect_) < ascender) {
-    // Move favicon down.
-    favicon_rect_.origin.y = title_rect_.origin.y + descender;
+  // Align vertical center. Both rects are currently aligned on their top edge.
+  CGFloat delta_y = NSMidY(title_rect_) - NSMidY(favicon_rect_);
+  if (delta_y > 0) {
+    // Title is higher: Move favicon down to align the centers.
+    favicon_rect_.origin.y += delta_y;
   } else {
-    // Move title down.
-    title_rect_.origin.y = favicon_rect_.origin.y - descender;
+    // Favicon is higher: Move title down to align the centers.
+    title_rect_.origin.y -= delta_y;
   }
 }
 
 // A tileset is responsible for owning and laying out all |Tile|s shown in a
 // tabpose window.
 class TileSet {
  public:
   TileSet() {}
 
   // Fills in |tiles_|.
@@ skipping 970 matching lines @@
   tile.set_tab_contents(contents->tab_contents());
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
   [thumbLayer setTabContents:contents->tab_contents()];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end