Allow pages on the OSX app launcher to be turned while dragging.

ui/app_list/cocoa/app_list_view_controller.mm

 // Copyright 2013 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 "ui/app_list/cocoa/app_list_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #import "ui/app_list/cocoa/app_list_pager_view.h"
 #import "ui/app_list/cocoa/apps_grid_controller.h"
 
 namespace {
 
 // The roundedness of the corners of the bubble.
 const CGFloat kBubbleCornerRadius = 3;
 
 // Height of the pager.
 const CGFloat kPagerPreferredHeight = 57;
-// Padding between the bottom of the grid and the bottom of the view.
-const CGFloat kViewGridOffsetY = 41;
 
 // Padding between the top of the grid and the top of the view.
 // TODO(tapted): Update padding when the search entry control is added.
 const CGFloat kTopPadding = 16;
 
 // Height of the search input. TODO(tapted): Make this visible when the search
 // input UI is written.
 const CGFloat kSearchInputHeight = 0;
 
 // Minimum margin on either side of the pager. If the pager grows beyond this,
@@ skipping 12 matching lines @@
 - (void)drawRect:(NSRect)dirtyRect {
   [NSGraphicsContext saveGraphicsState];
   [gfx::SkColorToCalibratedNSColor(app_list::kContentsBackgroundColor) set];
   [[NSBezierPath bezierPathWithRoundedRect:[self bounds]
                                    xRadius:kBubbleCornerRadius
                                    yRadius:kBubbleCornerRadius] addClip];
   NSRectFill([self bounds]);
   [NSGraphicsContext restoreGraphicsState];
 }
 
+- (BOOL)isFlipped {

[tapted, 2013/05/17 04:24:15]

note: this keeps things consistent w.r.t. the drag animations (since this view
is now the superview to ensure things are not drawn over the ItemDragView). As a
bonus, the layout logic is a bit simpler here too.

+  return YES;
+}
+
 @end
 
 @interface AppListViewController ()
 
 - (void)loadAndSetView;
 
 @end
 
 @implementation AppListViewController
 
@@ skipping 33 matching lines @@
 - (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate {
   delegate_.reset(newDelegate.release());
   [appsGridController_ setDelegate:delegate_.get()];
 }
 
 -(void)loadAndSetView {
   pagerControl_.reset([[AppListPagerView alloc] init]);
   [pagerControl_ setTarget:appsGridController_];
   [pagerControl_ setAction:@selector(onPagerClicked:)];
 
-  [[appsGridController_ view] setFrameOrigin:NSMakePoint(0, kViewGridOffsetY)];
+  [[appsGridController_ view] setFrameOrigin:NSMakePoint(0, kTopPadding)];
 
   NSRect backgroundRect = [[appsGridController_ view] bounds];
-  backgroundRect.size.height += kViewGridOffsetY + kTopPadding;
+  backgroundRect.size.height += kPagerPreferredHeight;
   scoped_nsobject<BackgroundView> backgroundView(
       [[BackgroundView alloc] initWithFrame:backgroundRect]);
 
   NSRect searchInputRect =
-      NSMakeRect(0, NSMaxY(backgroundRect) - kSearchInputHeight,
-                 backgroundRect.size.width, kSearchInputHeight);
+      NSMakeRect(0, 0, backgroundRect.size.width, kSearchInputHeight);
   scoped_nsobject<NSTextField> searchInput(
       [[NSTextField alloc] initWithFrame:searchInputRect]);
   [searchInput setDelegate:self];
 
   [backgroundView addSubview:[appsGridController_ view]];
   [backgroundView addSubview:pagerControl_];
   [backgroundView addSubview:searchInput];
   [self setView:backgroundView];
 }
 
@@ skipping 10 matching lines @@
     [pagerControl_ setWidth:segmentWidth
                  forSegment:i];
     [[pagerControl_ cell] setTag:i
                       forSegment:i];
   }
 
   // Center in view.
   [pagerControl_ sizeToFit];
   [pagerControl_ setFrame:
       NSMakeRect(NSMidX(viewFrame) - NSMidX([pagerControl_ bounds]),
-                 0,
+                 viewFrame.size.height - kPagerPreferredHeight,
                  [pagerControl_ bounds].size.width,
                  kPagerPreferredHeight)];
 }
 
 - (void)selectedPageChanged:(int)newSelected {
   [pagerControl_ selectSegmentWithTag:newSelected];
 }
 
 - (void)pageVisibilityChanged {
   [pagerControl_ setNeedsDisplay:YES];
 }
 
+- (NSInteger)pagerSegmentAtLocation:(NSPoint)locationInWindow {
+  return [pagerControl_ getSegmentAndHighlight:locationInWindow];
+}
+
 - (BOOL)control:(NSControl*)control
                textView:(NSTextView*)textView
     doCommandBySelector:(SEL)command {
   // If anything has been written, let the search view handle it.
   if ([[control stringValue] length] > 0)
     return NO;
 
   // Handle escape.
   if (command == @selector(complete:) ||
       command == @selector(cancel:) ||
       command == @selector(cancelOperation:)) {
     if (delegate_)
       delegate_->Dismiss();
     return YES;
   }
 
   // Possibly handle grid navigation.
   return [appsGridController_ handleCommandBySelector:command];
 }
 
 @end