UI review follow-up for m5 bookmark bar deliverables...

chrome/browser/cocoa/bookmark_bar_folder_controller.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/cocoa/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/browser_theme_provider.h"
@@ skipping 11 matching lines @@
 
 // Frequency of the scrolling timer in seconds.
 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.2;
 
 // Amount to scroll by per timer fire.  We scroll rather slowly; to
 // accomodate we do 2 at a time.
 const CGFloat kBookmarkBarFolderScrollAmount =
     2 * (bookmarks::kBookmarkButtonHeight +
          bookmarks::kBookmarkVerticalPadding);
 
+// Amount to scroll for each scroll wheel delta.
+const CGFloat kBookmarkBarFolderScrollWheelAmount =
+    1 * (bookmarks::kBookmarkButtonHeight +
+         bookmarks::kBookmarkVerticalPadding);
+
 // When constraining a scrolling bookmark bar folder window to the
 // screen, shrink the "constrain" by this much vertically.  Currently
 // this is 0.0 to avoid a problem with tracking areas leaving the
 // window, but should probably be 8.0 or something.
 // TODO(jrg): http://crbug.com/36225
 const CGFloat kScrollWindowVerticalMargin = 0.0;
 
 }  // namespace
 
 @interface BookmarkBarFolderController(Private)
@@ skipping 36 matching lines @@
   [super dealloc];
 }
 
 // Overriden from NSWindowController to call childFolderWillShow: before showing
 // the window.
 - (void)showWindow:(id)sender {
   [parentController_ childFolderWillShow:self];
   [super showWindow:sender];
 }
 
-- (NSCell*)cellForBookmarkNode:(const BookmarkNode*)child {
+- (BookmarkButtonCell*)cellForBookmarkNode:(const BookmarkNode*)child {
   NSImage* image = child ? [barController_ favIconForNode:child] : nil;
   NSMenu* menu = child ? child->is_folder() ? folderMenu_ : buttonMenu_ : nil;
   BookmarkBarFolderButtonCell* cell =
       [BookmarkBarFolderButtonCell buttonCellForNode:child
                                          contextMenu:menu
                                             cellText:nil
                                            cellImage:image];
   return cell;
 }
 
 // Redirect to our logic shared with BookmarkBarController.
 - (IBAction)openBookmarkFolderFromButton:(id)sender {
   [folderTarget_ openBookmarkFolderFromButton:sender];
 }
 
 // Create a bookmark button for the given node using frame.
 //
 // If |node| is NULL this is an "(empty)" button.
 // Does NOT add this button to our button list.
 // Returns an autoreleased button.
 // Adjusts the input frame width as appropriate.
 //
 // TODO(jrg): combine with addNodesToButtonList: code from
 // bookmark_bar_controller.mm, and generalize that to use both x and y
 // offsets.
 // http://crbug.com/35966
 - (BookmarkButton*)makeButtonForNode:(const BookmarkNode*)node
                                frame:(NSRect)frame {
-  NSCell* cell = [self cellForBookmarkNode:node];
+  BookmarkButtonCell* cell = [self cellForBookmarkNode:node];
   DCHECK(cell);
 
+  // We must decide if we draw the folder arrow before we ask the cell
+  // how big it needs to be.
+  if (node && node->is_folder()) {
+    // Warning when combining code with bookmark_bar_controller.mm:
+    // this call should NOT be made for the bar buttons; only for the
+    // subfolder buttons.
+    [cell setDrawFolderArrow:YES];
+  }
+
   // The "+2" is needed because, sometimes, Cocoa is off by a tad when
   // returning the value it thinks it needs.
   CGFloat desired = [cell cellSize].width + 2;
   frame.size.width = std::min(
     std::max(bookmarks::kBookmarkMenuButtonMinimumWidth, desired),
     bookmarks::kBookmarkMenuButtonMaximumWidth);
 
   BookmarkButton* button = [[[BookmarkButton alloc] initWithFrame:frame]
                                autorelease];
   DCHECK(button);
@@ skipping 10 matching lines @@
       [button setAction:@selector(openBookmark:)];
       // Add a tooltip.
       NSString* title = base::SysWideToNSString(node->GetTitle());
       std::string urlString = node->GetURL().possibly_invalid_spec();
       NSString* tooltip = [NSString stringWithFormat:@"%@\n%s", title,
                                     urlString.c_str()];
       [button setToolTip:tooltip];
     }
   } else {
     [button setEnabled:NO];
+    [button setBordered:NO];
   }
   return button;
 }
 
 // Exposed for testing.
 - (NSView*)mainView {
   return mainView_;
 }
 
 - (BookmarkBarFolderController*)folderController {
@@ skipping 207 matching lines @@
   if (delta) {
     // If we can, grow the window (up).
     if (NSHeight(windowFrame) < screenHeightMinusMargin) {
       CGFloat growAmount = delta;
       // Don't scroll more than enough to "finish".
       if (scrollPosition.y < 0)
         growAmount += scrollPosition.y;
       windowFrame.size.height += growAmount;
       windowFrame.size.height = std::min(NSHeight(windowFrame),
                                          screenHeightMinusMargin);
-      [[self window] setFrame:windowFrame display:YES];
-      [self addOrUpdateScrollTracking];
+      // Don't allow scrolling to make the window smaller, ever.  This
+      // conditional is important when processing scrollWheel events.
+      if (windowFrame.size.height > [[self window] frame].size.height) {
+        [[self window] setFrame:windowFrame display:YES];
+        [self addOrUpdateScrollTracking];
+      }
     }
   }
 
   // If we're at either end, happiness.
   if ((scrollPosition.y <= 0) ||
       ((scrollPosition.y + NSHeight(windowFrame) >=
         NSHeight([mainView_ frame])) &&
        (windowFrame.size.height == screenHeightMinusMargin))) {
     [self endScroll];
 
@@ skipping 411 matching lines @@
 
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 - (void)close {
   [folderController_ close];
   [super close];
 }
 
+- (void)scrollWheel:(NSEvent *)theEvent {
+  if (scrollable_) {
+    // We go negative since an NSScrollView has a flipped coordinate frame.
+    CGFloat amt = kBookmarkBarFolderScrollWheelAmount * -[theEvent deltaY];
+    [self performOneScroll:amt];
+  }
+}
+
 #pragma mark Methods Forwarded to BookmarkBarController
 
 - (IBAction)cutBookmark:(id)sender {
   [barController_ cutBookmark:sender];
 }
 
 - (IBAction)copyBookmark:(id)sender {
   [barController_ cutBookmark:sender];
 }
 
@@ skipping 38 matching lines @@
 }
 
 - (IBAction)openBookmarkInNewForegroundTab:(id)sender {
   [barController_ openBookmarkInNewForegroundTab:sender];
 }
 
 - (IBAction)openBookmarkInNewWindow:(id)sender {
   [barController_ openBookmarkInNewWindow:sender];
 }
 
+
 @end  // BookmarkBarFolderController